From ec7845c825b1ff0f566113c9cf0abd002b8440a0 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 16 七月 2025 13:34:59 +0800
Subject: [PATCH] 修改通用模块
---
se-common/src/main/java/com/terra/common/controller/all/BaseController.java | 6
se-common/src/main/java/com/terra/common/entity/all/ResponseMsg.java | 4
se-publish/src/main/java/com/terra/publish/controller/TestController.java | 6
se-common/src/main/java/com/terra/common/entity/all/HttpStatus.java | 2
se-common/src/main/java/com/terra/common/extend/UpdateBatchMethod.java | 4
se-collect/src/main/java/com/terra/collect/controller/TestController.java | 6
se-common/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports | 1
se-discover/src/main/java/com/terra/discover/controller/TestController.java | 6
se-publish/pom.xml | 14 --
sm.txt | 1
se-common/src/main/java/com/terra/common/entity/all/StaticData.java | 3
/dev/null | 104 --------------------
se-collect/pom.xml | 14 --
se-common/src/main/java/com/terra/common/extend/CustomizedSqlInjector.java | 4
se-common/pom.xml | 96 +-----------------
se-discover/pom.xml | 14 --
se-common/src/main/java/com/terra/common/config/MybatisPlusConfig.java | 6
se-common/src/main/java/com/terra/common/extend/InsertBatchMethod.java | 4
18 files changed, 36 insertions(+), 259 deletions(-)
diff --git a/se-collect/pom.xml b/se-collect/pom.xml
index 0ea80c2..dd2df5c 100644
--- a/se-collect/pom.xml
+++ b/se-collect/pom.xml
@@ -50,13 +50,6 @@
<optional>true</optional>
</dependency>
- <!--mybatis-plus-->
- <dependency>
- <groupId>com.baomidou</groupId>
- <artifactId>mybatis-plus-boot-starter</artifactId>
- <version>3.5.1</version>
- </dependency>
-
<!--redis-->
<dependency>
<groupId>org.springframework.boot</groupId>
@@ -78,13 +71,6 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-aop</artifactId>
- </dependency>
-
- <!--fastjson-->
- <dependency>
- <groupId>com.alibaba</groupId>
- <artifactId>fastjson</artifactId>
- <version>1.2.47</version>
</dependency>
<!--鏁村悎druid鏁版嵁婧�-->
diff --git a/se-collect/src/main/java/com/terra/collect/controller/TestController.java b/se-collect/src/main/java/com/terra/collect/controller/TestController.java
index 838127a..b1ec13a 100644
--- a/se-collect/src/main/java/com/terra/collect/controller/TestController.java
+++ b/se-collect/src/main/java/com/terra/collect/controller/TestController.java
@@ -1,10 +1,10 @@
package com.terra.collect.controller;
-import com.terra.collect.controller.all.BaseController;
+import com.terra.common.controller.all.BaseController;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
-import com.terra.collect.entity.all.ResponseMsg;
+import com.terra.common.entity.all.ResponseMsg;
import java.util.Date;
import java.text.SimpleDateFormat;
@@ -21,7 +21,7 @@
try {
String date = YMDHMS_FORMAT.format(new Date());
- return success(date);
+ return success("Collect", date);
} catch (Exception ex) {
return fail(ex, null);
}
diff --git a/se-collect/src/main/java/com/terra/collect/entity/all/ResponseMsg.java b/se-collect/src/main/java/com/terra/collect/entity/all/ResponseMsg.java
deleted file mode 100644
index 709ab69..0000000
--- a/se-collect/src/main/java/com/terra/collect/entity/all/ResponseMsg.java
+++ /dev/null
@@ -1,107 +0,0 @@
-package com.terra.collect.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-collect/src/main/java/com/terra/collect/mapper/all/PermsMapper.java b/se-collect/src/main/java/com/terra/collect/mapper/all/PermsMapper.java
deleted file mode 100644
index 9bb3735..0000000
--- a/se-collect/src/main/java/com/terra/collect/mapper/all/PermsMapper.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.terra.collect.mapper.all;
-
-import org.apache.ibatis.annotations.Mapper;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-@Mapper
-@Repository
-public interface PermsMapper {
- public List<Integer> selectRoles(String uid);
-}
diff --git a/se-collect/src/main/resources/mapper/all/PermsMapper.xml b/se-collect/src/main/resources/mapper/all/PermsMapper.xml
deleted file mode 100644
index 5136884..0000000
--- a/se-collect/src/main/resources/mapper/all/PermsMapper.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.terra.collect.mapper.all.PermsMapper">
- <select id="selectRoles" resultType="java.lang.Integer">
- select is_admin from lf.sys_role a inner join lf.sys_role_user b on a.id = b.roleid
- inner join lf.sys_user c on b.userid = c.id where c.uid = #{uid}
- </select>
-</mapper>
\ No newline at end of file
diff --git a/se-common/pom.xml b/se-common/pom.xml
index e965037..3554aa5 100644
--- a/se-common/pom.xml
+++ b/se-common/pom.xml
@@ -17,100 +17,18 @@
<dependencies>
- <!-- SpringCloud Openfeign -->
+ <!--mybatis-plus-->
<dependency>
- <groupId>org.springframework.cloud</groupId>
- <artifactId>spring-cloud-starter-openfeign</artifactId>
- </dependency>
-
- <!-- SpringCloud Loadbalancer -->
- <dependency>
- <groupId>org.springframework.cloud</groupId>
- <artifactId>spring-cloud-starter-loadbalancer</artifactId>
+ <groupId>com.baomidou</groupId>
+ <artifactId>mybatis-plus-boot-starter</artifactId>
+ <version>3.5.1</version>
</dependency>
- <!-- Spring Context Support -->
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context-support</artifactId>
- </dependency>
-
- <!-- Spring Web -->
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-web</artifactId>
- </dependency>
-
- <!-- Transmittable ThreadLocal -->
+ <!--fastjson-->
<dependency>
<groupId>com.alibaba</groupId>
- <artifactId>transmittable-thread-local</artifactId>
- </dependency>
-
- <!-- Pagehelper -->
- <dependency>
- <groupId>com.github.pagehelper</groupId>
- <artifactId>pagehelper-spring-boot-starter</artifactId>
- </dependency>
-
- <!-- Hibernate Validator -->
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-validation</artifactId>
- </dependency>
-
- <!-- Jackson -->
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- </dependency>
-
- <!-- Alibaba Fastjson -->
- <dependency>
- <groupId>com.alibaba.fastjson2</groupId>
- <artifactId>fastjson2</artifactId>
- </dependency>
-
- <!-- Jwt -->
- <dependency>
- <groupId>io.jsonwebtoken</groupId>
- <artifactId>jjwt</artifactId>
- </dependency>
-
- <!-- Jaxb -->
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- </dependency>
-
- <!-- Apache Lang3 -->
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- </dependency>
-
- <!-- Commons Io -->
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- </dependency>
-
- <!-- excel宸ュ叿 -->
- <dependency>
- <groupId>org.apache.poi</groupId>
- <artifactId>poi-ooxml</artifactId>
- </dependency>
-
- <!-- Java Servlet -->
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- </dependency>
-
- <!-- SpringBoot Boot Redis -->
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-data-redis</artifactId>
+ <artifactId>fastjson</artifactId>
+ <version>1.2.47</version>
</dependency>
</dependencies>
diff --git a/se-collect/src/main/java/com/terra/collect/config/MybatisPlusConfig.java b/se-common/src/main/java/com/terra/common/config/MybatisPlusConfig.java
similarity index 93%
rename from se-collect/src/main/java/com/terra/collect/config/MybatisPlusConfig.java
rename to se-common/src/main/java/com/terra/common/config/MybatisPlusConfig.java
index c658724..cac0596 100644
--- a/se-collect/src/main/java/com/terra/collect/config/MybatisPlusConfig.java
+++ b/se-common/src/main/java/com/terra/common/config/MybatisPlusConfig.java
@@ -1,11 +1,11 @@
-package com.terra.collect.config;
+package com.terra.common.config;
import com.baomidou.mybatisplus.annotation.DbType;
import com.baomidou.mybatisplus.autoconfigure.ConfigurationCustomizer;
import com.baomidou.mybatisplus.core.MybatisConfiguration;
import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
-import com.terra.collect.extend.CustomizedSqlInjector;
+import com.terra.common.extend.CustomizedSqlInjector;
import org.apache.ibatis.type.JdbcType;
import org.mybatis.spring.annotation.MapperScan;
import org.springframework.context.annotation.Bean;
@@ -18,7 +18,7 @@
*/
@EnableTransactionManagement
@Configuration
-@MapperScan("com.terra.system.mapper")
+@MapperScan("com.terra.*.mapper")
public class MybatisPlusConfig {
/**
* 鏂扮殑鍒嗛〉鎻掍欢,涓�缂撳拰浜岀紦閬靛惊mybatis鐨勮鍒�,闇�瑕佽缃�
diff --git a/se-collect/src/main/java/com/terra/collect/controller/all/BaseController.java b/se-common/src/main/java/com/terra/common/controller/all/BaseController.java
similarity index 89%
rename from se-collect/src/main/java/com/terra/collect/controller/all/BaseController.java
rename to se-common/src/main/java/com/terra/common/controller/all/BaseController.java
index 0b7fe53..0ded654 100644
--- a/se-collect/src/main/java/com/terra/collect/controller/all/BaseController.java
+++ b/se-common/src/main/java/com/terra/common/controller/all/BaseController.java
@@ -1,7 +1,7 @@
-package com.terra.collect.controller.all;
+package com.terra.common.controller.all;
-import com.terra.collect.entity.all.HttpStatus;
-import com.terra.collect.entity.all.ResponseMsg;
+import com.terra.common.entity.all.HttpStatus;
+import com.terra.common.entity.all.ResponseMsg;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
diff --git a/se-collect/src/main/java/com/terra/collect/entity/all/HttpStatus.java b/se-common/src/main/java/com/terra/common/entity/all/HttpStatus.java
similarity index 97%
rename from se-collect/src/main/java/com/terra/collect/entity/all/HttpStatus.java
rename to se-common/src/main/java/com/terra/common/entity/all/HttpStatus.java
index de74e60..58aa546 100644
--- a/se-collect/src/main/java/com/terra/collect/entity/all/HttpStatus.java
+++ b/se-common/src/main/java/com/terra/common/entity/all/HttpStatus.java
@@ -1,4 +1,4 @@
-package com.terra.collect.entity.all;
+package com.terra.common.entity.all;
/**
* Http鐘舵�佺爜绫�
diff --git a/se-publish/src/main/java/com/terra/publish/entity/all/ResponseMsg.java b/se-common/src/main/java/com/terra/common/entity/all/ResponseMsg.java
similarity index 96%
rename from se-publish/src/main/java/com/terra/publish/entity/all/ResponseMsg.java
rename to se-common/src/main/java/com/terra/common/entity/all/ResponseMsg.java
index 1ecc3c2..34fdee6 100644
--- a/se-publish/src/main/java/com/terra/publish/entity/all/ResponseMsg.java
+++ b/se-common/src/main/java/com/terra/common/entity/all/ResponseMsg.java
@@ -1,4 +1,6 @@
-package com.terra.publish.entity.all;
+package com.terra.common.entity.all;
+
+import com.terra.common.entity.all.HttpStatus;
/**
* 鍝嶅簲娑堟伅绫�
diff --git a/se-collect/src/main/java/com/terra/collect/entity/all/StaticData.java b/se-common/src/main/java/com/terra/common/entity/all/StaticData.java
similarity index 98%
rename from se-collect/src/main/java/com/terra/collect/entity/all/StaticData.java
rename to se-common/src/main/java/com/terra/common/entity/all/StaticData.java
index d112f34..4344aba 100644
--- a/se-collect/src/main/java/com/terra/collect/entity/all/StaticData.java
+++ b/se-common/src/main/java/com/terra/common/entity/all/StaticData.java
@@ -1,6 +1,7 @@
-package com.terra.collect.entity.all;
+package com.terra.common.entity.all;
import com.alibaba.fastjson.JSON;
+import com.terra.common.entity.all.HttpStatus;
import java.util.ArrayList;
import java.util.Arrays;
diff --git a/se-collect/src/main/java/com/terra/collect/extend/CustomizedSqlInjector.java b/se-common/src/main/java/com/terra/common/extend/CustomizedSqlInjector.java
similarity index 90%
rename from se-collect/src/main/java/com/terra/collect/extend/CustomizedSqlInjector.java
rename to se-common/src/main/java/com/terra/common/extend/CustomizedSqlInjector.java
index b552cb7..8637845 100644
--- a/se-collect/src/main/java/com/terra/collect/extend/CustomizedSqlInjector.java
+++ b/se-common/src/main/java/com/terra/common/extend/CustomizedSqlInjector.java
@@ -1,9 +1,9 @@
-package com.terra.collect.extend;
+package com.terra.common.extend;
import com.baomidou.mybatisplus.core.injector.AbstractMethod;
import com.baomidou.mybatisplus.core.injector.DefaultSqlInjector;
import com.baomidou.mybatisplus.core.metadata.TableInfo;
-import com.terra.collect.extend.UpdateBatchMethod;
+import com.terra.common.extend.UpdateBatchMethod;
import java.util.List;
diff --git a/se-collect/src/main/java/com/terra/collect/extend/InsertBatchMethod.java b/se-common/src/main/java/com/terra/common/extend/InsertBatchMethod.java
similarity index 97%
rename from se-collect/src/main/java/com/terra/collect/extend/InsertBatchMethod.java
rename to se-common/src/main/java/com/terra/common/extend/InsertBatchMethod.java
index 94d5873..af8b0e4 100644
--- a/se-collect/src/main/java/com/terra/collect/extend/InsertBatchMethod.java
+++ b/se-common/src/main/java/com/terra/common/extend/InsertBatchMethod.java
@@ -1,9 +1,9 @@
-package com.terra.collect.extend;
+package com.terra.common.extend;
import com.baomidou.mybatisplus.core.injector.AbstractMethod;
import com.baomidou.mybatisplus.core.metadata.TableFieldInfo;
import com.baomidou.mybatisplus.core.metadata.TableInfo;
-import com.terra.collect.entity.all.StaticData;
+import com.terra.common.entity.all.StaticData;
import org.apache.ibatis.executor.keygen.NoKeyGenerator;
import org.apache.ibatis.mapping.MappedStatement;
import org.apache.ibatis.mapping.SqlSource;
diff --git a/se-collect/src/main/java/com/terra/collect/extend/UpdateBatchMethod.java b/se-common/src/main/java/com/terra/common/extend/UpdateBatchMethod.java
similarity index 97%
rename from se-collect/src/main/java/com/terra/collect/extend/UpdateBatchMethod.java
rename to se-common/src/main/java/com/terra/common/extend/UpdateBatchMethod.java
index f698ed1..c62a78f 100644
--- a/se-collect/src/main/java/com/terra/collect/extend/UpdateBatchMethod.java
+++ b/se-common/src/main/java/com/terra/common/extend/UpdateBatchMethod.java
@@ -1,10 +1,10 @@
-package com.terra.collect.extend;
+package com.terra.common.extend;
import com.baomidou.mybatisplus.core.injector.AbstractMethod;
import com.baomidou.mybatisplus.core.metadata.TableFieldInfo;
import com.baomidou.mybatisplus.core.metadata.TableInfo;
import com.baomidou.mybatisplus.core.toolkit.sql.SqlScriptUtils;
-import com.terra.collect.entity.all.StaticData;
+import com.terra.common.entity.all.StaticData;
import org.apache.ibatis.mapping.MappedStatement;
import org.apache.ibatis.mapping.SqlSource;
diff --git a/se-common/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/se-common/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
index e69de29..4050f49 100644
--- a/se-common/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ b/se-common/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1 @@
+com.terra.common.config.MybatisPlusConfig
\ No newline at end of file
diff --git a/se-discover/pom.xml b/se-discover/pom.xml
index 9d43166..821b1e1 100644
--- a/se-discover/pom.xml
+++ b/se-discover/pom.xml
@@ -50,13 +50,6 @@
<optional>true</optional>
</dependency>
- <!--mybatis-plus-->
- <dependency>
- <groupId>com.baomidou</groupId>
- <artifactId>mybatis-plus-boot-starter</artifactId>
- <version>3.5.1</version>
- </dependency>
-
<!--redis-->
<dependency>
<groupId>org.springframework.boot</groupId>
@@ -78,13 +71,6 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-aop</artifactId>
- </dependency>
-
- <!--fastjson-->
- <dependency>
- <groupId>com.alibaba</groupId>
- <artifactId>fastjson</artifactId>
- <version>1.2.47</version>
</dependency>
<!--鏁村悎druid鏁版嵁婧�-->
diff --git a/se-discover/src/main/java/com/terra/discover/controller/TestController.java b/se-discover/src/main/java/com/terra/discover/controller/TestController.java
index 57f27fc..6296ae2 100644
--- a/se-discover/src/main/java/com/terra/discover/controller/TestController.java
+++ b/se-discover/src/main/java/com/terra/discover/controller/TestController.java
@@ -1,10 +1,10 @@
package com.terra.discover.controller;
-import com.terra.discover.controller.all.BaseController;
+import com.terra.common.controller.all.BaseController;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
-import com.terra.discover.entity.all.ResponseMsg;
+import com.terra.common.entity.all.ResponseMsg;
import java.util.Date;
import java.text.SimpleDateFormat;
@@ -21,7 +21,7 @@
try {
String date = YMDHMS_FORMAT.format(new Date());
- return success(date);
+ return success("Discover", date);
} catch (Exception ex) {
return fail(ex, null);
}
diff --git a/se-discover/src/main/java/com/terra/discover/controller/all/BaseController.java b/se-discover/src/main/java/com/terra/discover/controller/all/BaseController.java
deleted file mode 100644
index b9a37ce..0000000
--- a/se-discover/src/main/java/com/terra/discover/controller/all/BaseController.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.terra.discover.controller.all;
-
-import com.terra.discover.entity.all.HttpStatus;
-import com.terra.discover.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-discover/src/main/java/com/terra/discover/entity/all/HttpStatus.java b/se-discover/src/main/java/com/terra/discover/entity/all/HttpStatus.java
deleted file mode 100644
index 0493a47..0000000
--- a/se-discover/src/main/java/com/terra/discover/entity/all/HttpStatus.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package com.terra.discover.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-discover/src/main/java/com/terra/discover/entity/all/ResponseMsg.java b/se-discover/src/main/java/com/terra/discover/entity/all/ResponseMsg.java
deleted file mode 100644
index 8bbc6c7..0000000
--- a/se-discover/src/main/java/com/terra/discover/entity/all/ResponseMsg.java
+++ /dev/null
@@ -1,107 +0,0 @@
-package com.terra.discover.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-publish/pom.xml b/se-publish/pom.xml
index 9ac6e53..b906a8b 100644
--- a/se-publish/pom.xml
+++ b/se-publish/pom.xml
@@ -50,13 +50,6 @@
<optional>true</optional>
</dependency>
- <!--mybatis-plus-->
- <dependency>
- <groupId>com.baomidou</groupId>
- <artifactId>mybatis-plus-boot-starter</artifactId>
- <version>3.5.1</version>
- </dependency>
-
<!--redis-->
<dependency>
<groupId>org.springframework.boot</groupId>
@@ -78,13 +71,6 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-aop</artifactId>
- </dependency>
-
- <!--fastjson-->
- <dependency>
- <groupId>com.alibaba</groupId>
- <artifactId>fastjson</artifactId>
- <version>1.2.47</version>
</dependency>
<!--鏁村悎druid鏁版嵁婧�-->
diff --git a/se-publish/src/main/java/com/terra/publish/controller/TestController.java b/se-publish/src/main/java/com/terra/publish/controller/TestController.java
index ca65b42..e2cb747 100644
--- a/se-publish/src/main/java/com/terra/publish/controller/TestController.java
+++ b/se-publish/src/main/java/com/terra/publish/controller/TestController.java
@@ -1,10 +1,10 @@
package com.terra.publish.controller;
-import com.terra.publish.controller.all.BaseController;
+import com.terra.common.controller.all.BaseController;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
-import com.terra.publish.entity.all.ResponseMsg;
+import com.terra.common.entity.all.ResponseMsg;
import java.util.Date;
import java.text.SimpleDateFormat;
@@ -21,7 +21,7 @@
try {
String date = YMDHMS_FORMAT.format(new Date());
- return success(date);
+ return success("Publish", date);
} catch (Exception ex) {
return fail(ex, null);
}
diff --git a/se-publish/src/main/java/com/terra/publish/controller/all/BaseController.java b/se-publish/src/main/java/com/terra/publish/controller/all/BaseController.java
deleted file mode 100644
index 8f88139..0000000
--- a/se-publish/src/main/java/com/terra/publish/controller/all/BaseController.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.terra.publish.controller.all;
-
-import com.terra.publish.entity.all.HttpStatus;
-import com.terra.publish.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-publish/src/main/java/com/terra/publish/entity/all/HttpStatus.java b/se-publish/src/main/java/com/terra/publish/entity/all/HttpStatus.java
deleted file mode 100644
index 0a38b51..0000000
--- a/se-publish/src/main/java/com/terra/publish/entity/all/HttpStatus.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package com.terra.publish.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/sm.txt b/sm.txt
index 9dad3ee..8531e94 100644
--- a/sm.txt
+++ b/sm.txt
@@ -20,6 +20,7 @@
nacos锛歯Acos_!9#_admIn
http://localhost:8848/nacos
+http://localhost:8001/webjars/swagger-ui/index.html
http://localhost:8001/system/sign/getPublicKey
http://localhost:8002/sign/getPublicKey
http://localhost:8001/system/dir/selectDir?id=1
--
Gitblit v1.9.3