From 73e913fb24bf163ab9c5332ab960b1eb56a6402b Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期四, 17 七月 2025 13:41:24 +0800
Subject: [PATCH] 修改common的对象引用
---
se-system/src/main/java/com/terra/system/controller/sys/UserController.java | 4
se-system/src/main/java/com/terra/system/service/show/ExportService.java | 4
se-system/src/main/java/com/terra/system/controller/show/MarkController.java | 4
se-system/src/main/java/com/terra/system/controller/sys/RoleController.java | 4
se-system/src/main/java/com/terra/system/service/sys/ReportService.java | 2
se-system/src/main/java/com/terra/system/service/show/MarkService.java | 2
se-system/src/main/java/com/terra/system/entity/ctrl/SdkDecryptDataEntity.java | 2
se-system/src/main/java/com/terra/system/service/all/UploadAttachService.java | 4
se-system/src/main/java/com/terra/system/controller/sys/MenuAuthController.java | 4
se-system/src/main/java/com/terra/system/controller/sys/TokenController.java | 6
se-system/src/main/java/com/terra/system/service/show/PipelineService.java | 2
se-system/src/main/java/com/terra/system/controller/sys/MenuController.java | 4
se-system/src/main/java/com/terra/system/controller/show/DataLibController.java | 6
se-system/src/main/java/com/terra/system/controller/sys/ReportController.java | 4
se-system/src/main/java/com/terra/system/config/InitConfig.java | 2
se-system/src/main/java/com/terra/system/controller/data/DataCountController.java | 4
se-system/src/main/java/com/terra/system/controller/sys/AuthController.java | 4
se-system/src/main/java/com/terra/system/service/show/InquiryService.java | 2
se-system/src/main/java/com/terra/system/controller/data/MetaController.java | 8
se-system/src/main/java/com/terra/system/controller/data/ProjectController.java | 4
se-system/src/main/java/com/terra/system/service/data/UploadService.java | 2
se-system/src/main/java/com/terra/system/service/show/CadService.java | 2
se-system/src/main/java/com/terra/system/controller/data/DataQueryController.java | 2
se-system/src/main/java/com/terra/system/controller/show/ExportController.java | 6
se-system/src/main/java/com/terra/system/controller/data/StyleController.java | 6
se-system/src/main/java/com/terra/system/controller/data/TaskController.java | 4
se-system/src/main/java/com/terra/system/controller/sys/BlacklistController.java | 4
se-system/src/main/java/com/terra/system/helper/FileHelper.java | 2
se-system/src/main/java/com/terra/system/controller/sys/ResOpController.java | 4
se-system/src/main/java/com/terra/system/controller/sys/RoleResController.java | 4
se-system/src/main/java/com/terra/system/helper/StringHelper.java | 2
se-system/src/main/java/com/terra/system/helper/WebHelper.java | 6
se-system/src/main/java/com/terra/system/service/all/PermsService.java | 1
se-system/src/main/resources/application-prod.yml | 2
se-system/src/main/java/com/terra/system/controller/data/upload/QueryController.java | 4
se-system/src/main/java/com/terra/system/controller/data/DomainController.java | 4
se-system/src/main/java/com/terra/system/helper/RestHelper.java | 2
se-system/src/main/java/com/terra/system/controller/all/BaseQueryController.java | 6
se-system/src/main/java/com/terra/system/helper/GdbHelper.java | 2
se-system/src/main/java/com/terra/system/controller/show/InquiryController.java | 6
se-system/src/main/java/com/terra/system/controller/sys/ResController.java | 4
se-system/src/main/java/com/terra/system/service/all/WebSocketService.java | 2
se-system/src/main/java/com/terra/system/controller/sys/LayerController.java | 4
se-system/src/main/java/com/terra/system/controller/sys/DownlogController.java | 4
se-system/src/main/java/com/terra/system/helper/ShpHelper.java | 2
se-system/src/main/java/com/terra/system/helper/AccessHelper.java | 2
se-system/src/main/java/com/terra/system/service/data/PublishService.java | 4
se-system/src/main/java/com/terra/system/controller/data/PublishController.java | 6
se-system/src/main/java/com/terra/system/service/all/BaseQueryService.java | 2
se-system/src/main/java/com/terra/system/controller/sys/LoginController.java | 4
se-system/src/main/java/com/terra/system/helper/PathHelper.java | 2
se-system/src/main/java/com/terra/system/service/show/ApplyService.java | 2
se-system/src/main/java/com/terra/system/controller/all/PermsController.java | 3
se-system/src/main/java/com/terra/system/controller/show/ComprehensiveController.java | 6
se-system/src/main/java/com/terra/system/entity/ctrl/DownloadTileEntity.java | 2
se-system/src/main/java/com/terra/system/interceptor/AuthInterceptor.java | 4
se-system/src/main/java/com/terra/system/controller/sys/RoleUserController.java | 4
se-system/src/main/java/com/terra/system/controller/data/DirController.java | 4
se-system/src/main/java/com/terra/system/controller/data/VerController.java | 4
se-system/src/main/java/com/terra/system/controller/show/ModelController.java | 4
se-system/src/main/java/com/terra/system/controller/sys/OperateController.java | 4
se-system/src/main/java/com/terra/system/service/all/BaseUploadService.java | 2
se-system/src/main/java/com/terra/system/controller/data/DictController.java | 4
se-system/src/main/java/com/terra/system/controller/sys/DepController.java | 4
se-system/src/main/java/com/terra/system/controller/data/upload/CheckController.java | 6
se-system/src/main/java/com/terra/system/controller/sys/RoleMenuAuthController.java | 4
se-system/src/main/java/com/terra/system/controller/sys/RoleLayerController.java | 5
se-system/src/main/java/com/terra/system/helper/AsyncHelper.java | 2
se-system/src/main/java/com/terra/system/controller/sys/ArgsController.java | 4
se-system/src/main/java/com/terra/system/service/all/SignService.java | 2
se-system/src/main/java/com/terra/system/controller/sys/CtrlController.java | 7
se-system/src/main/java/com/terra/system/controller/all/SignController.java | 5
se-system/src/main/java/com/terra/system/controller/sys/ResLogController.java | 6
se-system/src/main/java/com/terra/system/service/data/RasterService.java | 2
/dev/null | 272 ---------------------------
se-system/src/main/java/com/terra/system/controller/show/ApplyController.java | 8
se-system/src/main/java/com/terra/system/controller/data/upload/UploadController.java | 2
se-system/src/main/java/com/terra/system/service/data/MetaService.java | 2
se-common/src/main/java/com/terra/common/config/MybatisPlusConfig.java | 2
79 files changed, 145 insertions(+), 414 deletions(-)
diff --git a/se-common/src/main/java/com/terra/common/config/MybatisPlusConfig.java b/se-common/src/main/java/com/terra/common/config/MybatisPlusConfig.java
index cac0596..cac3d97 100644
--- a/se-common/src/main/java/com/terra/common/config/MybatisPlusConfig.java
+++ b/se-common/src/main/java/com/terra/common/config/MybatisPlusConfig.java
@@ -18,7 +18,7 @@
*/
@EnableTransactionManagement
@Configuration
-@MapperScan("com.terra.*.mapper")
+//@MapperScan("com.terra.*.mapper")
public class MybatisPlusConfig {
/**
* 鏂扮殑鍒嗛〉鎻掍欢,涓�缂撳拰浜岀紦閬靛惊mybatis鐨勮鍒�,闇�瑕佽缃�
diff --git a/se-system/src/main/java/com/terra/system/config/InitConfig.java b/se-system/src/main/java/com/terra/system/config/InitConfig.java
index 7e04727..9ecb215 100644
--- a/se-system/src/main/java/com/terra/system/config/InitConfig.java
+++ b/se-system/src/main/java/com/terra/system/config/InitConfig.java
@@ -1,6 +1,6 @@
package com.terra.system.config;
-import com.terra.system.entity.all.StaticData;
+import com.terra.common.entity.all.StaticData;
import com.terra.system.helper.*;
import com.terra.system.service.all.TestService;
import com.terra.system.service.all.UploadAttachService;
diff --git a/se-system/src/main/java/com/terra/system/controller/all/BaseController.java b/se-system/src/main/java/com/terra/system/controller/all/BaseController.java
deleted file mode 100644
index 61b15c9..0000000
--- a/se-system/src/main/java/com/terra/system/controller/all/BaseController.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.terra.system.controller.all;
-
-import com.terra.system.entity.all.HttpStatus;
-import com.terra.system.entity.all.ResponseMsg;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-/**
- * Controller鍩虹被
- * @author WWW
- */
-public class BaseController {
- public Log log = LogFactory.getLog(getClass());
-
- public <T> ResponseMsg<T> success(T result) {
- return new ResponseMsg<T>(HttpStatus.OK, result);
- }
-
- public <T> ResponseMsg<T> success(String msg, T result) {
- return new ResponseMsg<T>(HttpStatus.OK, msg, result);
- }
-
- public <T> ResponseMsg<T> success(long count, T result) {
- return new ResponseMsg<T>(HttpStatus.OK, count, result);
- }
-
- public <T> ResponseMsg<T> success(String msg, long count, T result) {
- return new ResponseMsg<T>(HttpStatus.OK, msg, count, result);
- }
-
- public <T> ResponseMsg<T> fail(T result) {
- return new ResponseMsg<T>(HttpStatus.ERROR, result);
- }
-
- public <T> ResponseMsg<T> fail(String msg, T result) {
- return new ResponseMsg<T>(HttpStatus.ERROR, msg, result);
- }
-
- public <T> ResponseMsg<T> fail(Exception ex, T result) {
- log.error(ex.getMessage(), ex);
-
- return new ResponseMsg<T>(HttpStatus.ERROR, ex.getMessage(), result);
- }
-}
diff --git a/se-system/src/main/java/com/terra/system/controller/all/BaseQueryController.java b/se-system/src/main/java/com/terra/system/controller/all/BaseQueryController.java
index eccc09b..e300bb3 100644
--- a/se-system/src/main/java/com/terra/system/controller/all/BaseQueryController.java
+++ b/se-system/src/main/java/com/terra/system/controller/all/BaseQueryController.java
@@ -4,10 +4,11 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.metadata.OrderItem;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.terra.common.controller.all.BaseController;
import com.terra.system.annotation.SysLog;
import com.terra.system.entity.all.BaseGeoEntity;
-import com.terra.system.entity.all.ResponseMsg;
-import com.terra.system.entity.all.StaticData;
+import com.terra.common.entity.all.ResponseMsg;
+import com.terra.common.entity.all.StaticData;
import com.terra.system.entity.ctrl.DownloadReqEntity;
import com.terra.system.entity.ctrl.IdNameEntity;
import com.terra.system.entity.ctrl.KeyValueEntity;
@@ -36,7 +37,6 @@
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Parameters;
import io.swagger.v3.oas.annotations.enums.ParameterIn;
-import io.swagger.v3.oas.annotations.media.ArraySchema;
import io.swagger.v3.oas.annotations.media.Schema;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
diff --git a/se-system/src/main/java/com/terra/system/controller/all/PermsController.java b/se-system/src/main/java/com/terra/system/controller/all/PermsController.java
index 4f13e6d..b3535d3 100644
--- a/se-system/src/main/java/com/terra/system/controller/all/PermsController.java
+++ b/se-system/src/main/java/com/terra/system/controller/all/PermsController.java
@@ -1,5 +1,8 @@
package com.terra.system.controller.all;
+import com.terra.common.controller.all.BaseController;
+import com.terra.common.entity.all.ResponseMsg;
+import com.terra.common.entity.all.StaticData;
import com.terra.system.annotation.SysLog;
import com.terra.system.entity.all.*;
import com.terra.system.entity.sys.LayerEntity;
diff --git a/se-system/src/main/java/com/terra/system/controller/all/SignController.java b/se-system/src/main/java/com/terra/system/controller/all/SignController.java
index f02a248..6050687 100644
--- a/se-system/src/main/java/com/terra/system/controller/all/SignController.java
+++ b/se-system/src/main/java/com/terra/system/controller/all/SignController.java
@@ -1,10 +1,11 @@
package com.terra.system.controller.all;
+import com.terra.common.controller.all.BaseController;
import com.terra.system.annotation.SysLog;
import com.terra.system.config.PropertiesConfig;
-import com.terra.system.entity.all.ResponseMsg;
+import com.terra.common.entity.all.ResponseMsg;
import com.terra.system.entity.all.SettingData;
-import com.terra.system.entity.all.StaticData;
+import com.terra.common.entity.all.StaticData;
import com.terra.system.entity.sys.LoginEntity;
import com.terra.system.entity.sys.OperateEntity;
import com.terra.system.entity.sys.TokenEntity;
diff --git a/se-system/src/main/java/com/terra/system/controller/data/DataCountController.java b/se-system/src/main/java/com/terra/system/controller/data/DataCountController.java
index 583ab2b..abf5e5e 100644
--- a/se-system/src/main/java/com/terra/system/controller/data/DataCountController.java
+++ b/se-system/src/main/java/com/terra/system/controller/data/DataCountController.java
@@ -1,8 +1,8 @@
package com.terra.system.controller.data;
import com.terra.system.annotation.SysLog;
-import com.terra.system.controller.all.BaseController;
-import com.terra.system.entity.all.ResponseMsg;
+import com.terra.common.controller.all.BaseController;
+import com.terra.common.entity.all.ResponseMsg;
import com.terra.system.entity.ctrl.CountEntity;
import com.terra.system.entity.sys.ReportEntity;
import com.terra.system.entity.sys.UserEntity;
diff --git a/se-system/src/main/java/com/terra/system/controller/data/DataQueryController.java b/se-system/src/main/java/com/terra/system/controller/data/DataQueryController.java
index 5b36537..391cc3f 100644
--- a/se-system/src/main/java/com/terra/system/controller/data/DataQueryController.java
+++ b/se-system/src/main/java/com/terra/system/controller/data/DataQueryController.java
@@ -2,7 +2,7 @@
import com.terra.system.annotation.SysLog;
import com.terra.system.controller.all.BaseQueryController;
-import com.terra.system.entity.all.ResponseMsg;
+import com.terra.common.entity.all.ResponseMsg;
import com.terra.system.entity.sys.UserEntity;
import com.terra.system.helper.StringHelper;
import com.terra.system.service.data.DataQueryService;
diff --git a/se-system/src/main/java/com/terra/system/controller/data/DictController.java b/se-system/src/main/java/com/terra/system/controller/data/DictController.java
index 5ab7991..dd77f15 100644
--- a/se-system/src/main/java/com/terra/system/controller/data/DictController.java
+++ b/se-system/src/main/java/com/terra/system/controller/data/DictController.java
@@ -1,8 +1,8 @@
package com.terra.system.controller.data;
import com.terra.system.annotation.SysLog;
-import com.terra.system.controller.all.BaseController;
-import com.terra.system.entity.all.ResponseMsg;
+import com.terra.common.controller.all.BaseController;
+import com.terra.common.entity.all.ResponseMsg;
import com.terra.system.entity.ctrl.TabEntity;
import com.terra.system.entity.data.DictEntity;
import com.terra.system.entity.sys.UserEntity;
diff --git a/se-system/src/main/java/com/terra/system/controller/data/DirController.java b/se-system/src/main/java/com/terra/system/controller/data/DirController.java
index 3e74247..1f62d8f 100644
--- a/se-system/src/main/java/com/terra/system/controller/data/DirController.java
+++ b/se-system/src/main/java/com/terra/system/controller/data/DirController.java
@@ -1,8 +1,8 @@
package com.terra.system.controller.data;
import com.terra.system.annotation.SysLog;
-import com.terra.system.controller.all.BaseController;
-import com.terra.system.entity.all.ResponseMsg;
+import com.terra.common.controller.all.BaseController;
+import com.terra.common.entity.all.ResponseMsg;
import com.terra.system.entity.data.DirEntity;
import com.terra.system.entity.sys.UserEntity;
import com.terra.system.helper.WebHelper;
diff --git a/se-system/src/main/java/com/terra/system/controller/data/DomainController.java b/se-system/src/main/java/com/terra/system/controller/data/DomainController.java
index 67a2b93..409be2b 100644
--- a/se-system/src/main/java/com/terra/system/controller/data/DomainController.java
+++ b/se-system/src/main/java/com/terra/system/controller/data/DomainController.java
@@ -1,8 +1,8 @@
package com.terra.system.controller.data;
import com.terra.system.annotation.SysLog;
-import com.terra.system.controller.all.BaseController;
-import com.terra.system.entity.all.ResponseMsg;
+import com.terra.common.controller.all.BaseController;
+import com.terra.common.entity.all.ResponseMsg;
import com.terra.system.entity.ctrl.TabEntity;
import com.terra.system.entity.data.DomainEntity;
import com.terra.system.entity.sys.UserEntity;
diff --git a/se-system/src/main/java/com/terra/system/controller/data/MetaController.java b/se-system/src/main/java/com/terra/system/controller/data/MetaController.java
index 31b97a5..fed7c8a 100644
--- a/se-system/src/main/java/com/terra/system/controller/data/MetaController.java
+++ b/se-system/src/main/java/com/terra/system/controller/data/MetaController.java
@@ -5,10 +5,10 @@
import com.baomidou.mybatisplus.core.metadata.OrderItem;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.terra.system.annotation.SysLog;
-import com.terra.system.controller.all.BaseController;
-import com.terra.system.entity.all.HttpStatus;
-import com.terra.system.entity.all.ResponseMsg;
-import com.terra.system.entity.all.StaticData;
+import com.terra.common.controller.all.BaseController;
+import com.terra.common.entity.all.HttpStatus;
+import com.terra.common.entity.all.ResponseMsg;
+import com.terra.common.entity.all.StaticData;
import com.terra.system.entity.ctrl.DownloadReqEntity;
import com.terra.system.entity.ctrl.IdNameEntity;
import com.terra.system.entity.data.DictEntity;
diff --git a/se-system/src/main/java/com/terra/system/controller/data/ProjectController.java b/se-system/src/main/java/com/terra/system/controller/data/ProjectController.java
index 6705960..03ce595 100644
--- a/se-system/src/main/java/com/terra/system/controller/data/ProjectController.java
+++ b/se-system/src/main/java/com/terra/system/controller/data/ProjectController.java
@@ -4,8 +4,8 @@
import com.baomidou.mybatisplus.core.metadata.OrderItem;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.terra.system.annotation.SysLog;
-import com.terra.system.controller.all.BaseController;
-import com.terra.system.entity.all.ResponseMsg;
+import com.terra.common.controller.all.BaseController;
+import com.terra.common.entity.all.ResponseMsg;
import com.terra.system.entity.bs.BsprojectEntity;
import com.terra.system.entity.ctrl.KeyValueEntity;
import com.terra.system.entity.data.DictEntity;
diff --git a/se-system/src/main/java/com/terra/system/controller/data/PublishController.java b/se-system/src/main/java/com/terra/system/controller/data/PublishController.java
index 779bb29..b884fc6 100644
--- a/se-system/src/main/java/com/terra/system/controller/data/PublishController.java
+++ b/se-system/src/main/java/com/terra/system/controller/data/PublishController.java
@@ -1,9 +1,9 @@
package com.terra.system.controller.data;
import com.terra.system.annotation.SysLog;
-import com.terra.system.controller.all.BaseController;
-import com.terra.system.entity.all.ResponseMsg;
-import com.terra.system.entity.all.StaticData;
+import com.terra.common.controller.all.BaseController;
+import com.terra.common.entity.all.ResponseMsg;
+import com.terra.common.entity.all.StaticData;
import com.terra.system.entity.ctrl.PubEntity;
import com.terra.system.entity.data.MetaEntity;
import com.terra.system.entity.data.PublishEntity;
diff --git a/se-system/src/main/java/com/terra/system/controller/data/StyleController.java b/se-system/src/main/java/com/terra/system/controller/data/StyleController.java
index 9393d96..d2785d5 100644
--- a/se-system/src/main/java/com/terra/system/controller/data/StyleController.java
+++ b/se-system/src/main/java/com/terra/system/controller/data/StyleController.java
@@ -1,9 +1,9 @@
package com.terra.system.controller.data;
import com.terra.system.annotation.SysLog;
-import com.terra.system.controller.all.BaseController;
-import com.terra.system.entity.all.HttpStatus;
-import com.terra.system.entity.all.ResponseMsg;
+import com.terra.common.controller.all.BaseController;
+import com.terra.common.entity.all.HttpStatus;
+import com.terra.common.entity.all.ResponseMsg;
import com.terra.system.entity.ctrl.DownloadReqEntity;
import com.terra.system.entity.data.DownloadEntity;
import com.terra.system.entity.data.StyleEntity;
diff --git a/se-system/src/main/java/com/terra/system/controller/data/TaskController.java b/se-system/src/main/java/com/terra/system/controller/data/TaskController.java
index e71d1e9..20a2f19 100644
--- a/se-system/src/main/java/com/terra/system/controller/data/TaskController.java
+++ b/se-system/src/main/java/com/terra/system/controller/data/TaskController.java
@@ -1,8 +1,8 @@
package com.terra.system.controller.data;
import com.terra.system.annotation.SysLog;
-import com.terra.system.controller.all.BaseController;
-import com.terra.system.entity.all.ResponseMsg;
+import com.terra.common.controller.all.BaseController;
+import com.terra.common.entity.all.ResponseMsg;
import com.terra.system.entity.ctrl.PubEntity;
import com.terra.system.entity.data.TaskEntity;
import com.terra.system.entity.sys.UserEntity;
diff --git a/se-system/src/main/java/com/terra/system/controller/data/VerController.java b/se-system/src/main/java/com/terra/system/controller/data/VerController.java
index 320c9ed..4319d43 100644
--- a/se-system/src/main/java/com/terra/system/controller/data/VerController.java
+++ b/se-system/src/main/java/com/terra/system/controller/data/VerController.java
@@ -1,8 +1,8 @@
package com.terra.system.controller.data;
import com.terra.system.annotation.SysLog;
-import com.terra.system.controller.all.BaseController;
-import com.terra.system.entity.all.ResponseMsg;
+import com.terra.common.controller.all.BaseController;
+import com.terra.common.entity.all.ResponseMsg;
import com.terra.system.entity.data.VerEntity;
import com.terra.system.entity.sys.UserEntity;
import com.terra.system.service.data.VerService;
diff --git a/se-system/src/main/java/com/terra/system/controller/data/upload/CheckController.java b/se-system/src/main/java/com/terra/system/controller/data/upload/CheckController.java
index a3e1ee4..51b6cb2 100644
--- a/se-system/src/main/java/com/terra/system/controller/data/upload/CheckController.java
+++ b/se-system/src/main/java/com/terra/system/controller/data/upload/CheckController.java
@@ -1,9 +1,9 @@
package com.terra.system.controller.data.upload;
import com.terra.system.annotation.SysLog;
-import com.terra.system.controller.all.BaseController;
-import com.terra.system.entity.all.ResponseMsg;
-import com.terra.system.entity.all.StaticData;
+import com.terra.common.controller.all.BaseController;
+import com.terra.common.entity.all.ResponseMsg;
+import com.terra.common.entity.all.StaticData;
import com.terra.system.entity.ctrl.FmeReqEntity;
import com.terra.system.entity.ctrl.RegisterEntity;
import com.terra.system.helper.HttpHelper;
diff --git a/se-system/src/main/java/com/terra/system/controller/data/upload/QueryController.java b/se-system/src/main/java/com/terra/system/controller/data/upload/QueryController.java
index 60199dd..553bf76 100644
--- a/se-system/src/main/java/com/terra/system/controller/data/upload/QueryController.java
+++ b/se-system/src/main/java/com/terra/system/controller/data/upload/QueryController.java
@@ -5,8 +5,8 @@
import com.baomidou.mybatisplus.core.metadata.OrderItem;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.terra.system.annotation.SysLog;
-import com.terra.system.entity.all.ResponseMsg;
-import com.terra.system.entity.all.StaticData;
+import com.terra.common.entity.all.ResponseMsg;
+import com.terra.common.entity.all.StaticData;
import com.terra.system.entity.ctrl.TabEntity;
import com.terra.system.entity.data.*;
import com.terra.system.entity.sys.DepEntity;
diff --git a/se-system/src/main/java/com/terra/system/controller/data/upload/UploadController.java b/se-system/src/main/java/com/terra/system/controller/data/upload/UploadController.java
index 49a7968..d808f3b 100644
--- a/se-system/src/main/java/com/terra/system/controller/data/upload/UploadController.java
+++ b/se-system/src/main/java/com/terra/system/controller/data/upload/UploadController.java
@@ -1,7 +1,7 @@
package com.terra.system.controller.data.upload;
import com.terra.system.annotation.SysLog;
-import com.terra.system.entity.all.ResponseMsg;
+import com.terra.common.entity.all.ResponseMsg;
import com.terra.system.entity.ctrl.KeyValueEntity;
import com.terra.system.entity.data.DirEntity;
import com.terra.system.entity.data.MetaEntity;
diff --git a/se-system/src/main/java/com/terra/system/controller/show/ApplyController.java b/se-system/src/main/java/com/terra/system/controller/show/ApplyController.java
index ac556b8..0e88d92 100644
--- a/se-system/src/main/java/com/terra/system/controller/show/ApplyController.java
+++ b/se-system/src/main/java/com/terra/system/controller/show/ApplyController.java
@@ -1,10 +1,10 @@
package com.terra.system.controller.show;
import com.terra.system.annotation.SysLog;
-import com.terra.system.controller.all.BaseController;
-import com.terra.system.entity.all.HttpStatus;
-import com.terra.system.entity.all.ResponseMsg;
-import com.terra.system.entity.all.StaticData;
+import com.terra.common.controller.all.BaseController;
+import com.terra.common.entity.all.HttpStatus;
+import com.terra.common.entity.all.ResponseMsg;
+import com.terra.common.entity.all.StaticData;
import com.terra.system.entity.ctrl.DownloadReqEntity;
import com.terra.system.entity.data.DownloadEntity;
import com.terra.system.entity.show.ApplyEntity;
diff --git a/se-system/src/main/java/com/terra/system/controller/show/ComprehensiveController.java b/se-system/src/main/java/com/terra/system/controller/show/ComprehensiveController.java
index 3b0ba99..e72314a 100644
--- a/se-system/src/main/java/com/terra/system/controller/show/ComprehensiveController.java
+++ b/se-system/src/main/java/com/terra/system/controller/show/ComprehensiveController.java
@@ -1,9 +1,9 @@
package com.terra.system.controller.show;
import com.terra.system.annotation.SysLog;
-import com.terra.system.entity.all.HttpStatus;
-import com.terra.system.entity.all.ResponseMsg;
-import com.terra.system.entity.all.StaticData;
+import com.terra.common.entity.all.HttpStatus;
+import com.terra.common.entity.all.ResponseMsg;
+import com.terra.common.entity.all.StaticData;
import com.terra.system.entity.ctrl.DownloadReqEntity;
import com.terra.system.entity.ctrl.MarkJsonEntity;
import com.terra.system.entity.data.DownloadEntity;
diff --git a/se-system/src/main/java/com/terra/system/controller/show/DataLibController.java b/se-system/src/main/java/com/terra/system/controller/show/DataLibController.java
index 20ac6b1..4e7852a 100644
--- a/se-system/src/main/java/com/terra/system/controller/show/DataLibController.java
+++ b/se-system/src/main/java/com/terra/system/controller/show/DataLibController.java
@@ -6,9 +6,9 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.terra.system.annotation.SysLog;
import com.terra.system.controller.all.BaseQueryController;
-import com.terra.system.entity.all.HttpStatus;
-import com.terra.system.entity.all.ResponseMsg;
-import com.terra.system.entity.all.StaticData;
+import com.terra.common.entity.all.HttpStatus;
+import com.terra.common.entity.all.ResponseMsg;
+import com.terra.common.entity.all.StaticData;
import com.terra.system.entity.ctrl.DownloadReqEntity;
import com.terra.system.entity.data.DownloadEntity;
import com.terra.system.entity.data.MetaEntity;
diff --git a/se-system/src/main/java/com/terra/system/controller/show/ExportController.java b/se-system/src/main/java/com/terra/system/controller/show/ExportController.java
index 6e3492e..9332a92 100644
--- a/se-system/src/main/java/com/terra/system/controller/show/ExportController.java
+++ b/se-system/src/main/java/com/terra/system/controller/show/ExportController.java
@@ -1,9 +1,9 @@
package com.terra.system.controller.show;
import com.terra.system.annotation.SysLog;
-import com.terra.system.controller.all.BaseController;
-import com.terra.system.entity.all.HttpStatus;
-import com.terra.system.entity.all.ResponseMsg;
+import com.terra.common.controller.all.BaseController;
+import com.terra.common.entity.all.HttpStatus;
+import com.terra.common.entity.all.ResponseMsg;
import com.terra.system.entity.data.DownloadEntity;
import com.terra.system.entity.show.ExportEntity;
import com.terra.system.entity.sys.UserEntity;
diff --git a/se-system/src/main/java/com/terra/system/controller/show/InquiryController.java b/se-system/src/main/java/com/terra/system/controller/show/InquiryController.java
index a346f49..dc5872b 100644
--- a/se-system/src/main/java/com/terra/system/controller/show/InquiryController.java
+++ b/se-system/src/main/java/com/terra/system/controller/show/InquiryController.java
@@ -2,9 +2,9 @@
import com.terra.system.annotation.SysLog;
import com.terra.system.controller.all.BaseQueryController;
-import com.terra.system.entity.all.HttpStatus;
-import com.terra.system.entity.all.ResponseMsg;
-import com.terra.system.entity.all.StaticData;
+import com.terra.common.entity.all.HttpStatus;
+import com.terra.common.entity.all.ResponseMsg;
+import com.terra.common.entity.all.StaticData;
import com.terra.system.entity.ctrl.DownloadTileEntity;
import com.terra.system.entity.ctrl.ShpRecordEntity;
import com.terra.system.entity.data.DownloadEntity;
diff --git a/se-system/src/main/java/com/terra/system/controller/show/MarkController.java b/se-system/src/main/java/com/terra/system/controller/show/MarkController.java
index 056c8e6..83e160a 100644
--- a/se-system/src/main/java/com/terra/system/controller/show/MarkController.java
+++ b/se-system/src/main/java/com/terra/system/controller/show/MarkController.java
@@ -1,8 +1,8 @@
package com.terra.system.controller.show;
import com.terra.system.annotation.SysLog;
-import com.terra.system.controller.all.BaseController;
-import com.terra.system.entity.all.ResponseMsg;
+import com.terra.common.controller.all.BaseController;
+import com.terra.common.entity.all.ResponseMsg;
import com.terra.system.entity.show.MarkEntity;
import com.terra.system.entity.sys.UserEntity;
import com.terra.system.service.all.BaseUploadService;
diff --git a/se-system/src/main/java/com/terra/system/controller/show/ModelController.java b/se-system/src/main/java/com/terra/system/controller/show/ModelController.java
index 080322c..5a864b5 100644
--- a/se-system/src/main/java/com/terra/system/controller/show/ModelController.java
+++ b/se-system/src/main/java/com/terra/system/controller/show/ModelController.java
@@ -1,8 +1,8 @@
package com.terra.system.controller.show;
import com.terra.system.annotation.SysLog;
-import com.terra.system.controller.all.BaseController;
-import com.terra.system.entity.all.ResponseMsg;
+import com.terra.common.controller.all.BaseController;
+import com.terra.common.entity.all.ResponseMsg;
import com.terra.system.entity.show.ModelEntity;
import com.terra.system.entity.sys.UserEntity;
import com.terra.system.helper.StringHelper;
diff --git a/se-system/src/main/java/com/terra/system/controller/sys/ArgsController.java b/se-system/src/main/java/com/terra/system/controller/sys/ArgsController.java
index 7835d24..5e0e21f 100644
--- a/se-system/src/main/java/com/terra/system/controller/sys/ArgsController.java
+++ b/se-system/src/main/java/com/terra/system/controller/sys/ArgsController.java
@@ -1,8 +1,8 @@
package com.terra.system.controller.sys;
import com.terra.system.annotation.SysLog;
-import com.terra.system.controller.all.BaseController;
-import com.terra.system.entity.all.ResponseMsg;
+import com.terra.common.controller.all.BaseController;
+import com.terra.common.entity.all.ResponseMsg;
import com.terra.system.entity.sys.ArgsEntity;
import com.terra.system.entity.sys.UserEntity;
import com.terra.system.service.sys.ArgsService;
diff --git a/se-system/src/main/java/com/terra/system/controller/sys/AuthController.java b/se-system/src/main/java/com/terra/system/controller/sys/AuthController.java
index 4e13b5f..2423f8c 100644
--- a/se-system/src/main/java/com/terra/system/controller/sys/AuthController.java
+++ b/se-system/src/main/java/com/terra/system/controller/sys/AuthController.java
@@ -1,8 +1,8 @@
package com.terra.system.controller.sys;
import com.terra.system.annotation.SysLog;
-import com.terra.system.controller.all.BaseController;
-import com.terra.system.entity.all.ResponseMsg;
+import com.terra.common.controller.all.BaseController;
+import com.terra.common.entity.all.ResponseMsg;
import com.terra.system.entity.sys.AuthEntity;
import com.terra.system.entity.sys.UserEntity;
import com.terra.system.service.all.PermsService;
diff --git a/se-system/src/main/java/com/terra/system/controller/sys/BlacklistController.java b/se-system/src/main/java/com/terra/system/controller/sys/BlacklistController.java
index f21728d..5709918 100644
--- a/se-system/src/main/java/com/terra/system/controller/sys/BlacklistController.java
+++ b/se-system/src/main/java/com/terra/system/controller/sys/BlacklistController.java
@@ -1,8 +1,8 @@
package com.terra.system.controller.sys;
import com.terra.system.annotation.SysLog;
-import com.terra.system.controller.all.BaseController;
-import com.terra.system.entity.all.ResponseMsg;
+import com.terra.common.controller.all.BaseController;
+import com.terra.common.entity.all.ResponseMsg;
import com.terra.system.entity.sys.BlacklistEntity;
import com.terra.system.entity.sys.UserEntity;
import com.terra.system.service.sys.BlacklistService;
diff --git a/se-system/src/main/java/com/terra/system/controller/sys/CtrlController.java b/se-system/src/main/java/com/terra/system/controller/sys/CtrlController.java
index a03240d..fc7ae02 100644
--- a/se-system/src/main/java/com/terra/system/controller/sys/CtrlController.java
+++ b/se-system/src/main/java/com/terra/system/controller/sys/CtrlController.java
@@ -2,13 +2,11 @@
import com.alibaba.fastjson.JSONObject;
import com.terra.system.annotation.SysLog;
-import com.terra.system.controller.all.BaseController;
-import com.terra.system.entity.all.ResponseMsg;
+import com.terra.common.controller.all.BaseController;
+import com.terra.common.entity.all.ResponseMsg;
import com.terra.system.entity.sys.ResEntity;
import com.terra.system.service.all.ScheduleService;
import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Parameters;
import javax.annotation.Resource;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -16,7 +14,6 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
diff --git a/se-system/src/main/java/com/terra/system/controller/sys/DepController.java b/se-system/src/main/java/com/terra/system/controller/sys/DepController.java
index 132190c..21283bd 100644
--- a/se-system/src/main/java/com/terra/system/controller/sys/DepController.java
+++ b/se-system/src/main/java/com/terra/system/controller/sys/DepController.java
@@ -1,8 +1,8 @@
package com.terra.system.controller.sys;
import com.terra.system.annotation.SysLog;
-import com.terra.system.controller.all.BaseController;
-import com.terra.system.entity.all.ResponseMsg;
+import com.terra.common.controller.all.BaseController;
+import com.terra.common.entity.all.ResponseMsg;
import com.terra.system.entity.sys.DepEntity;
import com.terra.system.entity.sys.UserEntity;
import com.terra.system.helper.StringHelper;
diff --git a/se-system/src/main/java/com/terra/system/controller/sys/DownlogController.java b/se-system/src/main/java/com/terra/system/controller/sys/DownlogController.java
index 894425b..435f4c5 100644
--- a/se-system/src/main/java/com/terra/system/controller/sys/DownlogController.java
+++ b/se-system/src/main/java/com/terra/system/controller/sys/DownlogController.java
@@ -1,8 +1,8 @@
package com.terra.system.controller.sys;
import com.terra.system.annotation.SysLog;
-import com.terra.system.controller.all.BaseController;
-import com.terra.system.entity.all.ResponseMsg;
+import com.terra.common.controller.all.BaseController;
+import com.terra.common.entity.all.ResponseMsg;
import com.terra.system.entity.sys.DownlogEntity;
import com.terra.system.service.sys.DownlogService;
import com.terra.system.service.sys.TokenService;
diff --git a/se-system/src/main/java/com/terra/system/controller/sys/LayerController.java b/se-system/src/main/java/com/terra/system/controller/sys/LayerController.java
index f875281..048d2b4 100644
--- a/se-system/src/main/java/com/terra/system/controller/sys/LayerController.java
+++ b/se-system/src/main/java/com/terra/system/controller/sys/LayerController.java
@@ -1,8 +1,8 @@
package com.terra.system.controller.sys;
import com.terra.system.annotation.SysLog;
-import com.terra.system.controller.all.BaseController;
-import com.terra.system.entity.all.ResponseMsg;
+import com.terra.common.controller.all.BaseController;
+import com.terra.common.entity.all.ResponseMsg;
import com.terra.system.entity.sys.LayerEntity;
import com.terra.system.entity.sys.UserEntity;
import com.terra.system.service.all.PermsService;
diff --git a/se-system/src/main/java/com/terra/system/controller/sys/LoginController.java b/se-system/src/main/java/com/terra/system/controller/sys/LoginController.java
index 5bbb40e..333acc8 100644
--- a/se-system/src/main/java/com/terra/system/controller/sys/LoginController.java
+++ b/se-system/src/main/java/com/terra/system/controller/sys/LoginController.java
@@ -1,8 +1,8 @@
package com.terra.system.controller.sys;
import com.terra.system.annotation.SysLog;
-import com.terra.system.controller.all.BaseController;
-import com.terra.system.entity.all.ResponseMsg;
+import com.terra.common.controller.all.BaseController;
+import com.terra.common.entity.all.ResponseMsg;
import com.terra.system.entity.sys.LoginEntity;
import com.terra.system.entity.sys.UserEntity;
import com.terra.system.service.sys.LoginService;
diff --git a/se-system/src/main/java/com/terra/system/controller/sys/MenuAuthController.java b/se-system/src/main/java/com/terra/system/controller/sys/MenuAuthController.java
index b7b08dc..f7261dd 100644
--- a/se-system/src/main/java/com/terra/system/controller/sys/MenuAuthController.java
+++ b/se-system/src/main/java/com/terra/system/controller/sys/MenuAuthController.java
@@ -1,8 +1,8 @@
package com.terra.system.controller.sys;
import com.terra.system.annotation.SysLog;
-import com.terra.system.controller.all.BaseController;
-import com.terra.system.entity.all.ResponseMsg;
+import com.terra.common.controller.all.BaseController;
+import com.terra.common.entity.all.ResponseMsg;
import com.terra.system.entity.sys.MenuAuthEntity;
import com.terra.system.entity.sys.UserEntity;
import com.terra.system.service.all.PermsService;
diff --git a/se-system/src/main/java/com/terra/system/controller/sys/MenuController.java b/se-system/src/main/java/com/terra/system/controller/sys/MenuController.java
index e131646..3103be0 100644
--- a/se-system/src/main/java/com/terra/system/controller/sys/MenuController.java
+++ b/se-system/src/main/java/com/terra/system/controller/sys/MenuController.java
@@ -1,8 +1,8 @@
package com.terra.system.controller.sys;
import com.terra.system.annotation.SysLog;
-import com.terra.system.controller.all.BaseController;
-import com.terra.system.entity.all.ResponseMsg;
+import com.terra.common.controller.all.BaseController;
+import com.terra.common.entity.all.ResponseMsg;
import com.terra.system.entity.sys.MenuEntity;
import com.terra.system.entity.sys.UserEntity;
import com.terra.system.helper.StringHelper;
diff --git a/se-system/src/main/java/com/terra/system/controller/sys/OperateController.java b/se-system/src/main/java/com/terra/system/controller/sys/OperateController.java
index 56c1408..4985f12 100644
--- a/se-system/src/main/java/com/terra/system/controller/sys/OperateController.java
+++ b/se-system/src/main/java/com/terra/system/controller/sys/OperateController.java
@@ -1,8 +1,8 @@
package com.terra.system.controller.sys;
import com.terra.system.annotation.SysLog;
-import com.terra.system.controller.all.BaseController;
-import com.terra.system.entity.all.ResponseMsg;
+import com.terra.common.controller.all.BaseController;
+import com.terra.common.entity.all.ResponseMsg;
import com.terra.system.entity.sys.OperateEntity;
import com.terra.system.entity.sys.UserEntity;
import com.terra.system.service.sys.OperateService;
diff --git a/se-system/src/main/java/com/terra/system/controller/sys/ReportController.java b/se-system/src/main/java/com/terra/system/controller/sys/ReportController.java
index d667939..85cc709 100644
--- a/se-system/src/main/java/com/terra/system/controller/sys/ReportController.java
+++ b/se-system/src/main/java/com/terra/system/controller/sys/ReportController.java
@@ -1,8 +1,8 @@
package com.terra.system.controller.sys;
import com.terra.system.annotation.SysLog;
-import com.terra.system.controller.all.BaseController;
-import com.terra.system.entity.all.ResponseMsg;
+import com.terra.common.controller.all.BaseController;
+import com.terra.common.entity.all.ResponseMsg;
import com.terra.system.entity.sys.ReportEntity;
import com.terra.system.entity.sys.UserEntity;
import com.terra.system.service.all.UploadAttachService;
diff --git a/se-system/src/main/java/com/terra/system/controller/sys/ResController.java b/se-system/src/main/java/com/terra/system/controller/sys/ResController.java
index ed405e1..5be6326 100644
--- a/se-system/src/main/java/com/terra/system/controller/sys/ResController.java
+++ b/se-system/src/main/java/com/terra/system/controller/sys/ResController.java
@@ -1,8 +1,8 @@
package com.terra.system.controller.sys;
import com.terra.system.annotation.SysLog;
-import com.terra.system.controller.all.BaseController;
-import com.terra.system.entity.all.ResponseMsg;
+import com.terra.common.controller.all.BaseController;
+import com.terra.common.entity.all.ResponseMsg;
import com.terra.system.entity.sys.ResEntity;
import com.terra.system.entity.sys.UserEntity;
import com.terra.system.helper.StringHelper;
diff --git a/se-system/src/main/java/com/terra/system/controller/sys/ResLogController.java b/se-system/src/main/java/com/terra/system/controller/sys/ResLogController.java
index 15ebc57..e3cede2 100644
--- a/se-system/src/main/java/com/terra/system/controller/sys/ResLogController.java
+++ b/se-system/src/main/java/com/terra/system/controller/sys/ResLogController.java
@@ -1,10 +1,9 @@
package com.terra.system.controller.sys;
import com.terra.system.annotation.SysLog;
-import com.terra.system.controller.all.BaseController;
-import com.terra.system.entity.all.ResponseMsg;
+import com.terra.common.controller.all.BaseController;
+import com.terra.common.entity.all.ResponseMsg;
import com.terra.system.entity.sys.ResLogEntity;
-import com.terra.system.entity.sys.UserEntity;
import com.terra.system.service.sys.ResLogService;
import com.terra.system.service.sys.TokenService;
import io.swagger.v3.oas.annotations.Operation;
@@ -15,7 +14,6 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletRequest;
import java.util.List;
@SuppressWarnings("ALL")
diff --git a/se-system/src/main/java/com/terra/system/controller/sys/ResOpController.java b/se-system/src/main/java/com/terra/system/controller/sys/ResOpController.java
index d9c8fc8..6661b21 100644
--- a/se-system/src/main/java/com/terra/system/controller/sys/ResOpController.java
+++ b/se-system/src/main/java/com/terra/system/controller/sys/ResOpController.java
@@ -1,8 +1,8 @@
package com.terra.system.controller.sys;
import com.terra.system.annotation.SysLog;
-import com.terra.system.controller.all.BaseController;
-import com.terra.system.entity.all.ResponseMsg;
+import com.terra.common.controller.all.BaseController;
+import com.terra.common.entity.all.ResponseMsg;
import com.terra.system.entity.sys.ResOpEntity;
import com.terra.system.entity.sys.UserEntity;
import com.terra.system.service.sys.ResOpService;
diff --git a/se-system/src/main/java/com/terra/system/controller/sys/RoleController.java b/se-system/src/main/java/com/terra/system/controller/sys/RoleController.java
index 26ed8ab..6432291 100644
--- a/se-system/src/main/java/com/terra/system/controller/sys/RoleController.java
+++ b/se-system/src/main/java/com/terra/system/controller/sys/RoleController.java
@@ -1,8 +1,8 @@
package com.terra.system.controller.sys;
import com.terra.system.annotation.SysLog;
-import com.terra.system.controller.all.BaseController;
-import com.terra.system.entity.all.ResponseMsg;
+import com.terra.common.controller.all.BaseController;
+import com.terra.common.entity.all.ResponseMsg;
import com.terra.system.entity.sys.RoleEntity;
import com.terra.system.entity.sys.UserEntity;
import com.terra.system.service.all.PermsService;
diff --git a/se-system/src/main/java/com/terra/system/controller/sys/RoleLayerController.java b/se-system/src/main/java/com/terra/system/controller/sys/RoleLayerController.java
index 5b80b63..9ea17b5 100644
--- a/se-system/src/main/java/com/terra/system/controller/sys/RoleLayerController.java
+++ b/se-system/src/main/java/com/terra/system/controller/sys/RoleLayerController.java
@@ -1,10 +1,9 @@
package com.terra.system.controller.sys;
import com.terra.system.annotation.SysLog;
-import com.terra.system.controller.all.BaseController;
-import com.terra.system.entity.all.ResponseMsg;
+import com.terra.common.controller.all.BaseController;
+import com.terra.common.entity.all.ResponseMsg;
import com.terra.system.entity.sys.RoleLayerEntity;
-import com.terra.system.entity.sys.RoleResEntity;
import com.terra.system.entity.sys.UserEntity;
import com.terra.system.service.all.PermsService;
import com.terra.system.service.sys.RoleLayerService;
diff --git a/se-system/src/main/java/com/terra/system/controller/sys/RoleMenuAuthController.java b/se-system/src/main/java/com/terra/system/controller/sys/RoleMenuAuthController.java
index f9fcf17..b132a27 100644
--- a/se-system/src/main/java/com/terra/system/controller/sys/RoleMenuAuthController.java
+++ b/se-system/src/main/java/com/terra/system/controller/sys/RoleMenuAuthController.java
@@ -1,8 +1,8 @@
package com.terra.system.controller.sys;
import com.terra.system.annotation.SysLog;
-import com.terra.system.controller.all.BaseController;
-import com.terra.system.entity.all.ResponseMsg;
+import com.terra.common.controller.all.BaseController;
+import com.terra.common.entity.all.ResponseMsg;
import com.terra.system.entity.sys.RoleMenuAuthEntity;
import com.terra.system.entity.sys.UserEntity;
import com.terra.system.service.all.PermsService;
diff --git a/se-system/src/main/java/com/terra/system/controller/sys/RoleResController.java b/se-system/src/main/java/com/terra/system/controller/sys/RoleResController.java
index 286bd67..a2db062 100644
--- a/se-system/src/main/java/com/terra/system/controller/sys/RoleResController.java
+++ b/se-system/src/main/java/com/terra/system/controller/sys/RoleResController.java
@@ -1,8 +1,8 @@
package com.terra.system.controller.sys;
import com.terra.system.annotation.SysLog;
-import com.terra.system.controller.all.BaseController;
-import com.terra.system.entity.all.ResponseMsg;
+import com.terra.common.controller.all.BaseController;
+import com.terra.common.entity.all.ResponseMsg;
import com.terra.system.entity.sys.RoleResEntity;
import com.terra.system.entity.sys.UserEntity;
import com.terra.system.service.all.PermsService;
diff --git a/se-system/src/main/java/com/terra/system/controller/sys/RoleUserController.java b/se-system/src/main/java/com/terra/system/controller/sys/RoleUserController.java
index 3036000..cfc6721 100644
--- a/se-system/src/main/java/com/terra/system/controller/sys/RoleUserController.java
+++ b/se-system/src/main/java/com/terra/system/controller/sys/RoleUserController.java
@@ -1,8 +1,8 @@
package com.terra.system.controller.sys;
import com.terra.system.annotation.SysLog;
-import com.terra.system.controller.all.BaseController;
-import com.terra.system.entity.all.ResponseMsg;
+import com.terra.common.controller.all.BaseController;
+import com.terra.common.entity.all.ResponseMsg;
import com.terra.system.entity.sys.RoleUserEntity;
import com.terra.system.entity.sys.UserEntity;
import com.terra.system.service.all.PermsService;
diff --git a/se-system/src/main/java/com/terra/system/controller/sys/TokenController.java b/se-system/src/main/java/com/terra/system/controller/sys/TokenController.java
index 263afdc..9f887cf 100644
--- a/se-system/src/main/java/com/terra/system/controller/sys/TokenController.java
+++ b/se-system/src/main/java/com/terra/system/controller/sys/TokenController.java
@@ -1,10 +1,10 @@
package com.terra.system.controller.sys;
import com.terra.system.annotation.SysLog;
-import com.terra.system.controller.all.BaseController;
-import com.terra.system.entity.all.ResponseMsg;
+import com.terra.common.controller.all.BaseController;
+import com.terra.common.entity.all.ResponseMsg;
import com.terra.system.entity.all.SettingData;
-import com.terra.system.entity.all.StaticData;
+import com.terra.common.entity.all.StaticData;
import com.terra.system.entity.sys.TokenEntity;
import com.terra.system.entity.sys.UserEntity;
import com.terra.system.helper.StringHelper;
diff --git a/se-system/src/main/java/com/terra/system/controller/sys/UserController.java b/se-system/src/main/java/com/terra/system/controller/sys/UserController.java
index 20f8236..d422ed9 100644
--- a/se-system/src/main/java/com/terra/system/controller/sys/UserController.java
+++ b/se-system/src/main/java/com/terra/system/controller/sys/UserController.java
@@ -1,8 +1,8 @@
package com.terra.system.controller.sys;
import com.terra.system.annotation.SysLog;
-import com.terra.system.controller.all.BaseController;
-import com.terra.system.entity.all.ResponseMsg;
+import com.terra.common.controller.all.BaseController;
+import com.terra.common.entity.all.ResponseMsg;
import com.terra.system.entity.ctrl.UserUpdateEntity;
import com.terra.system.entity.sys.RoleEntity;
import com.terra.system.entity.sys.UserEntity;
diff --git a/se-system/src/main/java/com/terra/system/entity/all/HttpStatus.java b/se-system/src/main/java/com/terra/system/entity/all/HttpStatus.java
deleted file mode 100644
index cde7587..0000000
--- a/se-system/src/main/java/com/terra/system/entity/all/HttpStatus.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package com.terra.system.entity.all;
-
-/**
- * Http鐘舵�佺爜绫�
- * @author WWW
- */
-public enum HttpStatus {
- /**
- * 璇锋眰鎴愬姛
- */
- OK(200,"璇锋眰鎴愬姛"),
-
- /**
- * 璇锋眰鏃犳晥
- */
- BAD_REQUEST(400,"璇锋眰鏃犳晥"),
-
- /**
- * 鏈粡鎺堟潈璁块棶
- */
- UNAUTHORIZED(401,"鏈粡鎺堟潈璁块棶"),
-
- /**
- * 鏈嶅姟璇锋眰鏈壘鍒�
- */
- NOT_FOUND(404,"鏈嶅姟璇锋眰鏈壘鍒�"),
-
- /**
- * 绯荤粺閿欒
- */
- ERROR(500,"绯荤粺閿欒"),
-
- /**
- * 瀛樺湪閲嶅鐨勬暟鎹�
- */
- UNIQUE_ERROR(500100,"瀛樺湪閲嶅鐨勬暟鎹�"),
-
- /**
- * 鍙傛暟鏍￠獙閿欒
- */
- VALIDATE_ERROR(500101,"鍙傛暟鏍￠獙閿欒"),
-
- /**
- * token閿欒
- */
- TOKEN_ERROR(500102,"token閿欒"),
-
- /**
- * 鐢ㄦ埛鏈櫥闄�
- */
- NO_LOGIN_ERROR(500104,"鐢ㄦ埛鏈櫥闄�"),
-
- /**
- * 鐧婚檰澶辫触
- */
- LOGIN_ERROR(500105,"鐧婚檰澶辫触"),
-
- /**
- * 鏃犳潈闄愯闂�
- */
- NO_AUTH_ERROR(500106,"鏃犳潈闄愯闂�"),
-
- /**
- * 鐢ㄦ埛鍚嶉敊璇�
- */
- LOGIN_USER_ERROR(500107,"鐢ㄦ埛鍚嶉敊璇�"),
-
- /**
- * 瀵嗙爜閿欒
- */
- LOGIN_PWD_ERROR(500108,"瀵嗙爜閿欒"),
-
- /**
- * 鐢ㄦ埛琚攣瀹�
- */
- USER_LOCK_ERROR(500109,"鐢ㄦ埛琚攣瀹�"),
-
- /**
- * 瀵嗙爜涓嶅悎瑙勮寖
- */
- PWD_NONSTANDARD(500111,"瀵嗙爜涓嶅悎瑙勮寖"),
-
- /**
- * 瀵嗙爜杩囨湡
- */
- LOGIN_PWD_EXPIRE(500116,"瀵嗙爜杩囨湡");
-
- private HttpStatus(int value, String msg) {
- this.value = value;
- this.msg = msg;
- }
-
- private int value;
-
- private String msg;
-
- public int getValue() {
- return value;
- }
-
- public String getMsg() {
- return msg;
- }
-}
diff --git a/se-system/src/main/java/com/terra/system/entity/all/ResponseMsg.java b/se-system/src/main/java/com/terra/system/entity/all/ResponseMsg.java
deleted file mode 100644
index 2dedcf5..0000000
--- a/se-system/src/main/java/com/terra/system/entity/all/ResponseMsg.java
+++ /dev/null
@@ -1,107 +0,0 @@
-package com.terra.system.entity.all;
-
-/**
- * 鍝嶅簲娑堟伅绫�
- * @author www
- * @param <T> 娉涘瀷
- */
-public class ResponseMsg<T> {
- public ResponseMsg() {
- this.time = System.currentTimeMillis();
- }
-
- public ResponseMsg(HttpStatus code, T result) {
- this.code = code.getValue();
- this.msg = this.code == 200 ? "鎴愬姛" : "澶辫触";
- this.result = result;
- this.time = System.currentTimeMillis();
- }
-
- public ResponseMsg(HttpStatus code, String msg, T result) {
- this.code = code.getValue();
- this.msg = msg;
- this.result = result;
- this.time = System.currentTimeMillis();
- }
-
- public ResponseMsg(int code, String msg, T result, long time) {
- this.code = code;
- this.msg = msg;
- this.result = result;
- this.time = time;
- }
-
- public ResponseMsg(HttpStatus code, long count, T result) {
- this.code = code.getValue();
- this.msg = this.code == 200 ? "鎴愬姛" : "澶辫触";
- this.count = count;
- this.result = result;
- this.time = System.currentTimeMillis();
- }
-
- public ResponseMsg(HttpStatus code, String msg, long count, T result) {
- this.code = code.getValue();
- this.msg = msg;
- this.count = count;
- this.result = result;
- this.time = System.currentTimeMillis();
- }
-
- public ResponseMsg(int code, String msg, long count, T result, long time) {
- this.code = code;
- this.msg = msg;
- this.count = count;
- this.result = result;
- this.time = time;
- }
-
- private int code;
-
- private String msg;
-
- private long count;
-
- private T result;
-
- private long time;
-
- public int getCode() {
- return code;
- }
-
- public void setCode(int code) {
- this.code = code;
- }
-
- public String getMsg() {
- return msg;
- }
-
- public void setMsg(String msg) {
- this.msg = msg;
- }
-
- public long getCount() {
- return count;
- }
-
- public void setCount(long count) {
- this.count = count;
- }
-
- public T getResult() {
- return result;
- }
-
- public void setResult(T result) {
- this.result = result;
- }
-
- public long getTime() {
- return time;
- }
-
- public void setTime(long time) {
- this.time = time;
- }
-}
diff --git a/se-system/src/main/java/com/terra/system/entity/all/StaticData.java b/se-system/src/main/java/com/terra/system/entity/all/StaticData.java
deleted file mode 100644
index ad4e83d..0000000
--- a/se-system/src/main/java/com/terra/system/entity/all/StaticData.java
+++ /dev/null
@@ -1,272 +0,0 @@
-package com.terra.system.entity.all;
-
-import com.alibaba.fastjson.JSON;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * 闈欐�佹暟鎹被
- * @author WWW
- */
-public class StaticData {
- /**
- * 鏉冮檺鎺掗櫎璺緞锛�/proxy锛岃姹傚叏閮ㄥ皬鍐�
- */
- public static String[] EXCLUDE_PATH = new String[]{"/sign/", "/perms/", "/wmts/select", "/swagger", "/v3/api-docs", "/error"};
-
- public final static int I1 = 1;
-
- public final static int I2 = 2;
-
- public final static int FOUR = 4;
-
- public final static int I5 = 5;
-
- public final static int NINE = 9;
-
- public final static int I10 = 10;
-
- public final static int SIXTEEN = 16;
-
- public final static int TWO_HUNDRED = 200;
-
- public final static int I100000 = 100000;
-
- public final static int I1000000 = 1000000;
-
- public static final double D90 = 90.0;
-
- public static final double D100 = 100.0;
-
- public static final double D1024 = 1024.0;
-
- public static final double D1050 = 1050.0;
-
- public static final int I12 = 12;
-
- public static final int I23 = 23;
-
- public static final int I24 = 24;
-
- public static final int I31 = 31;
-
- public static final int I50 = 50;
-
- public static final int I60 = 60;
-
- public static final int I90 = 90;
-
- public static final int I90_NEG = -90;
-
- public final static int I100 = 100;
-
- public final static int I120 = 120;
-
- public static final int I180 = 180;
-
- public static final int I180_NEG = -180;
-
- public static final int I1000 = 1000;
-
- public static final int I2050 = 2050;
-
- public static final int I4326 = 4326;
-
- public static final int I4490 = 4490;
-
- public final static String S1 = "1";
-
- public final static String EQ = "=";
-
- public final static String POINT = ".";
-
- public final static String COMMA = ",";
-
- public final static String TILDE = "~";
-
- public final static String SINGLE_QUOTES = "'";
-
- public final static String BBOREHOLE = "bborehole";
-
- public final static String SLASH = "/";
-
- public final static String IN = "in";
-
- public final static String DWG = "dwg";
-
- public final static String ZIP = ".zip";
-
- public final static String XLS = ".xls";
-
- public final static String XLSX = ".xlsx";
-
- public final static String MDB = ".mdb";
-
- public final static String KML = ".kml";
-
- public final static String SHP = ".shp";
-
- public final static String NGDB = "gdb";
-
- public final static String GDB = ".gdb";
-
- public final static String JPG = ".jpg";
-
- public final static String IMG = ".img";
-
- public final static String MPT = ".mpt";
-
- public final static String D3DML = ".3dml";
-
- public final static String TIF = ".tif";
-
- public final static String TIFF = ".tiff";
-
- public final static String LAS = ".las";
-
- public final static String OSGB = ".osgb";
-
- public static String ADMIN = "admin";
-
- public final static String SYS_META = "sysmeta";
-
- public final static String VERSION = "1.0.0";
-
- public final static String TOKEN_KEY = "token";
-
- public final static String TOKEN_COOKIE_KEY = "token";
-
- public final static String TEXT_ENCODER = "UTF-8";
-
- public final static String CHECK_MAIN = "checkMain";
-
- public final static String OBJECT = "java.lang.Object";
-
- public final static String DRUID_COOKIE_KEY = "JSESSIONID";
-
- public final static String YES = "YES";
-
- public final static String NO = "NO";
-
- public final static String ROUTE = "绾胯矾";
-
- public final static String CROSSING = "绌胯法瓒�";
-
- public final static String LINESTRING = "LINESTRING";
-
- public final static String MULTILINESTRING = "MULTILINESTRING";
-
- public final static String POLYGON = "POLYGON";
-
- public final static String MULTIPOLYGON = "MULTIPOLYGON";
-
- public final static String MULTICURVE = "MULTICURVE";
-
- public final static String COMPOUNDCURVE = "COMPOUNDCURVE";
-
- public final static String CGCS2000 = "CGCS2000";
-
- public static final String NO_FILE = JSON.toJSONString(new ResponseMsg<String>(HttpStatus.NOT_FOUND, "鏂囦欢鎵句笉鍒�"));
-
- /**
- * 16杩涘埗
- */
- public static final char[] HEX_DIGITS = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'};
-
- /**
- * 鏍呮牸鏁版嵁鎵╁睍鍚�
- */
- public final static List<String> RASTER_EXT = new ArrayList<>(Arrays.asList(".img", ".tif", ".tiff", ".jpg", ".jp2"));
-
- /**
- * 瀵嗙爜姝ｅ垯琛ㄨ揪寮�
- */
- public final static String PWD_REG = "^(?![a-zA-Z]+$)(?![A-Z0-9]+$)(?![A-Z\\W!@#$%^&*`~()\\-_+=,.?;<>]+$)(?![a-z0-9]+$)(?![a-z\\W!@#$%^&*`~()\\-_+=,.?;<>]+$)(?![0-9\\W!@#$%^&*`~()\\-_+=,.?;<>]+$)[a-zA-Z0-9\\W!@#$%^&*`~()\\-_+=,.?;<>]{12,20}$";
-
- /**
- * MPT鏂囦欢鎵╁睍鍚�
- */
- public final static List<String> MPT_EXT = new ArrayList<>(Arrays.asList(".midx", ".strmi", ".ei.midx", ".ei.mpt", ".ei.strmi"));
-
- /**
- * JPG鏂囦欢鎵╁睍鍚�
- */
- public final static List<String> JPG_EXT = new ArrayList<>(Arrays.asList(".jpg.aux.xml", ".jpg.ovr", ".jpg.xml", ".jgw", ".prj"));
-
- /**
- * JP2鏂囦欢鎵╁睍鍚�
- */
- public final static List<String> JP2_EXT = new ArrayList<>(Arrays.asList(".jp2.aux.xml", ".jp2.ovr", ".jp2.xml", ".jgw", ".prj", ".jp2.html", ".jp2.txt"));
-
- /**
- * IMG鏂囦欢鎵╁睍鍚�
- */
- public final static List<String> IMG_EXT = new ArrayList<>(Arrays.asList(".rrd", ".img.aux.xml", ".hdr", ".img.enp", ".img.xml"));
-
- /**
- * TIF鏂囦欢鎵╁睍鍚�
- */
- public final static List<String> TIF_EXT = new ArrayList<>(Arrays.asList(".prj", ".tfw", ".aux", ".tif.ovr", ".tif.aux.xml", ".tif.xml"));
-
- /**
- * TIFF鏂囦欢鎵╁睍鍚�
- */
- public final static List<String> TIFF_EXT = new ArrayList<>(Arrays.asList(".prj", ".tfw", ".aux", ".tiff.ovr", ".tiff.aux.xml", ".tiff.xml"));
-
- /**
- * SHP鏂囦欢鎵╁睍鍚�
- */
- public final static List<String> SHP_EXT = new ArrayList<>(Arrays.asList(".shx", ".dbf", ".prj", ".cpg"));
-
- /**
- * Mapper鎺掗櫎鎵╁睍鍚�
- */
- public final static List<String> MAPPER_EXCLUDE_EXT = new ArrayList<>(Arrays.asList(".jpg.aux.xml", ".jpg.xml", ".jp2.aux.xml", ".jp2.xml", ".jp2.html", ".jp2.txt", ".img.aux.xml", ".img.xml", ".tif.aux.xml", ".tif.xml", ".tiff.aux.xml", ".tiff.xml", ".shp.xml", ".ecw.xml", "ecw.aux.xml"));
-
- /**
- * 鎵�鏈夋枃浠舵墿灞曞悕
- */
- public final static List<String> ALL_EXTENSION = new ArrayList<>(Arrays.asList(".txt", ".xml", ".pdf", ".xls", ".xlsx", ".doc", ".docx", ".ppt", ".pptx", ".shp", ".gdb", ".mdb", ".dwg", ".las", ".laz", ".cpt", ".mpt", ".ei.mpt", ".fly", ".efb", ".g3d", ".fbx", ".obj", ".3dm", ".3dml", ".osgb", ".rvt", ".ifc", ".jpg", ".jp2", ".png", ".img", ".tif", ".tiff", ".dem", ".bmp", ".gif", ".rmvb", ".rm", ".mp3", ".mp4", ".avi", ".wma", ".wmv", ".7z", ".rar", ".zip", ".lz", ".kml"));
-
- /**
- * 鎻掑叆鎺掗櫎瀛楁
- */
- public final static List<String> INSERT_EXCLUDE_FIELDS = new ArrayList<>(Arrays.asList("gid", "objectid", "updateuser", "updatetime", "shape_leng", "shape_area", "serialVersionUID", "dirName", "depName", "verName", "createName", "updateName"));
-
- /**
- * 鏇存柊鎺掗櫎瀛楁
- */
- public final static List<String> UPDATE_EXCLUDE_FIELDS = new ArrayList<>(Arrays.asList("objectid", "createuser", "createtime", "shape_leng", "shape_area", "serialVersionUID", "dirName", "depName", "verName", "createName", "updateName"));
-
- /**
- * 璇诲彇鎺掗櫎瀛楁
- */
- public final static List<String> READ_EXCLUDE_FIELDS = new ArrayList<>(Arrays.asList("gid", "eventid", "parentid", "objectid", "dirid", "depid", "verid", "createtime", "createuser", "updateuser", "updatetime", "shape_leng", "shape_area", "serialversionuid", "dirname", "depname", "vername", "createname", "updatename"));
-
- /**
- * MDB鎺掗櫎瀛楁
- */
- public final static List<String> MDB_EXCLUDE_FIELDS = new ArrayList<>(Arrays.asList("Shape", "SHAPE_LENG", "Shape_Length", "Shape_Area", "OBJECTID_1"));
-
- /**
- * 鏍囩粯Shp鎺掗櫎瀛楁
- */
- public final static List<String> MARK_EXCLUDE_FIELDS = new ArrayList<>(Arrays.asList("wkt", "geom", "objectid", "shape_leng", "shape_area", "serialVersionUID", "dirName", "depName", "verName", "createName", "updateName"));
-
- /**
- * GDB鎺掗櫎瀛楁
- */
- public final static List<String> GDB_EXCLUDE_FIELDS = new ArrayList<>(Arrays.asList("geom", "objectid", "shape_leng", "shape_area", "serialVersionUID", "dirName", "depName", "verName", "createName", "updateName"));
-
- /**
- * 绠＄嚎鍒嗘瀽琛ㄥ悕闆嗗悎
- */
- public final static List<String> PIPE_ANALYSIS_TABS = new ArrayList<>(Arrays.asList("bd.dlg_25w_hydl", "bd.dlg_25w_lrdl", "bd.dlg_25w_lrrl", "bd.dlg_25w_hyda"));
-
- /**
- * 绠＄嚎鎺掗櫎瀛楁
- */
- public final static List<String> PIPE_EXCLUDE_FIELDS = new ArrayList<>(Arrays.asList("serialVersionUID", "tabs", "pwd", "gid", "wkt"));
-}
diff --git a/se-system/src/main/java/com/terra/system/entity/ctrl/DownloadTileEntity.java b/se-system/src/main/java/com/terra/system/entity/ctrl/DownloadTileEntity.java
index 048f5c3..5046554 100644
--- a/se-system/src/main/java/com/terra/system/entity/ctrl/DownloadTileEntity.java
+++ b/se-system/src/main/java/com/terra/system/entity/ctrl/DownloadTileEntity.java
@@ -1,7 +1,7 @@
package com.terra.system.entity.ctrl;
import com.terra.system.entity.all.AbstractPwdEntity;
-import com.terra.system.entity.all.StaticData;
+import com.terra.common.entity.all.StaticData;
import java.io.Serializable;
diff --git a/se-system/src/main/java/com/terra/system/entity/ctrl/SdkDecryptDataEntity.java b/se-system/src/main/java/com/terra/system/entity/ctrl/SdkDecryptDataEntity.java
index bb06400..9826da0 100644
--- a/se-system/src/main/java/com/terra/system/entity/ctrl/SdkDecryptDataEntity.java
+++ b/se-system/src/main/java/com/terra/system/entity/ctrl/SdkDecryptDataEntity.java
@@ -1,7 +1,7 @@
package com.terra.system.entity.ctrl;
import com.alibaba.fastjson.annotation.JSONField;
-import com.terra.system.entity.all.StaticData;
+import com.terra.common.entity.all.StaticData;
import java.io.Serializable;
import java.util.ArrayList;
diff --git a/se-system/src/main/java/com/terra/system/helper/AccessHelper.java b/se-system/src/main/java/com/terra/system/helper/AccessHelper.java
index 0574bf4..31f655a 100644
--- a/se-system/src/main/java/com/terra/system/helper/AccessHelper.java
+++ b/se-system/src/main/java/com/terra/system/helper/AccessHelper.java
@@ -1,6 +1,6 @@
package com.terra.system.helper;
-import com.terra.system.entity.all.StaticData;
+import com.terra.common.entity.all.StaticData;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
diff --git a/se-system/src/main/java/com/terra/system/helper/AsyncHelper.java b/se-system/src/main/java/com/terra/system/helper/AsyncHelper.java
index 7991ad3..aade5c4 100644
--- a/se-system/src/main/java/com/terra/system/helper/AsyncHelper.java
+++ b/se-system/src/main/java/com/terra/system/helper/AsyncHelper.java
@@ -1,7 +1,7 @@
package com.terra.system.helper;
-import com.terra.system.entity.all.StaticData;
+import com.terra.common.entity.all.StaticData;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
diff --git a/se-system/src/main/java/com/terra/system/helper/FileHelper.java b/se-system/src/main/java/com/terra/system/helper/FileHelper.java
index 5c90b78..fd36596 100644
--- a/se-system/src/main/java/com/terra/system/helper/FileHelper.java
+++ b/se-system/src/main/java/com/terra/system/helper/FileHelper.java
@@ -1,6 +1,6 @@
package com.terra.system.helper;
-import com.terra.system.entity.all.StaticData;
+import com.terra.common.entity.all.StaticData;
import com.terra.system.entity.data.MetaFileEntity;
//import com.twmacinta.util.MD5;
import org.apache.commons.codec.digest.DigestUtils;
diff --git a/se-system/src/main/java/com/terra/system/helper/GdbHelper.java b/se-system/src/main/java/com/terra/system/helper/GdbHelper.java
index e91a636..66571ea 100644
--- a/se-system/src/main/java/com/terra/system/helper/GdbHelper.java
+++ b/se-system/src/main/java/com/terra/system/helper/GdbHelper.java
@@ -1,7 +1,7 @@
package com.terra.system.helper;
import com.terra.system.entity.all.BaseGeoEntity;
-import com.terra.system.entity.all.StaticData;
+import com.terra.common.entity.all.StaticData;
import com.terra.system.mapper.all.BasicMapper;
import com.terra.system.mapper.all.GeomBaseMapper;
import com.terra.system.service.all.BaseQueryService;
diff --git a/se-system/src/main/java/com/terra/system/helper/PathHelper.java b/se-system/src/main/java/com/terra/system/helper/PathHelper.java
index d629cac..fdef8ec 100644
--- a/se-system/src/main/java/com/terra/system/helper/PathHelper.java
+++ b/se-system/src/main/java/com/terra/system/helper/PathHelper.java
@@ -2,7 +2,7 @@
import com.terra.system.config.PropertiesConfig;
import com.terra.system.entity.all.SettingData;
-import com.terra.system.entity.all.StaticData;
+import com.terra.common.entity.all.StaticData;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import javax.annotation.Resource;
diff --git a/se-system/src/main/java/com/terra/system/helper/RestHelper.java b/se-system/src/main/java/com/terra/system/helper/RestHelper.java
index bf09674..5e69f2e 100644
--- a/se-system/src/main/java/com/terra/system/helper/RestHelper.java
+++ b/se-system/src/main/java/com/terra/system/helper/RestHelper.java
@@ -1,6 +1,6 @@
package com.terra.system.helper;
-import com.terra.system.entity.all.StaticData;
+import com.terra.common.entity.all.StaticData;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.http.HttpEntity;
diff --git a/se-system/src/main/java/com/terra/system/helper/ShpHelper.java b/se-system/src/main/java/com/terra/system/helper/ShpHelper.java
index 818abbd..859db0b 100644
--- a/se-system/src/main/java/com/terra/system/helper/ShpHelper.java
+++ b/se-system/src/main/java/com/terra/system/helper/ShpHelper.java
@@ -1,6 +1,6 @@
package com.terra.system.helper;
-import com.terra.system.entity.all.StaticData;
+import com.terra.common.entity.all.StaticData;
import com.terra.system.entity.ctrl.MarkJsonEntity;
import com.terra.system.entity.ctrl.ShpRecordEntity;
import org.apache.commons.logging.Log;
diff --git a/se-system/src/main/java/com/terra/system/helper/StringHelper.java b/se-system/src/main/java/com/terra/system/helper/StringHelper.java
index 7f37887..dc024b9 100644
--- a/se-system/src/main/java/com/terra/system/helper/StringHelper.java
+++ b/se-system/src/main/java/com/terra/system/helper/StringHelper.java
@@ -1,6 +1,6 @@
package com.terra.system.helper;
-import com.terra.system.entity.all.StaticData;
+import com.terra.common.entity.all.StaticData;
import java.sql.Timestamp;
import java.text.SimpleDateFormat;
diff --git a/se-system/src/main/java/com/terra/system/helper/WebHelper.java b/se-system/src/main/java/com/terra/system/helper/WebHelper.java
index d0872ea..9d10f0d 100644
--- a/se-system/src/main/java/com/terra/system/helper/WebHelper.java
+++ b/se-system/src/main/java/com/terra/system/helper/WebHelper.java
@@ -1,10 +1,10 @@
package com.terra.system.helper;
import com.alibaba.fastjson.JSON;
-import com.terra.system.entity.all.HttpStatus;
-import com.terra.system.entity.all.ResponseMsg;
+import com.terra.common.entity.all.HttpStatus;
+import com.terra.common.entity.all.ResponseMsg;
import com.terra.system.entity.all.SettingData;
-import com.terra.system.entity.all.StaticData;
+import com.terra.common.entity.all.StaticData;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.web.context.request.RequestContextHolder;
diff --git a/se-system/src/main/java/com/terra/system/interceptor/AuthInterceptor.java b/se-system/src/main/java/com/terra/system/interceptor/AuthInterceptor.java
index 68bfb51..aef7f3f 100644
--- a/se-system/src/main/java/com/terra/system/interceptor/AuthInterceptor.java
+++ b/se-system/src/main/java/com/terra/system/interceptor/AuthInterceptor.java
@@ -1,7 +1,9 @@
package com.terra.system.interceptor;
import com.alibaba.fastjson.JSON;
-import com.terra.system.entity.all.*;
+import com.terra.common.entity.all.HttpStatus;
+import com.terra.common.entity.all.ResponseMsg;
+import com.terra.common.entity.all.StaticData;
import com.terra.system.entity.sys.TokenEntity;
import com.terra.system.entity.sys.UserEntity;
import com.terra.system.helper.StringHelper;
diff --git a/se-system/src/main/java/com/terra/system/service/all/BaseQueryService.java b/se-system/src/main/java/com/terra/system/service/all/BaseQueryService.java
index a9b53e4..f29d754 100644
--- a/se-system/src/main/java/com/terra/system/service/all/BaseQueryService.java
+++ b/se-system/src/main/java/com/terra/system/service/all/BaseQueryService.java
@@ -3,7 +3,7 @@
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.terra.system.entity.all.RedisCacheKey;
-import com.terra.system.entity.all.StaticData;
+import com.terra.common.entity.all.StaticData;
import com.terra.system.entity.ctrl.IdNameEntity;
import com.terra.system.entity.ctrl.KeyValueEntity;
import com.terra.system.entity.ctrl.TabEntity;
diff --git a/se-system/src/main/java/com/terra/system/service/all/BaseUploadService.java b/se-system/src/main/java/com/terra/system/service/all/BaseUploadService.java
index 08947a3..e16037e 100644
--- a/se-system/src/main/java/com/terra/system/service/all/BaseUploadService.java
+++ b/se-system/src/main/java/com/terra/system/service/all/BaseUploadService.java
@@ -1,6 +1,6 @@
package com.terra.system.service.all;
-import com.terra.system.entity.all.StaticData;
+import com.terra.common.entity.all.StaticData;
import com.terra.system.entity.data.DirEntity;
import com.terra.system.entity.data.MetaFileEntity;
import com.terra.system.entity.data.VerEntity;
diff --git a/se-system/src/main/java/com/terra/system/service/all/PermsService.java b/se-system/src/main/java/com/terra/system/service/all/PermsService.java
index b0077f7..40d8ed1 100644
--- a/se-system/src/main/java/com/terra/system/service/all/PermsService.java
+++ b/se-system/src/main/java/com/terra/system/service/all/PermsService.java
@@ -1,5 +1,6 @@
package com.terra.system.service.all;
+import com.terra.common.entity.all.StaticData;
import com.terra.system.entity.all.*;
import com.terra.system.entity.sys.MenuEntity;
import com.terra.system.entity.sys.ResEntity;
diff --git a/se-system/src/main/java/com/terra/system/service/all/SignService.java b/se-system/src/main/java/com/terra/system/service/all/SignService.java
index a1c79bc..e0ec3f9 100644
--- a/se-system/src/main/java/com/terra/system/service/all/SignService.java
+++ b/se-system/src/main/java/com/terra/system/service/all/SignService.java
@@ -1,7 +1,7 @@
package com.terra.system.service.all;
import com.terra.system.config.PropertiesConfig;
-import com.terra.system.entity.all.StaticData;
+import com.terra.common.entity.all.StaticData;
import com.terra.system.helper.WebHelper;
import org.apache.http.Header;
import org.apache.http.HttpEntity;
diff --git a/se-system/src/main/java/com/terra/system/service/all/UploadAttachService.java b/se-system/src/main/java/com/terra/system/service/all/UploadAttachService.java
index 4c81295..be06d07 100644
--- a/se-system/src/main/java/com/terra/system/service/all/UploadAttachService.java
+++ b/se-system/src/main/java/com/terra/system/service/all/UploadAttachService.java
@@ -1,7 +1,9 @@
package com.terra.system.service.all;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.terra.system.controller.all.BaseController;
+import com.terra.common.controller.all.BaseController;
+import com.terra.common.entity.all.ResponseMsg;
+import com.terra.common.entity.all.StaticData;
import com.terra.system.entity.all.*;
import com.terra.system.entity.ctrl.KeyValueEntity;
import com.terra.system.entity.data.DownloadEntity;
diff --git a/se-system/src/main/java/com/terra/system/service/all/WebSocketService.java b/se-system/src/main/java/com/terra/system/service/all/WebSocketService.java
index 4bbef82..bb29852 100644
--- a/se-system/src/main/java/com/terra/system/service/all/WebSocketService.java
+++ b/se-system/src/main/java/com/terra/system/service/all/WebSocketService.java
@@ -20,7 +20,7 @@
public class WebSocketService {
@PostConstruct
public void init() {
- System.out.println("websocket 鍔犺浇");
+ System.out.println("websocket 鍔犺浇...");
}
private final static Logger log = LoggerFactory.getLogger(WebSocketService.class);
diff --git a/se-system/src/main/java/com/terra/system/service/data/MetaService.java b/se-system/src/main/java/com/terra/system/service/data/MetaService.java
index e55c09a..fcafc7d 100644
--- a/se-system/src/main/java/com/terra/system/service/data/MetaService.java
+++ b/se-system/src/main/java/com/terra/system/service/data/MetaService.java
@@ -1,7 +1,7 @@
package com.terra.system.service.data;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.terra.system.entity.all.StaticData;
+import com.terra.common.entity.all.StaticData;
import com.terra.system.entity.ctrl.DownloadReqEntity;
import com.terra.system.entity.data.DownloadEntity;
import com.terra.system.entity.data.MetaEntity;
diff --git a/se-system/src/main/java/com/terra/system/service/data/PublishService.java b/se-system/src/main/java/com/terra/system/service/data/PublishService.java
index aaba9e8..eb1d05c 100644
--- a/se-system/src/main/java/com/terra/system/service/data/PublishService.java
+++ b/se-system/src/main/java/com/terra/system/service/data/PublishService.java
@@ -1,8 +1,8 @@
package com.terra.system.service.data;
import com.alibaba.fastjson.JSON;
-import com.terra.system.entity.all.ResponseMsg;
-import com.terra.system.entity.all.StaticData;
+import com.terra.common.entity.all.ResponseMsg;
+import com.terra.common.entity.all.StaticData;
import com.terra.system.entity.ctrl.PubEntity;
import com.terra.system.entity.ctrl.RegisterEntity;
import com.terra.system.entity.data.MetaEntity;
diff --git a/se-system/src/main/java/com/terra/system/service/data/RasterService.java b/se-system/src/main/java/com/terra/system/service/data/RasterService.java
index b3e6cc1..51709b7 100644
--- a/se-system/src/main/java/com/terra/system/service/data/RasterService.java
+++ b/se-system/src/main/java/com/terra/system/service/data/RasterService.java
@@ -1,6 +1,6 @@
package com.terra.system.service.data;
-import com.terra.system.entity.all.StaticData;
+import com.terra.common.entity.all.StaticData;
import com.terra.system.helper.StringHelper;
import com.terra.system.helper.WebHelper;
import org.apache.commons.logging.Log;
diff --git a/se-system/src/main/java/com/terra/system/service/data/UploadService.java b/se-system/src/main/java/com/terra/system/service/data/UploadService.java
index 24c3af5..8897c30 100644
--- a/se-system/src/main/java/com/terra/system/service/data/UploadService.java
+++ b/se-system/src/main/java/com/terra/system/service/data/UploadService.java
@@ -2,7 +2,7 @@
import cn.hutool.core.collection.ListUtil;
import com.terra.system.entity.all.BaseEntity;
-import com.terra.system.entity.all.StaticData;
+import com.terra.common.entity.all.StaticData;
import com.terra.system.entity.data.*;
import com.terra.system.entity.sys.UserEntity;
import com.terra.system.helper.*;
diff --git a/se-system/src/main/java/com/terra/system/service/show/ApplyService.java b/se-system/src/main/java/com/terra/system/service/show/ApplyService.java
index 855fc0f..a4d1579 100644
--- a/se-system/src/main/java/com/terra/system/service/show/ApplyService.java
+++ b/se-system/src/main/java/com/terra/system/service/show/ApplyService.java
@@ -1,6 +1,6 @@
package com.terra.system.service.show;
-import com.terra.system.entity.all.StaticData;
+import com.terra.common.entity.all.StaticData;
import com.terra.system.entity.ctrl.DownloadReqEntity;
import com.terra.system.entity.data.MetaEntity;
import com.terra.system.entity.show.ApplyEntity;
diff --git a/se-system/src/main/java/com/terra/system/service/show/CadService.java b/se-system/src/main/java/com/terra/system/service/show/CadService.java
index 78d4da6..eb7d4b5 100644
--- a/se-system/src/main/java/com/terra/system/service/show/CadService.java
+++ b/se-system/src/main/java/com/terra/system/service/show/CadService.java
@@ -1,6 +1,6 @@
package com.terra.system.service.show;
-import com.terra.system.entity.all.StaticData;
+import com.terra.common.entity.all.StaticData;
import com.terra.system.entity.data.MetaEntity;
import com.terra.system.entity.sys.AttachEntity;
import com.terra.system.helper.PathHelper;
diff --git a/se-system/src/main/java/com/terra/system/service/show/ExportService.java b/se-system/src/main/java/com/terra/system/service/show/ExportService.java
index f5c3c5f..e606303 100644
--- a/se-system/src/main/java/com/terra/system/service/show/ExportService.java
+++ b/se-system/src/main/java/com/terra/system/service/show/ExportService.java
@@ -1,8 +1,8 @@
package com.terra.system.service.show;
import com.alibaba.fastjson.JSON;
-import com.terra.system.entity.all.ResponseMsg;
-import com.terra.system.entity.all.StaticData;
+import com.terra.common.entity.all.ResponseMsg;
+import com.terra.common.entity.all.StaticData;
import com.terra.system.entity.data.DownloadEntity;
import com.terra.system.entity.show.ExportEntity;
import com.terra.system.entity.sys.UserEntity;
diff --git a/se-system/src/main/java/com/terra/system/service/show/InquiryService.java b/se-system/src/main/java/com/terra/system/service/show/InquiryService.java
index dcd6e3c..dd5a947 100644
--- a/se-system/src/main/java/com/terra/system/service/show/InquiryService.java
+++ b/se-system/src/main/java/com/terra/system/service/show/InquiryService.java
@@ -1,6 +1,6 @@
package com.terra.system.service.show;
-import com.terra.system.entity.all.StaticData;
+import com.terra.common.entity.all.StaticData;
import com.terra.system.entity.ctrl.DownloadTileEntity;
import com.terra.system.entity.ctrl.ShpRecordEntity;
import com.terra.system.entity.data.DownloadEntity;
diff --git a/se-system/src/main/java/com/terra/system/service/show/MarkService.java b/se-system/src/main/java/com/terra/system/service/show/MarkService.java
index 73110b9..4d2fbc4 100644
--- a/se-system/src/main/java/com/terra/system/service/show/MarkService.java
+++ b/se-system/src/main/java/com/terra/system/service/show/MarkService.java
@@ -1,6 +1,6 @@
package com.terra.system.service.show;
-import com.terra.system.entity.all.StaticData;
+import com.terra.common.entity.all.StaticData;
import com.terra.system.entity.ctrl.MarkJsonEntity;
import com.terra.system.entity.data.DownloadEntity;
import com.terra.system.entity.data.MetaFileEntity;
diff --git a/se-system/src/main/java/com/terra/system/service/show/PipelineService.java b/se-system/src/main/java/com/terra/system/service/show/PipelineService.java
index 26cd80f..51edd4d 100644
--- a/se-system/src/main/java/com/terra/system/service/show/PipelineService.java
+++ b/se-system/src/main/java/com/terra/system/service/show/PipelineService.java
@@ -1,6 +1,6 @@
package com.terra.system.service.show;
-import com.terra.system.entity.all.StaticData;
+import com.terra.common.entity.all.StaticData;
import com.terra.system.entity.data.DownloadEntity;
import com.terra.system.entity.show.PipelineEntity;
import com.terra.system.entity.sys.UserEntity;
diff --git a/se-system/src/main/java/com/terra/system/service/sys/ReportService.java b/se-system/src/main/java/com/terra/system/service/sys/ReportService.java
index dc62976..f7e40fc 100644
--- a/se-system/src/main/java/com/terra/system/service/sys/ReportService.java
+++ b/se-system/src/main/java/com/terra/system/service/sys/ReportService.java
@@ -1,7 +1,7 @@
package com.terra.system.service.sys;
import com.terra.system.entity.all.RedisCacheKey;
-import com.terra.system.entity.all.StaticData;
+import com.terra.common.entity.all.StaticData;
import com.terra.system.entity.ctrl.CoordinateEntity;
import com.terra.system.entity.ctrl.CountEntity;
import com.terra.system.entity.data.DownloadEntity;
diff --git a/se-system/src/main/resources/application-prod.yml b/se-system/src/main/resources/application-prod.yml
index 308eca4..dda1202 100644
--- a/se-system/src/main/resources/application-prod.yml
+++ b/se-system/src/main/resources/application-prod.yml
@@ -13,7 +13,7 @@
static-path-pattern: /static/**
# redis
redis:
- database: 0
+ database: 1
host: 127.0.0.1
port: 6369
password: rediS_5L#F4_Server
--
Gitblit v1.9.3