4 months ago · 12371cba93
--- a/720yun_fd_manage/gis_common/pom.xml
+++ b/720yun_fd_manage/gis_common/pom.xml
@@ -3,7 +3,7 @@
 
																          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
															
 
																          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
															
 
																     <parent>
															
 
																-        <artifactId>720yun_fd_manage</artifactId>
															
 
																+        <artifactId>720yun_fd_base</artifactId>
															
 
																         <groupId>com.gis</groupId>
															
 
																         <version>1.0.0</version>
															
 
																     </parent>
															
@@ -13,7 +13,6 @@
 
																     <packaging>jar</packaging>
															
 
																     <dependencies>
															
 
																-
															
 
																         <!--springboot-->
															
 
																         <dependency>
															
 
																             <groupId>org.springframework.boot</groupId>
															
--- a/720yun_fd_manage/gis_common/src/main/java/com/gis/common/config/FastJson2JsonRedisSerializer.java
+++ b/720yun_fd_manage/gis_common/src/main/java/com/gis/common/config/FastJson2JsonRedisSerializer.java
--- a/720yun_fd_manage/gis_common/src/main/java/com/gis/common/config/MyBatisPlusConfig.java
+++ b/720yun_fd_manage/gis_common/src/main/java/com/gis/common/config/MyBatisPlusConfig.java
--- a/720yun_fd_manage/gis_common/src/main/java/com/gis/common/config/MyRedisConfig.java
+++ b/720yun_fd_manage/gis_common/src/main/java/com/gis/common/config/MyRedisConfig.java
--- a/720yun_fd_manage/gis_common/src/main/java/com/gis/common/config/RabbitConfig.java
+++ b/720yun_fd_manage/gis_common/src/main/java/com/gis/common/config/RabbitConfig.java
--- a/720yun_fd_manage/gis_common/src/main/java/com/gis/common/config/RedisConfig.java
+++ b/720yun_fd_manage/gis_common/src/main/java/com/gis/common/config/RedisConfig.java
--- a/720yun_fd_manage/gis_common/src/main/java/com/gis/common/config/SwaggerConfig.java
+++ b/720yun_fd_manage/gis_common/src/main/java/com/gis/common/config/SwaggerConfig.java
--- a/720yun_fd_manage/gis_common/src/main/java/com/gis/common/config/WebMvcConfig.java
+++ b/720yun_fd_manage/gis_common/src/main/java/com/gis/common/config/WebMvcConfig.java
--- a/720yun_fd_manage/gis_common/src/main/java/com/gis/common/constant/CmdConstant.java
+++ b/720yun_fd_manage/gis_common/src/main/java/com/gis/common/constant/CmdConstant.java
--- a/720yun_fd_manage/gis_common/src/main/java/com/gis/common/constant/ConfigConstant.java
+++ b/720yun_fd_manage/gis_common/src/main/java/com/gis/common/constant/ConfigConstant.java
--- a/720yun_fd_manage/gis_common/src/main/java/com/gis/common/constant/ErrorEnum.java
+++ b/720yun_fd_manage/gis_common/src/main/java/com/gis/common/constant/ErrorEnum.java
--- a/720yun_fd_manage/gis_common/src/main/java/com/gis/common/constant/MsgCode.java
+++ b/720yun_fd_manage/gis_common/src/main/java/com/gis/common/constant/MsgCode.java
--- a/720yun_fd_manage/gis_common/src/main/java/com/gis/common/constant/NavigationTypeEnum.java
+++ b/720yun_fd_manage/gis_common/src/main/java/com/gis/common/constant/NavigationTypeEnum.java
--- a/720yun_fd_manage/gis_common/src/main/java/com/gis/common/constant/RedisConstant.java
+++ b/720yun_fd_manage/gis_common/src/main/java/com/gis/common/constant/RedisConstant.java
--- a/720yun_fd_manage/gis_common/src/main/java/com/gis/common/constant/SomeDataConstant.java
+++ b/720yun_fd_manage/gis_common/src/main/java/com/gis/common/constant/SomeDataConstant.java
--- a/720yun_fd_manage/gis_common/src/main/java/com/gis/common/constant/TypeCode.java
+++ b/720yun_fd_manage/gis_common/src/main/java/com/gis/common/constant/TypeCode.java
--- a/720yun_fd_manage/gis_common/src/main/java/com/gis/common/exception/BaseRuntimeException.java
+++ b/720yun_fd_manage/gis_common/src/main/java/com/gis/common/exception/BaseRuntimeException.java
--- a/720yun_fd_manage/gis_common/src/main/java/com/gis/common/exception/JwtAuthenticationException.java
+++ b/720yun_fd_manage/gis_common/src/main/java/com/gis/common/exception/JwtAuthenticationException.java
--- a/720yun_fd_manage/gis_common/src/main/java/com/gis/common/filter/ApiInterceptor.java
+++ b/720yun_fd_manage/gis_common/src/main/java/com/gis/common/filter/ApiInterceptor.java
--- a/720yun_fd_manage/gis_common/src/main/java/com/gis/common/filter/CommonInterceptor.java
+++ b/720yun_fd_manage/gis_common/src/main/java/com/gis/common/filter/CommonInterceptor.java
--- a/720yun_fd_manage/gis_common/src/main/java/com/gis/common/handler/MyMetaObjectHandler.java
+++ b/720yun_fd_manage/gis_common/src/main/java/com/gis/common/handler/MyMetaObjectHandler.java
--- a/720yun_fd_manage/gis_common/src/main/java/com/gis/common/httpclient/FdkkClient.java
+++ b/720yun_fd_manage/gis_common/src/main/java/com/gis/common/httpclient/FdkkClient.java
--- a/720yun_fd_manage/gis_common/src/main/java/com/gis/common/mapper/provider/BaseProvider.java
+++ b/720yun_fd_manage/gis_common/src/main/java/com/gis/common/mapper/provider/BaseProvider.java
--- a/720yun_fd_manage/gis_common/src/main/java/com/gis/common/mq/RabbitMqProducerUtil.java
+++ b/720yun_fd_manage/gis_common/src/main/java/com/gis/common/mq/RabbitMqProducerUtil.java
--- a/720yun_fd_manage/gis_common/src/main/java/com/gis/common/service/IBaseService.java
+++ b/720yun_fd_manage/gis_common/src/main/java/com/gis/common/service/IBaseService.java
--- a/720yun_fd_manage/gis_common/src/main/java/com/gis/common/shiro/JWTFilter.java
+++ b/720yun_fd_manage/gis_common/src/main/java/com/gis/common/shiro/JWTFilter.java
--- a/720yun_fd_manage/gis_common/src/main/java/com/gis/common/shiro/JWTToken.java
+++ b/720yun_fd_manage/gis_common/src/main/java/com/gis/common/shiro/JWTToken.java
--- a/720yun_fd_manage/gis_common/src/main/java/com/gis/common/shiro/JwtUtil.java
+++ b/720yun_fd_manage/gis_common/src/main/java/com/gis/common/shiro/JwtUtil.java
--- a/720yun_fd_manage/gis_common/src/main/java/com/gis/common/shiro/MyRealm.java
+++ b/720yun_fd_manage/gis_common/src/main/java/com/gis/common/shiro/MyRealm.java
--- a/720yun_fd_manage/gis_common/src/main/java/com/gis/common/shiro/ShiroConfig.java
+++ b/720yun_fd_manage/gis_common/src/main/java/com/gis/common/shiro/ShiroConfig.java
--- a/720yun_fd_manage/gis_common/src/main/java/com/gis/common/test/ImageUtil.java
+++ b/720yun_fd_manage/gis_common/src/main/java/com/gis/common/test/ImageUtil.java
--- a/720yun_fd_manage/gis_common/src/main/java/com/gis/common/test/main.java
+++ b/720yun_fd_manage/gis_common/src/main/java/com/gis/common/test/main.java
--- a/720yun_fd_manage/gis_common/src/main/java/com/gis/common/util/CmdUtils.java
+++ b/720yun_fd_manage/gis_common/src/main/java/com/gis/common/util/CmdUtils.java
--- a/720yun_fd_manage/gis_common/src/main/java/com/gis/common/util/DateUtils.java
+++ b/720yun_fd_manage/gis_common/src/main/java/com/gis/common/util/DateUtils.java
--- a/720yun_fd_manage/gis_common/src/main/java/com/gis/common/util/EncryptUtils.java
+++ b/720yun_fd_manage/gis_common/src/main/java/com/gis/common/util/EncryptUtils.java
--- a/720yun_fd_manage/gis_common/src/main/java/com/gis/common/util/EscapeUtil.java
+++ b/720yun_fd_manage/gis_common/src/main/java/com/gis/common/util/EscapeUtil.java
--- a/720yun_fd_manage/gis_common/src/main/java/com/gis/common/util/HTMLFilter.java
+++ b/720yun_fd_manage/gis_common/src/main/java/com/gis/common/util/HTMLFilter.java
--- a/720yun_fd_manage/gis_common/src/main/java/com/gis/common/util/HttpUtils.java
+++ b/720yun_fd_manage/gis_common/src/main/java/com/gis/common/util/HttpUtils.java
--- a/720yun_fd_manage/gis_common/src/main/java/com/gis/common/util/ImageUtil.java
+++ b/720yun_fd_manage/gis_common/src/main/java/com/gis/common/util/ImageUtil.java
--- a/720yun_fd_manage/gis_common/src/main/java/com/gis/common/util/JwtUtil.java
+++ b/720yun_fd_manage/gis_common/src/main/java/com/gis/common/util/JwtUtil.java
--- a/720yun_fd_manage/gis_common/src/main/java/com/gis/common/util/PasswordUtils.java
+++ b/720yun_fd_manage/gis_common/src/main/java/com/gis/common/util/PasswordUtils.java
--- a/720yun_fd_manage/gis_common/src/main/java/com/gis/common/util/RandomUtils.java
+++ b/720yun_fd_manage/gis_common/src/main/java/com/gis/common/util/RandomUtils.java
--- a/720yun_fd_manage/gis_common/src/main/java/com/gis/common/util/RedisUtil.java
+++ b/720yun_fd_manage/gis_common/src/main/java/com/gis/common/util/RedisUtil.java
--- a/720yun_fd_manage/gis_common/src/main/java/com/gis/common/util/RegexUtil.java
+++ b/720yun_fd_manage/gis_common/src/main/java/com/gis/common/util/RegexUtil.java
--- a/720yun_fd_manage/gis_common/src/main/java/com/gis/common/util/Result.java
+++ b/720yun_fd_manage/gis_common/src/main/java/com/gis/common/util/Result.java
--- a/720yun_fd_manage/gis_common/src/main/java/com/gis/common/util/ResultData.java
+++ b/720yun_fd_manage/gis_common/src/main/java/com/gis/common/util/ResultData.java
--- a/720yun_fd_manage/gis_common/src/main/java/com/gis/common/util/SnowFlakeUUidUtils.java
+++ b/720yun_fd_manage/gis_common/src/main/java/com/gis/common/util/SnowFlakeUUidUtils.java
--- a/720yun_fd_manage/gis_common/src/main/java/com/gis/common/util/StreamGobbler.java
+++ b/720yun_fd_manage/gis_common/src/main/java/com/gis/common/util/StreamGobbler.java
--- a/720yun_fd_manage/gis_common/src/main/java/com/gis/common/util/StreamGobblerLine.java
+++ b/720yun_fd_manage/gis_common/src/main/java/com/gis/common/util/StreamGobblerLine.java
--- a/720yun_fd_manage/gis_common/src/main/java/com/gis/common/util/ip/AddressUtils.java
+++ b/720yun_fd_manage/gis_common/src/main/java/com/gis/common/util/ip/AddressUtils.java
--- a/720yun_fd_manage/gis_common/src/main/java/com/gis/common/util/ip/IpUtils.java
+++ b/720yun_fd_manage/gis_common/src/main/java/com/gis/common/util/ip/IpUtils.java
--- a/720yun_fd_manage/gis_common/src/main/resources/img/kankan_icon.png
+++ b/720yun_fd_manage/gis_common/src/main/resources/img/kankan_icon.png
--- a/gis_domain/pom.xml
+++ b/gis_domain/pom.xml
@@ -3,7 +3,7 @@
 
																          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
															
 
																          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
															
 
																     <parent>
															
 
																-        <artifactId>720yun_fd</artifactId>
															
 
																+        <artifactId>720yun_fd_base</artifactId>
															
 
																         <groupId>com.gis</groupId>
															
 
																         <version>1.0.0</version>
															
 
																     </parent>
															
@@ -13,10 +13,9 @@
 
																     <packaging>jar</packaging>
															
 
																     <dependencies>
															
 
																-        <dependency>
															
 
																-            <groupId>com.gis</groupId>
															
 
																-            <artifactId>gis_common</artifactId>
															
 
																-        </dependency>
															
 
																+    <dependency>
															
 
																+        <groupId>com.gis</groupId>
															
 
																+        <artifactId>gis_common</artifactId>
															
 
																+    </dependency>
															
 
																     </dependencies>
															
 
																-
															
 
																 </project>
															
--- a/720yun_fd_base/gis_domain/src/main/java/com/gis/domain/dto/AddWorkNavigationSceneDTO.java
+++ b/720yun_fd_base/gis_domain/src/main/java/com/gis/domain/dto/AddWorkNavigationSceneDTO.java
--- a/720yun_fd_base/gis_domain/src/main/java/com/gis/domain/dto/AgePageDto.java
+++ b/720yun_fd_base/gis_domain/src/main/java/com/gis/domain/dto/AgePageDto.java
--- a/720yun_fd_base/gis_domain/src/main/java/com/gis/domain/dto/BaseDto.java
+++ b/720yun_fd_base/gis_domain/src/main/java/com/gis/domain/dto/BaseDto.java
--- a/720yun_fd_base/gis_domain/src/main/java/com/gis/domain/dto/BaseIdDto.java
+++ b/720yun_fd_base/gis_domain/src/main/java/com/gis/domain/dto/BaseIdDto.java
--- a/720yun_fd_base/gis_domain/src/main/java/com/gis/domain/dto/BatchSaveVisualAngleDTO.java
+++ b/720yun_fd_base/gis_domain/src/main/java/com/gis/domain/dto/BatchSaveVisualAngleDTO.java
--- a/720yun_fd_base/gis_domain/src/main/java/com/gis/domain/dto/BatchSaveWorkNavigationDTO.java
+++ b/720yun_fd_base/gis_domain/src/main/java/com/gis/domain/dto/BatchSaveWorkNavigationDTO.java
--- a/720yun_fd_base/gis_domain/src/main/java/com/gis/domain/dto/BathSaveWorkExplanationDto.java
+++ b/720yun_fd_base/gis_domain/src/main/java/com/gis/domain/dto/BathSaveWorkExplanationDto.java
--- a/720yun_fd_base/gis_domain/src/main/java/com/gis/domain/dto/DeleteWorkHotDTO.java
+++ b/720yun_fd_base/gis_domain/src/main/java/com/gis/domain/dto/DeleteWorkHotDTO.java
--- a/720yun_fd_base/gis_domain/src/main/java/com/gis/domain/dto/DirDto.java
+++ b/720yun_fd_base/gis_domain/src/main/java/com/gis/domain/dto/DirDto.java
--- a/720yun_fd_base/gis_domain/src/main/java/com/gis/domain/dto/DirMoveDto.java
+++ b/720yun_fd_base/gis_domain/src/main/java/com/gis/domain/dto/DirMoveDto.java
--- a/720yun_fd_base/gis_domain/src/main/java/com/gis/domain/dto/DoSliceDTO.java
+++ b/720yun_fd_base/gis_domain/src/main/java/com/gis/domain/dto/DoSliceDTO.java
--- a/720yun_fd_base/gis_domain/src/main/java/com/gis/domain/dto/EditSomeDataDto.java
+++ b/720yun_fd_base/gis_domain/src/main/java/com/gis/domain/dto/EditSomeDataDto.java
--- a/720yun_fd_base/gis_domain/src/main/java/com/gis/domain/dto/FileSceneDto.java
+++ b/720yun_fd_base/gis_domain/src/main/java/com/gis/domain/dto/FileSceneDto.java
--- a/720yun_fd_base/gis_domain/src/main/java/com/gis/domain/dto/FodderDto.java
+++ b/720yun_fd_base/gis_domain/src/main/java/com/gis/domain/dto/FodderDto.java
--- a/720yun_fd_base/gis_domain/src/main/java/com/gis/domain/dto/FodderPageDto.java
+++ b/720yun_fd_base/gis_domain/src/main/java/com/gis/domain/dto/FodderPageDto.java
--- a/720yun_fd_base/gis_domain/src/main/java/com/gis/domain/dto/FodderUploadDto.java
+++ b/720yun_fd_base/gis_domain/src/main/java/com/gis/domain/dto/FodderUploadDto.java
--- a/720yun_fd_base/gis_domain/src/main/java/com/gis/domain/dto/GerQrcodeDto.java
+++ b/720yun_fd_base/gis_domain/src/main/java/com/gis/domain/dto/GerQrcodeDto.java
--- a/720yun_fd_base/gis_domain/src/main/java/com/gis/domain/dto/InitWorkNavigationSceneDTO.java
+++ b/720yun_fd_base/gis_domain/src/main/java/com/gis/domain/dto/InitWorkNavigationSceneDTO.java
--- a/720yun_fd_base/gis_domain/src/main/java/com/gis/domain/dto/InitialSceneDTO.java
+++ b/720yun_fd_base/gis_domain/src/main/java/com/gis/domain/dto/InitialSceneDTO.java
--- a/720yun_fd_base/gis_domain/src/main/java/com/gis/domain/dto/MoveWorkNavigationDTO.java
+++ b/720yun_fd_base/gis_domain/src/main/java/com/gis/domain/dto/MoveWorkNavigationDTO.java
--- a/720yun_fd_base/gis_domain/src/main/java/com/gis/domain/dto/OpenSceneMigrateDto.java
+++ b/720yun_fd_base/gis_domain/src/main/java/com/gis/domain/dto/OpenSceneMigrateDto.java
--- a/720yun_fd_base/gis_domain/src/main/java/com/gis/domain/dto/PageDateDto.java
+++ b/720yun_fd_base/gis_domain/src/main/java/com/gis/domain/dto/PageDateDto.java
--- a/720yun_fd_base/gis_domain/src/main/java/com/gis/domain/dto/PageDto.java
+++ b/720yun_fd_base/gis_domain/src/main/java/com/gis/domain/dto/PageDto.java
--- a/720yun_fd_base/gis_domain/src/main/java/com/gis/domain/dto/RelicsSceneInitQueueDTO.java
+++ b/720yun_fd_base/gis_domain/src/main/java/com/gis/domain/dto/RelicsSceneInitQueueDTO.java
--- a/720yun_fd_base/gis_domain/src/main/java/com/gis/domain/dto/ReportDto.java
+++ b/720yun_fd_base/gis_domain/src/main/java/com/gis/domain/dto/ReportDto.java
--- a/720yun_fd_base/gis_domain/src/main/java/com/gis/domain/dto/SaveWorkHotDTO.java
+++ b/720yun_fd_base/gis_domain/src/main/java/com/gis/domain/dto/SaveWorkHotDTO.java
--- a/720yun_fd_base/gis_domain/src/main/java/com/gis/domain/dto/SaveWorkNavigationDTO.java
+++ b/720yun_fd_base/gis_domain/src/main/java/com/gis/domain/dto/SaveWorkNavigationDTO.java
--- a/720yun_fd_base/gis_domain/src/main/java/com/gis/domain/dto/SceneDto.java
+++ b/720yun_fd_base/gis_domain/src/main/java/com/gis/domain/dto/SceneDto.java
--- a/720yun_fd_base/gis_domain/src/main/java/com/gis/domain/dto/SceneQueueDTO.java
+++ b/720yun_fd_base/gis_domain/src/main/java/com/gis/domain/dto/SceneQueueDTO.java
--- a/720yun_fd_base/gis_domain/src/main/java/com/gis/domain/dto/SomeDataDto.java
+++ b/720yun_fd_base/gis_domain/src/main/java/com/gis/domain/dto/SomeDataDto.java
--- a/720yun_fd_base/gis_domain/src/main/java/com/gis/domain/dto/TestShDto.java
+++ b/720yun_fd_base/gis_domain/src/main/java/com/gis/domain/dto/TestShDto.java
--- a/720yun_fd_base/gis_domain/src/main/java/com/gis/domain/dto/UseHotsDto.java
+++ b/720yun_fd_base/gis_domain/src/main/java/com/gis/domain/dto/UseHotsDto.java
--- a/720yun_fd_base/gis_domain/src/main/java/com/gis/domain/dto/UserTrentDto.java
+++ b/720yun_fd_base/gis_domain/src/main/java/com/gis/domain/dto/UserTrentDto.java
--- a/720yun_fd_base/gis_domain/src/main/java/com/gis/domain/dto/WordAllDto.java
+++ b/720yun_fd_base/gis_domain/src/main/java/com/gis/domain/dto/WordAllDto.java
--- a/720yun_fd_base/gis_domain/src/main/java/com/gis/domain/dto/WorkAddDto.java
+++ b/720yun_fd_base/gis_domain/src/main/java/com/gis/domain/dto/WorkAddDto.java
--- a/720yun_fd_base/gis_domain/src/main/java/com/gis/domain/dto/WorkBackgroundMusicDto.java
+++ b/720yun_fd_base/gis_domain/src/main/java/com/gis/domain/dto/WorkBackgroundMusicDto.java
--- a/720yun_fd_base/gis_domain/src/main/java/com/gis/domain/dto/WorkBaseSettingDto.java
+++ b/720yun_fd_base/gis_domain/src/main/java/com/gis/domain/dto/WorkBaseSettingDto.java
--- a/720yun_fd_base/gis_domain/src/main/java/com/gis/domain/dto/WorkCoverTypeDto.java
+++ b/720yun_fd_base/gis_domain/src/main/java/com/gis/domain/dto/WorkCoverTypeDto.java
--- a/720yun_fd_base/gis_domain/src/main/java/com/gis/domain/dto/WorkCustomButtonDto.java
+++ b/720yun_fd_base/gis_domain/src/main/java/com/gis/domain/dto/WorkCustomButtonDto.java
--- a/720yun_fd_base/gis_domain/src/main/java/com/gis/domain/dto/WorkCustomMaskDto.java
+++ b/720yun_fd_base/gis_domain/src/main/java/com/gis/domain/dto/WorkCustomMaskDto.java
--- a/720yun_fd_base/gis_domain/src/main/java/com/gis/domain/dto/WorkCustomMaskInfoDto.java
+++ b/720yun_fd_base/gis_domain/src/main/java/com/gis/domain/dto/WorkCustomMaskInfoDto.java
--- a/720yun_fd_base/gis_domain/src/main/java/com/gis/domain/dto/WorkDto.java
+++ b/720yun_fd_base/gis_domain/src/main/java/com/gis/domain/dto/WorkDto.java
--- a/720yun_fd_base/gis_domain/src/main/java/com/gis/domain/dto/WorkExplanationDto.java
+++ b/720yun_fd_base/gis_domain/src/main/java/com/gis/domain/dto/WorkExplanationDto.java
--- a/720yun_fd_base/gis_domain/src/main/java/com/gis/domain/dto/WorkHotDTO.java
+++ b/720yun_fd_base/gis_domain/src/main/java/com/gis/domain/dto/WorkHotDTO.java
--- a/720yun_fd_base/gis_domain/src/main/java/com/gis/domain/dto/WorkIdDto.java
+++ b/720yun_fd_base/gis_domain/src/main/java/com/gis/domain/dto/WorkIdDto.java
--- a/720yun_fd_base/gis_domain/src/main/java/com/gis/domain/dto/WorkLogoDto.java
+++ b/720yun_fd_base/gis_domain/src/main/java/com/gis/domain/dto/WorkLogoDto.java
--- a/gis_domain/src/main/java/com/gis/domain/dto/WorkMaskBatchSaveDTO.java
+++ b/gis_domain/src/main/java/com/gis/domain/dto/WorkMaskBatchSaveDTO.java