From c184e2dd4edfa3deb4515d5afacc836bca6e79d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=A2=9C=E8=B6=85?= <7631990@qq.com>
Date: Mon, 11 Dec 2023 16:45:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E6=95=B0=E6=8D=AE=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../imitate/common/config/InitListener.java   | 36 -----------
 .../common/config/RedisListenerConfig.java    | 20 ------
 .../imitate/common/config/SwaggerConfig.java  | 41 -------------
 parent/pom.xml                                | 13 ++--
 web/pom.xml                                   | 12 ++++
 .../java/com/imitate/web/WebApplication.java  |  7 +++
 .../com/imitate/web/init/SwaggerConfig.java   | 61 +++++++++++++++++++
 .../controller/SecretInstallController.java   |  5 +-
 web/src/main/resources/application.properties | 12 +---
 9 files changed, 90 insertions(+), 117 deletions(-)
 delete mode 100644 common/src/main/java/com/imitate/common/config/InitListener.java
 delete mode 100644 common/src/main/java/com/imitate/common/config/RedisListenerConfig.java
 delete mode 100644 common/src/main/java/com/imitate/common/config/SwaggerConfig.java
 create mode 100644 web/src/main/java/com/imitate/web/init/SwaggerConfig.java

diff --git a/common/src/main/java/com/imitate/common/config/InitListener.java b/common/src/main/java/com/imitate/common/config/InitListener.java
deleted file mode 100644
index f35ce6b..0000000
--- a/common/src/main/java/com/imitate/common/config/InitListener.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.imitate.common.config;
-
-import com.imitate.common.util.RedisPool;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.boot.context.event.ApplicationReadyEvent;
-import org.springframework.context.ApplicationListener;
-import org.springframework.stereotype.Component;
-import redis.clients.jedis.Jedis;
-
-@Component
-public class InitListener implements ApplicationListener<ApplicationReadyEvent> {
-	private static final Logger log = LoggerFactory.getLogger(InitListener.class);
-
-	@Override
-	public void onApplicationEvent(ApplicationReadyEvent event) {
-		String active = System.getProperty("spring.profiles.active");
-		// 本地不初始化这些信息
-		Jedis jedis = null;
-		try {
-			if (!StringUtils.equals(active, "local")) {
-				// 初始化redis
-				jedis = RedisPool.getJedis();
-			}
-		} catch (Exception e) {
-			log.error("项目启动失败", e);
-			if ("jedisPool初始化错误".equals(e.getMessage())) {
-				Runtime.getRuntime().exit(-1);
-			}
-		} finally {
-			RedisPool.returnResource(jedis);
-		}
-	}
-
-}
\ No newline at end of file
diff --git a/common/src/main/java/com/imitate/common/config/RedisListenerConfig.java b/common/src/main/java/com/imitate/common/config/RedisListenerConfig.java
deleted file mode 100644
index d1dd77d..0000000
--- a/common/src/main/java/com/imitate/common/config/RedisListenerConfig.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.imitate.common.config;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.core.annotation.Order;
-import org.springframework.data.redis.connection.RedisConnectionFactory;
-import org.springframework.data.redis.listener.RedisMessageListenerContainer;
-
-@Order(1)
-@Configuration
-public class RedisListenerConfig {
-
-    @Bean
-    RedisMessageListenerContainer listenerContainer(RedisConnectionFactory connectionFactory) {
-        RedisMessageListenerContainer container = new RedisMessageListenerContainer();
-        container.setConnectionFactory(connectionFactory);
-        return container;
-    }
-
-}
\ No newline at end of file
diff --git a/common/src/main/java/com/imitate/common/config/SwaggerConfig.java b/common/src/main/java/com/imitate/common/config/SwaggerConfig.java
deleted file mode 100644
index defd65e..0000000
--- a/common/src/main/java/com/imitate/common/config/SwaggerConfig.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.imitate.common.config;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-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;
-import springfox.documentation.swagger2.annotations.EnableSwagger2;
-
-/**
- * @Author tanzf
- * @Description
- */
-
-
-@Configuration
-@EnableSwagger2
-public class SwaggerConfig {
-
-    @Bean
-    public Docket createRestApi() {
-        return new Docket(DocumentationType.SWAGGER_2)
-                .apiInfo(apiInfo())
-                .select()
-                .apis(RequestHandlerSelectors.basePackage("com"))
-                .paths(PathSelectors.any())
-                .build();
-    }
-
-    public ApiInfo apiInfo() {
-        return new ApiInfoBuilder()
-                .title("数据流平台接口文档")
-                .description("使用技巧：1接口文档，仔细阅读请求参数、响应参数的说明；")
-                .version("1.0")
-                .build();
-    }
-
-}
diff --git a/parent/pom.xml b/parent/pom.xml
index 2f5250e..5e1772d 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -39,12 +39,12 @@
         <commons-text.version>1.9</commons-text.version>
         <kubernetes-client.version>5.11.2</kubernetes-client.version>
         <jedis.version>2.9.0</jedis.version>
-        <swagger2.version>1.9.0.RELEASE</swagger2.version>
+        <swagger2.version>2.7.0</swagger2.version>
 
     </properties>
 
 
-    <dependencies>
+    <dependencies>  
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter</artifactId>
@@ -61,11 +61,7 @@
             <artifactId>spring-boot-starter-aop</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>com.spring4all</groupId>
-            <artifactId>swagger-spring-boot-starter</artifactId>
-            <version>${swagger2.version}</version>
-        </dependency>
+ 
 
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -204,6 +200,9 @@
 
 
 
+
+
+
     </dependencies>
 
 
diff --git a/web/pom.xml b/web/pom.xml
index eaa13ac..4161727 100644
--- a/web/pom.xml
+++ b/web/pom.xml
@@ -23,6 +23,18 @@
             <artifactId>common</artifactId>
             <version>0.0.1-SNAPSHOT</version>
         </dependency>
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger2</artifactId>
+            <version>2.9.2</version>
+        </dependency>
+
+        <!-- swagger2 ui -->
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger-ui</artifactId>
+            <version>2.9.2</version>
+        </dependency>
     </dependencies>
     
 <!--     
diff --git a/web/src/main/java/com/imitate/web/WebApplication.java b/web/src/main/java/com/imitate/web/WebApplication.java
index de7ca76..5381067 100644
--- a/web/src/main/java/com/imitate/web/WebApplication.java
+++ b/web/src/main/java/com/imitate/web/WebApplication.java
@@ -5,12 +5,19 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.ComponentScans;
 import org.springframework.web.servlet.config.annotation.EnableWebMvc;
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport;
 import tk.mybatis.spring.annotation.MapperScan;
 
+
+@EnableWebMvc
 @MapperScan(basePackages = { "com.imitate.web.persistence.mapper" })
 @ComponentScans(value = { @ComponentScan("com.imitate.common") })
 @SpringBootApplication
 public class WebApplication {
+
+
+
     public static void main(String[] args) {
         SpringApplication.run(WebApplication.class, args);
     }
diff --git a/web/src/main/java/com/imitate/web/init/SwaggerConfig.java b/web/src/main/java/com/imitate/web/init/SwaggerConfig.java
new file mode 100644
index 0000000..94f702e
--- /dev/null
+++ b/web/src/main/java/com/imitate/web/init/SwaggerConfig.java
@@ -0,0 +1,61 @@
+package com.imitate.web.init;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport;
+import springfox.documentation.builders.ApiInfoBuilder;
+import springfox.documentation.builders.PathSelectors;
+import springfox.documentation.builders.RequestHandlerSelectors;
+import springfox.documentation.service.ApiInfo;
+import springfox.documentation.service.ApiKey;
+import springfox.documentation.service.AuthorizationScope;
+import springfox.documentation.service.SecurityReference;
+import springfox.documentation.spi.DocumentationType;
+import springfox.documentation.spi.service.contexts.SecurityContext;
+import springfox.documentation.spring.web.plugins.Docket;
+import springfox.documentation.swagger2.annotations.EnableSwagger2;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * @Author tanzf
+ * @Description
+ */
+
+@Configuration
+@EnableSwagger2
+public class SwaggerConfig extends WebMvcConfigurationSupport {
+
+    @Override
+    protected void addResourceHandlers(ResourceHandlerRegistry registry) {
+        registry.addResourceHandler("swagger-ui.html")
+                .addResourceLocations("classpath:/META-INF/resources/");
+        registry.addResourceHandler("/webjars/**")
+                .addResourceLocations("classpath:/META-INF/resources/webjars/");
+    }
+
+
+    @Bean
+    public Docket createRestApi() {
+        return new Docket(DocumentationType.SWAGGER_2)
+                .apiInfo(apiInfo())
+                .select()
+                .apis(RequestHandlerSelectors.basePackage("com.imitate.web"))
+                .paths(PathSelectors.any())
+                .build();
+    }
+
+
+    /**
+     * 项目信息
+     */
+    private ApiInfo apiInfo() {
+        return new ApiInfoBuilder()
+                .title("Swagger测试项目 RESTful APIs")
+                .version("1.0")
+                .build();
+    }
+}
diff --git a/web/src/main/java/com/imitate/web/module/simulation/controller/SecretInstallController.java b/web/src/main/java/com/imitate/web/module/simulation/controller/SecretInstallController.java
index 000e58f..31a0450 100644
--- a/web/src/main/java/com/imitate/web/module/simulation/controller/SecretInstallController.java
+++ b/web/src/main/java/com/imitate/web/module/simulation/controller/SecretInstallController.java
@@ -2,6 +2,8 @@ package com.imitate.web.module.simulation.controller;
 
 import javax.validation.Valid;
 
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -18,8 +20,7 @@ import com.imitate.common.util.R;
 import com.imitate.web.module.simulation.service.SecretInstallService;
 import com.imitate.web.params.ManageSysDiskDataMaintenanceParam;
 import com.imitate.web.persistence.beans.ManageSysDiskDataMaintenance;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+
 import lombok.extern.slf4j.Slf4j;
 
 @Slf4j
diff --git a/web/src/main/resources/application.properties b/web/src/main/resources/application.properties
index 3dbd21e..7f69ed4 100644
--- a/web/src/main/resources/application.properties
+++ b/web/src/main/resources/application.properties
@@ -10,13 +10,6 @@ server.tomcat.uri-encoding=UTF-8
 
 spring.config.import=classpath:common.properties
 
-
-
-# mysql
-# spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-# spring.datasource.url=jdbc:mysql://testeducoder-public.mysql.polardb.rds.aliyuncs.com:3306/imitsys?useUnicode=true&characterEncoding=utf8&autoReconnect=true&failOverReadOnly=false
-#spring.datasource.username=testeducoder
-#spring.datasource.password=TEST@123
 spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
 spring.datasource.initialSize=200
 spring.datasource.maxActive=400
@@ -56,10 +49,7 @@ pagehelper.params=count=countSql
 logging.level.com.imitate.web.persistence.mapper=debug
 
 
-# redis
-spring.redis.host=127.0.0.1
-spring.redis.port=6379
-spring.redis.password=
+