diff --git a/know_sub_common/pom.xml b/know_sub_common/pom.xml
index 05f0d4d..52962ca 100644
--- a/know_sub_common/pom.xml
+++ b/know_sub_common/pom.xml
@@ -16,30 +16,78 @@
<java.version>17</java.version>
</properties>
<dependencies>
+ <!--移除Tomcat依赖-->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-tomcat</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
- <groupId>com.mysql</groupId>
- <artifactId>mysql-connector-j</artifactId>
- <scope>runtime</scope>
+ <groupId>com.github.xiaoymin</groupId>
+ <artifactId>knife4j-openapi3-jakarta-spring-boot-starter</artifactId>
</dependency>
+
+ <!-- 其他依赖 -->
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-aop</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-undertow</artifactId>
+ </dependency>
+ <!--jsr303-->
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-validation</artifactId>
+ </dependency>
+
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-configuration-processor</artifactId>
<optional>true</optional>
</dependency>
+
+ <dependency>
+ <groupId>mysql</groupId>
+ <artifactId>mysql-connector-java</artifactId>
+ </dependency>
+
+
+ <dependency>
+ <groupId>com.alibaba</groupId>
+ <artifactId>druid-spring-boot-3-starter</artifactId>
+ </dependency>
+
+
+ <!-- SpringBoot集成mybatis框架 -->
+
+ <dependency>
+ <groupId>com.baomidou</groupId>
+ <artifactId>mybatis-plus-spring-boot3-starter</artifactId>
+ </dependency>
+
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
- <optional>true</optional>
+ <scope>provided</scope>
</dependency>
+
+ <dependency>
+ <groupId>cn.hutool</groupId>
+ <artifactId>hutool-all</artifactId>
+ </dependency>
+
<dependency>
<groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-test</artifactId>
- <scope>test</scope>
+ <artifactId>spring-boot-starter-validation</artifactId>
</dependency>
</dependencies>
diff --git a/know_sub_common/src/main/java/com/supervision/knowsub/config/JwtInterceptor.java b/know_sub_common/src/main/java/com/supervision/knowsub/config/JwtInterceptor.java
index f1d031c..78bb7e5 100644
--- a/know_sub_common/src/main/java/com/supervision/knowsub/config/JwtInterceptor.java
+++ b/know_sub_common/src/main/java/com/supervision/knowsub/config/JwtInterceptor.java
@@ -5,12 +5,12 @@ import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil;
import cn.hutool.jwt.JWT;
import cn.hutool.jwt.JWTUtil;
-import com.supervision.exception.BusinessException;
-import com.supervision.util.TokenUtil;
+import com.supervision.knowsub.exception.BusinessException;
+import com.supervision.knowsub.util.TokenUtil;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.NotNull;
import lombok.extern.slf4j.Slf4j;
-import org.jetbrains.annotations.NotNull;
import org.springframework.http.HttpStatus;
import org.springframework.lang.Nullable;
import org.springframework.web.servlet.HandlerInterceptor;
diff --git a/know_sub_common/src/main/java/com/supervision/knowsub/config/ResponseConfig.java b/know_sub_common/src/main/java/com/supervision/knowsub/config/ResponseConfig.java
index 67bb7c7..99f8d17 100644
--- a/know_sub_common/src/main/java/com/supervision/knowsub/config/ResponseConfig.java
+++ b/know_sub_common/src/main/java/com/supervision/knowsub/config/ResponseConfig.java
@@ -2,9 +2,8 @@ package com.supervision.knowsub.config;
import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONUtil;
-import com.supervision.domain.GlobalResult;
-import com.supervision.exception.BusinessException;
-import com.supervision.exception.HumanException;
+import com.supervision.knowsub.domain.GlobalResult;
+import com.supervision.knowsub.exception.BusinessException;
import lombok.extern.slf4j.Slf4j;
import org.springframework.core.MethodParameter;
import org.springframework.http.HttpStatus;
@@ -82,19 +81,6 @@ public class ResponseConfig implements ResponseBodyAdvice<Object> {
return GlobalResult.error( code, exception.getMessage(), message);
}
- /**
- * 数字人异常处理
- *
- * @param exception 业务异常
- * @return 通用返回值
- */
- @ExceptionHandler(HumanException.class)
- public GlobalResult<?> humanExceptionResponse(HumanException exception) {
- log.error(exception.getMessage(), exception);
- return GlobalResult.error(exception.getCode(), exception.getMessage(), "数字人异常");
- }
-
-
/**
* 参数验证异常处理
*
diff --git a/know_sub_common/src/main/java/com/supervision/knowsub/config/ThreadCache.java b/know_sub_common/src/main/java/com/supervision/knowsub/config/ThreadCache.java
new file mode 100644
index 0000000..1b58cc3
--- /dev/null
+++ b/know_sub_common/src/main/java/com/supervision/knowsub/config/ThreadCache.java
@@ -0,0 +1,30 @@
+/*
+ * 文 件 名: ThreadCache
+ * 版 权:
+ * 描 述: <描述>
+ * 修 改 人: RedName
+ * 修改时间: 2023/9/4
+ * 跟踪单号: <跟踪单号>
+ * 修改单号: <修改单号>
+ * 修改内容: <修改内容>
+ */
+package com.supervision.knowsub.config;
+
+
+/**
+ * <功能详细描述>
+ *
+ * @author ljt
+ * @version [版本号, 2023/9/4]
+ * @see [相关类/方法]
+ * @since [产品/模块版本]
+ */
+public class ThreadCache {
+
+ /**
+ * 用户ID
+ */
+ public static final ThreadLocal<String> USER = new ThreadLocal<>();
+
+
+}
diff --git a/know_sub_common/src/main/java/com/supervision/knowsub/domain/GlobalResult.java b/know_sub_common/src/main/java/com/supervision/knowsub/domain/GlobalResult.java
new file mode 100644
index 0000000..e0680d3
--- /dev/null
+++ b/know_sub_common/src/main/java/com/supervision/knowsub/domain/GlobalResult.java
@@ -0,0 +1,45 @@
+package com.supervision.knowsub.domain;
+
+import lombok.Data;
+import org.springframework.http.HttpStatus;
+
+@Data
+public class GlobalResult<T> {
+
+ private int code = 200;
+
+ private String msg = "success";
+
+ private T data;
+
+
+ public static <T> GlobalResult<T> ok() {
+ return ok(null);
+ }
+
+ public static <T> GlobalResult<T> ok(T data) {
+ GlobalResult<T> globalResult = new GlobalResult<>();
+ globalResult.setData(data);
+ return globalResult;
+ }
+
+ public static <T> GlobalResult<T> ok(T data, String message) {
+ GlobalResult<T> globalResult = new GlobalResult<>();
+ globalResult.setMsg(message);
+ globalResult.setData(data);
+ return globalResult;
+ }
+
+ public static <T> GlobalResult<T> error(String msg) {
+ return error(HttpStatus.INTERNAL_SERVER_ERROR.value(), null, msg);
+ }
+
+
+ public static <T> GlobalResult<T> error(int code, T data, String msg) {
+ GlobalResult<T> globalResult = new GlobalResult<>();
+ globalResult.setCode(code);
+ globalResult.setData(data);
+ globalResult.setMsg(msg);
+ return globalResult;
+ }
+}
diff --git a/know_sub_common/src/main/java/com/supervision/knowsub/domain/UserInfo.java b/know_sub_common/src/main/java/com/supervision/knowsub/domain/UserInfo.java
new file mode 100644
index 0000000..fb815c5
--- /dev/null
+++ b/know_sub_common/src/main/java/com/supervision/knowsub/domain/UserInfo.java
@@ -0,0 +1,11 @@
+package com.supervision.knowsub.domain;
+
+import lombok.Data;
+
+@Data
+public class UserInfo {
+
+ private String id;
+
+ private String name;
+}
diff --git a/know_sub_common/src/main/java/com/supervision/knowsub/util/SpringBeanUtil.java b/know_sub_common/src/main/java/com/supervision/knowsub/util/SpringBeanUtil.java
index 4c9cba8..15fa956 100644
--- a/know_sub_common/src/main/java/com/supervision/knowsub/util/SpringBeanUtil.java
+++ b/know_sub_common/src/main/java/com/supervision/knowsub/util/SpringBeanUtil.java
@@ -1,7 +1,7 @@
package com.supervision.knowsub.util;
import cn.hutool.core.util.ArrayUtil;
-import org.jetbrains.annotations.NotNull;
+import jakarta.validation.constraints.NotNull;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
import org.springframework.context.annotation.Lazy;