update

pom.xml

@@ -65,123 +65,5 @@
         </dependencies>
     </dependencyManagement>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-pool2</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.junit.vintage</groupId>
-                    <artifactId>junit-vintage-engine</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-boot-starter</artifactId>
-            <version>3.5.6</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-redis</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger2</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger-ui</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>fastjson</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.googlecode.aviator</groupId>
-            <artifactId>aviator</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.xuxueli</groupId>
-            <artifactId>xxl-job-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-commons</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.kafka</groupId>
-            <artifactId>spring-kafka</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-openfeign</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.ctrip.framework.apollo</groupId>
-            <artifactId>apollo-client</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.aliyun.odps</groupId>
-            <artifactId>odps-sdk-core</artifactId>
-            <version>0.27.2-public</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.tzld.commons</groupId>
-            <artifactId>aliyun-log-spring-boot-starter</artifactId>
-            <version>2.0.0</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>aliyun-log</artifactId>
-                    <groupId>com.aliyun.openservices</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>com.google.protobuf</groupId>
-            <artifactId>protobuf-java</artifactId>
-            <version>2.5.0</version>
-        </dependency>
-        <dependency>
-            <groupId>com.aliyun.openservices</groupId>
-            <artifactId>aliyun-log-logback-appender</artifactId>
-            <version>0.1.18</version>
-        </dependency>
-
-    </dependencies>
+    <!-- 子模块自行声明依赖，这里仅做依赖版本管理 -->
 </project>

supply-demand-engine-core/pom.xml

@@ -12,4 +12,94 @@
     <name>supply-demand-engine-core</name>
     <description>supply-demand-engine-core</description>
 
+    <dependencies>
+        <!-- 数据访问与缓存 -->
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-boot-starter</artifactId>
+            <version>3.5.6</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-redis</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-pool2</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-commons</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+        </dependency>
+
+        <!-- Bean 校验（javax.validation.constraints.*） -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-validation</artifactId>
+        </dependency>
+
+        <!-- 工具 -->
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+        </dependency>
+
+        <!-- 日志 & 作业 & 外部服务 -->
+        <dependency>
+            <groupId>com.xuxueli</groupId>
+            <artifactId>xxl-job-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.aliyun.odps</groupId>
+            <artifactId>odps-sdk-core</artifactId>
+            <version>0.27.2-public</version>
+        </dependency>
+        <dependency>
+            <groupId>com.tzld.commons</groupId>
+            <artifactId>aliyun-log-spring-boot-starter</artifactId>
+            <version>2.0.0</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>aliyun-log</artifactId>
+                    <groupId>com.aliyun.openservices</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>com.aliyun.openservices</groupId>
+            <artifactId>aliyun-log-logback-appender</artifactId>
+            <version>0.1.18</version>
+        </dependency>
+
+        <!-- 测试 -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.junit.vintage</groupId>
+                    <artifactId>junit-vintage-engine</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+    </dependencies>
 </project>

supply-demand-engine-core/src/main/java/com/tzld/piaoquan/sde/config/SwaggerConfig.java

@@ -1,37 +0,0 @@
-package com.tzld.piaoquan.sde.config;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Profile;
-import springfox.documentation.builders.ApiInfoBuilder;
-import springfox.documentation.builders.PathSelectors;
-import springfox.documentation.builders.RequestHandlerSelectors;
-import springfox.documentation.service.ApiInfo;
-import springfox.documentation.spi.DocumentationType;
-import springfox.documentation.spring.web.plugins.Docket;
-
-/**
- * swagger2 配置
- * @author supeng
- */
-@Configuration
-@Profile({"dev","test"})
-public class SwaggerConfig {
-    @Bean
-    public Docket createRestApi() {
-        return new Docket(DocumentationType.SWAGGER_2)
-                .apiInfo(apiInfo())
-                .select()
-                .apis(RequestHandlerSelectors.basePackage("com.tzld.piaoquan.sde.controller"))
-                .paths(PathSelectors.any())
-                .build();
-    }
-
-    private ApiInfo apiInfo() {
-        return new ApiInfoBuilder()
-                .title("supply-demand-engine swagger api")
-                .description("supply-demand-engine swagger api")
-                .version("1.0")
-                .build();
-    }
-}

supply-demand-engine-core/src/main/java/com/tzld/piaoquan/sde/dao/mapper/SdPromptTemplateMapper.java → supply-demand-engine-core/src/main/java/com/tzld/piaoquan/sde/mapper/SdPromptTemplateMapper.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.sde.dao.mapper;
+package com.tzld.piaoquan.sde.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.tzld.piaoquan.sde.model.entity.SdPromptTemplate;

supply-demand-engine-core/src/main/java/com/tzld/piaoquan/sde/dao/mapper/SdStrategyMapper.java → supply-demand-engine-core/src/main/java/com/tzld/piaoquan/sde/mapper/SdStrategyMapper.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.sde.dao.mapper;
+package com.tzld.piaoquan.sde.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.tzld.piaoquan.sde.model.entity.SdStrategy;

supply-demand-engine-core/src/main/java/com/tzld/piaoquan/sde/dao/mapper/SdSubTaskMapper.java → supply-demand-engine-core/src/main/java/com/tzld/piaoquan/sde/mapper/SdSubTaskMapper.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.sde.dao.mapper;
+package com.tzld.piaoquan.sde.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.tzld.piaoquan.sde.model.entity.SdSubTask;

supply-demand-engine-core/src/main/java/com/tzld/piaoquan/sde/dao/mapper/SdSubTaskRawResultMapper.java → supply-demand-engine-core/src/main/java/com/tzld/piaoquan/sde/mapper/SdSubTaskRawResultMapper.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.sde.dao.mapper;
+package com.tzld.piaoquan.sde.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.tzld.piaoquan.sde.model.entity.SdSubTaskRawResult;

supply-demand-engine-core/src/main/java/com/tzld/piaoquan/sde/dao/mapper/SdSubTaskResultItemMapper.java → supply-demand-engine-core/src/main/java/com/tzld/piaoquan/sde/mapper/SdSubTaskResultItemMapper.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.sde.dao.mapper;
+package com.tzld.piaoquan.sde.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.tzld.piaoquan.sde.model.entity.SdSubTaskResultItem;

supply-demand-engine-core/src/main/java/com/tzld/piaoquan/sde/dao/mapper/SdTaskMapper.java → supply-demand-engine-core/src/main/java/com/tzld/piaoquan/sde/mapper/SdTaskMapper.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.sde.dao.mapper;
+package com.tzld.piaoquan.sde.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.tzld.piaoquan.sde.model.entity.SdTask;

supply-demand-engine-core/src/main/java/com/tzld/piaoquan/sde/dao/mapper/SdTaskResultMapper.java → supply-demand-engine-core/src/main/java/com/tzld/piaoquan/sde/mapper/SdTaskResultMapper.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.sde.dao.mapper;
+package com.tzld.piaoquan.sde.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.tzld.piaoquan.sde.model.entity.SdTaskResult;

supply-demand-engine-core/src/main/java/com/tzld/piaoquan/sde/service/impl/SubTaskServiceImpl.java

@@ -7,7 +7,7 @@ import com.tzld.piaoquan.sde.common.api.CommonRequest;
 import com.tzld.piaoquan.sde.common.enums.IsDeleteEnum;
 import com.tzld.piaoquan.sde.common.enums.SubTaskTypeEnum;
 import com.tzld.piaoquan.sde.common.enums.TaskStatusEnum;
-import com.tzld.piaoquan.sde.dao.mapper.SdSubTaskMapper;
+import com.tzld.piaoquan.sde.mapper.SdSubTaskMapper;
 import com.tzld.piaoquan.sde.model.request.SubTaskGetParam;
 import com.tzld.piaoquan.sde.model.request.SubTaskListParam;
 import com.tzld.piaoquan.sde.model.entity.SdSubTask;

supply-demand-engine-core/src/main/java/com/tzld/piaoquan/sde/service/impl/TaskServiceImpl.java

@@ -10,8 +10,8 @@ import com.tzld.piaoquan.sde.common.enums.IsDeleteEnum;
 import com.tzld.piaoquan.sde.common.enums.TaskStatusEnum;
 import com.tzld.piaoquan.sde.common.enums.TaskTypeEnum;
 import com.tzld.piaoquan.sde.common.exception.BizException;
-import com.tzld.piaoquan.sde.dao.mapper.SdStrategyMapper;
-import com.tzld.piaoquan.sde.dao.mapper.SdTaskMapper;
+import com.tzld.piaoquan.sde.mapper.SdStrategyMapper;
+import com.tzld.piaoquan.sde.mapper.SdTaskMapper;
 import com.tzld.piaoquan.sde.model.request.TaskCreateParam;
 import com.tzld.piaoquan.sde.model.request.TaskGetParam;
 import com.tzld.piaoquan.sde.model.request.TaskListParam;

supply-demand-engine-core/src/main/java/com/tzld/piaoquan/sde/util/IpUtil.java

@@ -1,41 +1,41 @@
 package com.tzld.piaoquan.sde.util;
 
-import javax.servlet.http.HttpServletRequest;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-
-public class IpUtil {
-    public static String getIpAddr(HttpServletRequest request) {
-        String ipAddress;
-        ipAddress = request.getHeader("x-forwarded-for");
-        if (ipAddress == null || ipAddress.length() == 0
-                || "unknown".equalsIgnoreCase(ipAddress)) {
-            ipAddress = request.getHeader("Proxy-Client-IP");
-        }
-        if (ipAddress == null || ipAddress.length() == 0
-                || "unknown".equalsIgnoreCase(ipAddress)) {
-            ipAddress = request.getHeader("WL-Proxy-Client-IP");
-        }
-        if (ipAddress == null || ipAddress.length() == 0
-                || "unknown".equalsIgnoreCase(ipAddress)) {
-            ipAddress = request.getRemoteAddr();
-            if ("127.0.0.1".equals(ipAddress)) {
-                // 根据网卡取本机配置的IP
-                InetAddress inet;
-                try {
-                    inet = InetAddress.getLocalHost();
-                    ipAddress = inet.getHostAddress();
-                } catch (UnknownHostException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-        // 对于通过多个代理的情况，第一个IP为客户端真实IP,多个IP按照','分割
-        if (ipAddress != null && ipAddress.length() > 15) { // "***.***.***.***".length()
-            if (ipAddress.indexOf(",") > 0) {
-                ipAddress = ipAddress.substring(0, ipAddress.indexOf(","));
-            }
-        }
-        return ipAddress;
-    }
-}
+//import javax.servlet.http.HttpServletRequest;
+//import java.net.InetAddress;
+//import java.net.UnknownHostException;
+//
+//public class IpUtil {
+//    public static String getIpAddr(HttpServletRequest request) {
+//        String ipAddress;
+//        ipAddress = request.getHeader("x-forwarded-for");
+//        if (ipAddress == null || ipAddress.length() == 0
+//                || "unknown".equalsIgnoreCase(ipAddress)) {
+//            ipAddress = request.getHeader("Proxy-Client-IP");
+//        }
+//        if (ipAddress == null || ipAddress.length() == 0
+//                || "unknown".equalsIgnoreCase(ipAddress)) {
+//            ipAddress = request.getHeader("WL-Proxy-Client-IP");
+//        }
+//        if (ipAddress == null || ipAddress.length() == 0
+//                || "unknown".equalsIgnoreCase(ipAddress)) {
+//            ipAddress = request.getRemoteAddr();
+//            if ("127.0.0.1".equals(ipAddress)) {
+//                // 根据网卡取本机配置的IP
+//                InetAddress inet;
+//                try {
+//                    inet = InetAddress.getLocalHost();
+//                    ipAddress = inet.getHostAddress();
+//                } catch (UnknownHostException e) {
+//                    e.printStackTrace();
+//                }
+//            }
+//        }
+//        // 对于通过多个代理的情况，第一个IP为客户端真实IP,多个IP按照','分割
+//        if (ipAddress != null && ipAddress.length() > 15) { // "***.***.***.***".length()
+//            if (ipAddress.indexOf(",") > 0) {
+//                ipAddress = ipAddress.substring(0, ipAddress.indexOf(","));
+//            }
+//        }
+//        return ipAddress;
+//    }
+//}

supply-demand-engine-job/pom.xml

@@ -21,6 +21,53 @@
 			<artifactId>supply-demand-engine-core</artifactId>
 			<version>1.0.0</version>
 		</dependency>
+
+		<!-- Web 支持（健康检查等） -->
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-web</artifactId>
+		</dependency>
+
+		<!-- 注册发现 / 调用 -->
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-starter-openfeign</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.ctrip.framework.apollo</groupId>
+			<artifactId>apollo-client</artifactId>
+		</dependency>
+
+		<!-- API 文档 -->
+		<dependency>
+			<groupId>org.springdoc</groupId>
+			<artifactId>springdoc-openapi-ui</artifactId>
+			<version>1.7.0</version>
+		</dependency>
+
+		<!-- Lombok，仅在编译期使用 -->
+		<dependency>
+			<groupId>org.projectlombok</groupId>
+			<artifactId>lombok</artifactId>
+			<scope>provided</scope>
+		</dependency>
+
+		<!-- 测试 -->
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-test</artifactId>
+			<scope>test</scope>
+			<exclusions>
+				<exclusion>
+					<groupId>org.junit.vintage</groupId>
+					<artifactId>junit-vintage-engine</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
 	</dependencies>
 
 	<build>
@@ -30,7 +77,7 @@
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
 				<configuration>
-					<mainClass>com.tzld.piaoquan.sde.Application</mainClass>
+					<mainClass>com.tzld.piaoquan.sde.JobApplication</mainClass>
 					<layout>ZIP</layout>
 				</configuration>
 				<executions>

supply-demand-engine-job/src/main/java/com/tzld/piaoquan/sde/JobApplication.java

@@ -7,7 +7,6 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.web.servlet.ServletComponentScan;
 import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
 import org.springframework.cloud.openfeign.EnableFeignClients;
-import springfox.documentation.swagger2.annotations.EnableSwagger2;
 
 /**
  * 启动类
@@ -16,11 +15,10 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
  */
 @Slf4j
 @SpringBootApplication
-@MapperScan("com.tzld.piaoquan.sde.dao.mapper")
+@MapperScan("com.tzld.piaoquan.sde.mapper")
 @ServletComponentScan("com.tzld.piaoquan.sde")
 @EnableFeignClients
 @EnableEurekaClient
-@EnableSwagger2
 public class JobApplication {
 
 	public static void main(String[] args) {

supply-demand-engine-job/src/main/resources/application-dev.yml

@@ -1,6 +1,10 @@
 server:
   port: 8080
 
+springdoc:
+  api-docs:
+    enabled: true
+
 eureka:
   instance:
     prefer-ip-address: true #是否优先使用IP地址作为主机名的标识，默认false

supply-demand-engine-job/src/main/resources/application-pre.yml

@@ -1,6 +1,10 @@
 server:
   port: 8080
 
+springdoc:
+  api-docs:
+    enabled: false
+
 eureka:
   instance:
     prefer-ip-address: true #是否优先使用IP地址作为主机名的标识，默认false

supply-demand-engine-job/src/main/resources/application-prod.yml

@@ -1,6 +1,10 @@
 server:
   port: 8080
 
+springdoc:
+  api-docs:
+    enabled: false
+
 eureka:
   instance:
     prefer-ip-address: true #是否优先使用IP地址作为主机名的标识，默认false

supply-demand-engine-job/src/main/resources/application-stress.yml

@@ -1,6 +1,10 @@
 server:
   port: 8080
 
+springdoc:
+  api-docs:
+    enabled: true
+
 eureka:
   instance:
     prefer-ip-address: true #是否优先使用IP地址作为主机名的标识，默认false

supply-demand-engine-job/src/main/resources/application-test.yml

@@ -1,6 +1,10 @@
 server:
   port: 8080
 
+springdoc:
+  api-docs:
+    enabled: true
+
 eureka:
   instance:
     prefer-ip-address: true #是否优先使用IP地址作为主机名的标识，默认false

supply-demand-engine-service/pom.xml

@@ -21,6 +21,57 @@
             <artifactId>supply-demand-engine-core</artifactId>
             <version>1.0.0</version>
         </dependency>
+
+        <!-- Web 层 -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-validation</artifactId>
+        </dependency>
+
+        <!-- API 文档 -->
+        <dependency>
+            <groupId>org.springdoc</groupId>
+            <artifactId>springdoc-openapi-ui</artifactId>
+            <version>1.7.0</version>
+        </dependency>
+
+        <!-- Lombok，仅在编译期使用 -->
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <!-- 注册发现 / 调用 -->
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-openfeign</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.ctrip.framework.apollo</groupId>
+            <artifactId>apollo-client</artifactId>
+        </dependency>
+
+        <!-- 测试 -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.junit.vintage</groupId>
+                    <artifactId>junit-vintage-engine</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>
@@ -30,7 +81,7 @@
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
                 <configuration>
-                    <mainClass>com.tzld.piaoquan.sde.Application</mainClass>
+                    <mainClass>com.tzld.piaoquan.sde.ServiceApplication</mainClass>
                     <layout>ZIP</layout>
                 </configuration>
                 <executions>

supply-demand-engine-service/src/main/java/com/tzld/piaoquan/sde/ServiceApplication.java

@@ -2,14 +2,11 @@ package com.tzld.piaoquan.sde;
 
 import lombok.extern.slf4j.Slf4j;
 import org.mybatis.spring.annotation.MapperScan;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.web.servlet.ServletComponentScan;
 import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
 import org.springframework.cloud.openfeign.EnableFeignClients;
-import springfox.documentation.swagger2.annotations.EnableSwagger2;
 
 /**
  * 启动类
@@ -18,11 +15,10 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
  */
 @Slf4j
 @SpringBootApplication
-@MapperScan("com.tzld.piaoquan.sde.dao.mapper")
+@MapperScan("com.tzld.piaoquan.sde.mapper")
 @ServletComponentScan("com.tzld.piaoquan.sde")
 @EnableFeignClients
 @EnableEurekaClient
-@EnableSwagger2
 public class ServiceApplication{
 
     public static void main(String[] args) {

supply-demand-engine-service/src/main/java/com/tzld/piaoquan/sde/controller/SubTaskController.java

@@ -9,7 +9,7 @@ import com.tzld.piaoquan.sde.model.request.TaskCreateParam;
 import com.tzld.piaoquan.sde.model.entity.SdSubTask;
 import com.tzld.piaoquan.sde.model.vo.SdSubTaskVO;
 import com.tzld.piaoquan.sde.service.SubTaskService;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -18,7 +18,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
- *
  * @author supeng
  */
 @Slf4j
@@ -29,20 +28,20 @@ public class SubTaskController {
     @Autowired
     private SubTaskService subTaskService;
 
-    @ApiOperation(value = "创建任务", notes = "创建任务")
+    @Operation(summary = "创建子任务")
     @PostMapping("/create")
     public CommonResponse<Void> create(@RequestBody CommonRequest<TaskCreateParam> request) {
 //        subTaskService.create(request);
         return CommonResponse.create();
     }
 
-    @ApiOperation(value = "获取任务信息", notes = "获取任务信息")
+    @Operation(summary = "获取子任务列表")
     @PostMapping("/list")
     public CommonResponse<Page<SdSubTaskVO>> list(@RequestBody CommonRequest<SubTaskListParam> request) {
         return CommonResponse.create(subTaskService.list(request));
     }
 
-    @ApiOperation(value = "获取任务信息", notes = "获取任务信息")
+    @Operation(summary = "获取子任务信息")
     @PostMapping("/get")
     public CommonResponse<SdSubTask> get(@RequestBody CommonRequest<SubTaskGetParam> request) {
         return CommonResponse.create(subTaskService.get(request));

supply-demand-engine-service/src/main/java/com/tzld/piaoquan/sde/controller/TaskController.java

@@ -9,7 +9,7 @@ import com.tzld.piaoquan.sde.model.request.TaskListParam;
 import com.tzld.piaoquan.sde.model.entity.SdTask;
 import com.tzld.piaoquan.sde.model.vo.SdTaskVO;
 import com.tzld.piaoquan.sde.service.TaskService;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -29,20 +29,20 @@ public class TaskController {
     @Autowired
     private TaskService taskService;
 
-    @ApiOperation(value = "创建任务", notes = "创建任务")
+    @Operation(summary = "创建任务")
     @PostMapping("/create")
     public CommonResponse<Void> create(@RequestBody CommonRequest<TaskCreateParam> request) {
         taskService.create(request);
         return CommonResponse.create();
     }
 
-    @ApiOperation(value = "获取任务信息", notes = "获取任务信息")
+    @Operation(summary = "获取任务列表")
     @PostMapping("/list")
     public CommonResponse<Page<SdTaskVO>> list(@RequestBody CommonRequest<TaskListParam> request) {
         return CommonResponse.create(taskService.list(request));
     }
 
-    @ApiOperation(value = "获取任务信息", notes = "获取任务信息")
+    @Operation(summary = "获取任务信息")
     @PostMapping("/get")
     public CommonResponse<SdTask> get(@RequestBody CommonRequest<TaskGetParam> request) {
         return CommonResponse.create(taskService.get(request));

supply-demand-engine-service/src/main/java/com/tzld/piaoquan/sde/web/aspect/LogRequestAspect.java

@@ -6,7 +6,7 @@ import com.google.common.base.Strings;
 import com.tzld.commons.aliyun.log.AliyunLogManager;
 import com.tzld.piaoquan.sde.common.api.CommonResponse;
 import com.tzld.piaoquan.sde.common.constant.Constant;
-import com.tzld.piaoquan.sde.util.IpUtil;
+//import com.tzld.piaoquan.sde.util.IpUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.annotation.*;
@@ -97,7 +97,7 @@ public class LogRequestAspect {
             logMap.put("method", request.getMethod());
             logMap.put("header", getHeaders(request));
             logMap.put("elapsedTime", String.valueOf(System.currentTimeMillis() - startTime));
-            logMap.put("clientIp", IpUtil.getIpAddr(request));
+//            logMap.put("clientIp", IpUtil.getIpAddr(request));
             logMap.put("requestBody", getRequestBody(point.getArgs()));
             logMap.put(Constant.LOG_TRACE_ID, Strings.nullToEmpty(MDC.get(Constant.LOG_TRACE_ID)));
             logMap.put("responseBody", message);

supply-demand-engine-service/src/main/resources/application-dev.yml

@@ -1,6 +1,10 @@
 server:
   port: 8080
 
+springdoc:
+  api-docs:
+    enabled: true
+
 eureka:
   instance:
     prefer-ip-address: true #是否优先使用IP地址作为主机名的标识，默认false

supply-demand-engine-service/src/main/resources/application-pre.yml

@@ -1,6 +1,10 @@
 server:
   port: 8080
 
+springdoc:
+  api-docs:
+    enabled: false
+
 eureka:
   instance:
     prefer-ip-address: true #是否优先使用IP地址作为主机名的标识，默认false

supply-demand-engine-service/src/main/resources/application-prod.yml

@@ -1,6 +1,10 @@
 server:
   port: 8080
 
+springdoc:
+  api-docs:
+    enabled: false
+
 eureka:
   instance:
     prefer-ip-address: true #是否优先使用IP地址作为主机名的标识，默认false

supply-demand-engine-service/src/main/resources/application-stress.yml

@@ -1,6 +1,10 @@
 server:
   port: 8080
 
+springdoc:
+  api-docs:
+    enabled: false
+
 eureka:
   instance:
     prefer-ip-address: true #是否优先使用IP地址作为主机名的标识，默认false

supply-demand-engine-service/src/main/resources/application-test.yml

@@ -1,6 +1,10 @@
 server:
   port: 8080
 
+springdoc:
+  api-docs:
+    enabled: true
+
 eureka:
   instance:
     prefer-ip-address: true #是否优先使用IP地址作为主机名的标识，默认false