From 7f47e2cd4ed531b97e435af1a9f3f14b0faf5757 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 16 七月 2025 14:32:17 +0800
Subject: [PATCH] 整合se-collect的代码
---
se-common/src/main/java/com/terra/common/entity/all/SpringDocProperties.java | 135 +++++++++++++++++++
se-gateway/src/main/java/com/terra/gateway/text/Convert.java | 2
se-gateway/src/main/java/com/terra/gateway/text/StrFormatter.java | 2
se-gateway/src/main/java/com/terra/gateway/utils/ServletUtils.java | 2
se-gateway/src/main/java/com/terra/gateway/domain/R.java | 2
se-collect/src/main/java/com/terra/collect/SeCollectApp.java | 2
se-gateway/src/main/java/com/terra/gateway/constant/Constants.java | 2
pom.xml | 21 ---
se-collect/src/main/java/com/terra/collect/controller/TestController.java | 4
se-common/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports | 3
sm.txt | 4
se-common/src/main/java/com/terra/common/entity/all/StaticData.java | 3
se-gateway/src/main/java/com/terra/gateway/text/CharsetKit.java | 2
se-common/src/main/java/com/terra/common/config/SpringDocAutoConfiguration.java | 64 +++++++++
se-collect/pom.xml | 109 ---------------
se-gateway/src/main/java/com/terra/gateway/utils/html/EscapeUtil.java | 2
se-common/pom.xml | 14 +
se-gateway/src/main/java/com/terra/gateway/utils/html/HTMLFilter.java | 2
se-gateway/src/main/java/com/terra/gateway/config/SpringDocConfig.java | 2
se-gateway/src/main/java/com/terra/gateway/utils/StringUtils.java | 2
20 files changed, 225 insertions(+), 154 deletions(-)
diff --git a/pom.xml b/pom.xml
index 3ad71d4..baebcde 100644
--- a/pom.xml
+++ b/pom.xml
@@ -111,32 +111,11 @@
<version>${tomcat.version}</version>
</dependency>
- <!-- pagehelper 鍒嗛〉鎻掍欢 -->
- <dependency>
- <groupId>com.github.pagehelper</groupId>
- <artifactId>pagehelper-spring-boot-starter</artifactId>
- <version>${pagehelper.boot.version}</version>
- </dependency>
-
<!-- io甯哥敤宸ュ叿绫� -->
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>${commons.io.version}</version>
- </dependency>
-
- <!-- excel宸ュ叿 -->
- <dependency>
- <groupId>org.apache.poi</groupId>
- <artifactId>poi-ooxml</artifactId>
- <version>${poi.version}</version>
- </dependency>
-
- <!-- 浠ｇ爜鐢熸垚浣跨敤妯℃澘 -->
- <dependency>
- <groupId>org.apache.velocity</groupId>
- <artifactId>velocity-engine-core</artifactId>
- <version>${velocity.version}</version>
</dependency>
<!-- JSON 瑙ｆ瀽鍣ㄥ拰鐢熸垚鍣� -->
diff --git a/se-collect/pom.xml b/se-collect/pom.xml
index dd2df5c..8ad262f 100644
--- a/se-collect/pom.xml
+++ b/se-collect/pom.xml
@@ -50,12 +50,6 @@
<optional>true</optional>
</dependency>
- <!--redis-->
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-data-redis</artifactId>
- </dependency>
-
<!--postgresql-->
<dependency>
<groupId>org.postgresql</groupId>
@@ -85,114 +79,11 @@
<version>1.2.25</version>
</dependency>
- <!--text-->
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-text</artifactId>
- <version>1.1</version>
- </dependency>
-
- <!--swagger-->
- <dependency>
- <groupId>io.springfox</groupId>
- <artifactId>springfox-swagger2</artifactId>
- <version>2.9.2</version>
- </dependency>
- <dependency>
- <groupId>io.springfox</groupId>
- <artifactId>springfox-swagger-ui</artifactId>
- <version>2.9.2</version>
- </dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>27.0-jre</version>
- </dependency>
-
- <!--httpclient-->
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- </dependency>
-
- <!--websocket-->
- <dependency>
- <groupId>javax.websocket</groupId>
- <artifactId>javax.websocket-api</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-websocket</artifactId>
- </dependency>
-
<!--hutool-->
<dependency>
<groupId>cn.hutool</groupId>
<artifactId>hutool-all</artifactId>
<version>5.7.20</version>
- </dependency>
-
- <!--commons-fileupload-->
- <dependency>
- <groupId>commons-fileupload</groupId>
- <artifactId>commons-fileupload</artifactId>
- <version>1.4</version>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>2.11.0</version>
- </dependency>
-
- <!--gdal-->
- <dependency>
- <groupId>org.gdal</groupId>
- <artifactId>gdal</artifactId>
- <version>3.2.0</version>
- </dependency>
-
- <!--zip4j-->
- <dependency>
- <groupId>net.lingala.zip4j</groupId>
- <artifactId>zip4j</artifactId>
- <version>2.6.4</version>
- </dependency>
-
- <!--easyexcel-->
- <dependency>
- <groupId>com.alibaba</groupId>
- <artifactId>easyexcel</artifactId>
- <version>2.2.10</version>
- </dependency>
-
- <!--servlet-->
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>3.1.0</version>
- <scope>provided</scope>
- </dependency>
-
- <!--apache.poi-->
- <dependency>
- <groupId>org.apache.poi</groupId>
- <artifactId>poi-ooxml</artifactId>
- <version>3.16</version>
- </dependency>
-
- <!--proj4j-->
- <dependency>
- <groupId>org.osgeo</groupId>
- <artifactId>proj4j</artifactId>
- <version>0.1.0</version>
- </dependency>
-
- <!--JTS-->
- <dependency>
- <groupId>org.locationtech.jts</groupId>
- <artifactId>jts-core</artifactId>
- <version>1.19.0</version>
</dependency>
<!-- se-common -->
diff --git a/se-collect/src/main/java/com/terra/collect/SeCollectApp.java b/se-collect/src/main/java/com/terra/collect/SeCollectApp.java
index d8287b8..6934642 100644
--- a/se-collect/src/main/java/com/terra/collect/SeCollectApp.java
+++ b/se-collect/src/main/java/com/terra/collect/SeCollectApp.java
@@ -4,10 +4,8 @@
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.context.annotation.EnableAspectJAutoProxy;
import org.springframework.scheduling.annotation.EnableAsync;
-import springfox.documentation.swagger2.annotations.EnableSwagger2;
@EnableAsync
-@EnableSwagger2
@EnableAspectJAutoProxy(exposeProxy = true)
@SpringBootApplication(scanBasePackages = {"com.terra.collect.*"})
public class SeCollectApp
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 b1ec13a..6d9b1c1 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,21 +1,17 @@
package com.terra.collect.controller;
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.common.entity.all.ResponseMsg;
import java.util.Date;
import java.text.SimpleDateFormat;
-@Api(tags = "鏁版嵁姹囬泦\\娴嬭瘯鏈嶅姟")
@RestController
@RequestMapping("/test")
public class TestController extends BaseController {
public static final SimpleDateFormat YMDHMS_FORMAT = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- @ApiOperation(value = "Test")
@GetMapping(value = "/test")
public ResponseMsg<Object> test() {
try {
diff --git a/se-common/pom.xml b/se-common/pom.xml
index 3554aa5..da6a420 100644
--- a/se-common/pom.xml
+++ b/se-common/pom.xml
@@ -24,11 +24,17 @@
<version>3.5.1</version>
</dependency>
- <!--fastjson-->
+ <!-- SpringDoc webmvc -->
<dependency>
- <groupId>com.alibaba</groupId>
- <artifactId>fastjson</artifactId>
- <version>1.2.47</version>
+ <groupId>org.springdoc</groupId>
+ <artifactId>springdoc-openapi-ui</artifactId>
+ <version>${springdoc.version}</version>
+ </dependency>
+
+ <!-- JSON 瑙ｆ瀽鍣ㄥ拰鐢熸垚鍣� -->
+ <dependency>
+ <groupId>com.alibaba.fastjson2</groupId>
+ <artifactId>fastjson2</artifactId>
</dependency>
</dependencies>
diff --git a/se-common/src/main/java/com/terra/common/config/SpringDocAutoConfiguration.java b/se-common/src/main/java/com/terra/common/config/SpringDocAutoConfiguration.java
new file mode 100644
index 0000000..9be91a0
--- /dev/null
+++ b/se-common/src/main/java/com/terra/common/config/SpringDocAutoConfiguration.java
@@ -0,0 +1,64 @@
+package com.terra.common.config;
+
+import com.terra.common.entity.all.SpringDocProperties;
+import io.swagger.v3.oas.models.Components;
+import io.swagger.v3.oas.models.OpenAPI;
+import io.swagger.v3.oas.models.info.Info;
+import io.swagger.v3.oas.models.security.SecurityRequirement;
+import io.swagger.v3.oas.models.security.SecurityScheme;
+import io.swagger.v3.oas.models.servers.Server;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Swagger 鏂囨。閰嶇疆
+ *
+ * @author admin
+ */
+@EnableConfigurationProperties(SpringDocProperties.class)
+@ConditionalOnProperty(name = "springdoc.api-docs.enabled", havingValue = "true", matchIfMissing = true)
+public class SpringDocAutoConfiguration
+{
+ @Bean
+ @ConditionalOnMissingBean(OpenAPI.class)
+ public OpenAPI openApi(SpringDocProperties properties)
+ {
+ return new OpenAPI().components(new Components()
+ // 璁剧疆璁よ瘉鐨勮姹傚ご
+ .addSecuritySchemes("apikey", securityScheme()))
+ .addSecurityItem(new SecurityRequirement().addList("apikey"))
+ .info(convertInfo(properties.getInfo()))
+ .servers(servers(properties.getGatewayUrl()));
+ }
+
+ public SecurityScheme securityScheme()
+ {
+ return new SecurityScheme().type(SecurityScheme.Type.APIKEY)
+ .name("Authorization")
+ .in(SecurityScheme.In.HEADER)
+ .scheme("Bearer");
+ }
+
+ private Info convertInfo(SpringDocProperties.InfoProperties infoProperties)
+ {
+ Info info = new Info();
+ info.setTitle(infoProperties.getTitle());
+ info.setDescription(infoProperties.getDescription());
+ info.setContact(infoProperties.getContact());
+ info.setLicense(infoProperties.getLicense());
+ info.setVersion(infoProperties.getVersion());
+ return info;
+ }
+
+ public List<Server> servers(String gatewayUrl)
+ {
+ List<Server> serverList = new ArrayList<>();
+ serverList.add(new Server().url(gatewayUrl));
+ return serverList;
+ }
+}
diff --git a/se-common/src/main/java/com/terra/common/entity/all/SpringDocProperties.java b/se-common/src/main/java/com/terra/common/entity/all/SpringDocProperties.java
new file mode 100644
index 0000000..6a906dd
--- /dev/null
+++ b/se-common/src/main/java/com/terra/common/entity/all/SpringDocProperties.java
@@ -0,0 +1,135 @@
+package com.terra.common.entity.all;
+
+import io.swagger.v3.oas.models.info.Contact;
+import io.swagger.v3.oas.models.info.License;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.boot.context.properties.NestedConfigurationProperty;
+
+/**
+ * Swagger 閰嶇疆灞炴��
+ *
+ * @author admin
+ */
+@ConfigurationProperties(prefix = "springdoc")
+public class SpringDocProperties
+{
+ /**
+ * 缃戝叧
+ */
+ private String gatewayUrl;
+
+ /**
+ * 鏂囨。鍩烘湰淇℃伅
+ */
+ @NestedConfigurationProperty
+ private InfoProperties info = new InfoProperties();
+
+ /**
+ * <p>
+ * 鏂囨。鐨勫熀纭�灞炴�т俊鎭�
+ * </p>
+ *
+ * @see io.swagger.v3.oas.models.info.Info
+ *
+ * 涓轰簡 springboot 鑷姩鐢熶骇閰嶇疆鎻愮ず淇℃伅锛屾墍浠ヨ繖閲屽鍒朵竴涓被鍑烘潵
+ */
+ public static class InfoProperties
+ {
+ /**
+ * 鏍囬
+ */
+ private String title = null;
+
+ /**
+ * 鎻忚堪
+ */
+ private String description = null;
+
+ /**
+ * 鑱旂郴浜轰俊鎭�
+ */
+ @NestedConfigurationProperty
+ private Contact contact = null;
+
+ /**
+ * 璁稿彲璇�
+ */
+ @NestedConfigurationProperty
+ private License license = null;
+
+ /**
+ * 鐗堟湰
+ */
+ private String version = null;
+
+ public String getTitle()
+ {
+ return title;
+ }
+
+ public void setTitle(String title)
+ {
+ this.title = title;
+ }
+
+ public String getDescription()
+ {
+ return description;
+ }
+
+ public void setDescription(String description)
+ {
+ this.description = description;
+ }
+
+ public Contact getContact()
+ {
+ return contact;
+ }
+
+ public void setContact(Contact contact)
+ {
+ this.contact = contact;
+ }
+
+ public License getLicense()
+ {
+ return license;
+ }
+
+ public void setLicense(License license)
+ {
+ this.license = license;
+ }
+
+ public String getVersion()
+ {
+ return version;
+ }
+
+ public void setVersion(String version)
+ {
+ this.version = version;
+ }
+ }
+
+ public String getGatewayUrl()
+ {
+ return gatewayUrl;
+ }
+
+ public void setGatewayUrl(String gatewayUrl)
+ {
+ this.gatewayUrl = gatewayUrl;
+ }
+
+ public InfoProperties getInfo()
+ {
+ return info;
+ }
+
+ public void setInfo(InfoProperties info)
+ {
+ this.info = info;
+ }
+}
diff --git a/se-common/src/main/java/com/terra/common/entity/all/StaticData.java b/se-common/src/main/java/com/terra/common/entity/all/StaticData.java
index 4344aba..0404eec 100644
--- a/se-common/src/main/java/com/terra/common/entity/all/StaticData.java
+++ b/se-common/src/main/java/com/terra/common/entity/all/StaticData.java
@@ -1,7 +1,6 @@
package com.terra.common.entity.all;
-import com.alibaba.fastjson.JSON;
-import com.terra.common.entity.all.HttpStatus;
+import com.alibaba.fastjson2.JSON;
import java.util.ArrayList;
import java.util.Arrays;
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 4050f49..fa6570b 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
@@ -1 +1,2 @@
-com.terra.common.config.MybatisPlusConfig
\ No newline at end of file
+com.terra.common.config.MybatisPlusConfig
+com.terra.common.config.SpringDocAutoConfiguration
\ No newline at end of file
diff --git a/se-gateway/src/main/java/com/terra/gateway/config/SpringDocConfig.java b/se-gateway/src/main/java/com/terra/gateway/config/SpringDocConfig.java
index faf009b..fd3c3d0 100644
--- a/se-gateway/src/main/java/com/terra/gateway/config/SpringDocConfig.java
+++ b/se-gateway/src/main/java/com/terra/gateway/config/SpringDocConfig.java
@@ -19,7 +19,7 @@
/**
* SpringDoc閰嶇疆绫�
*
- * @author ruoyi
+ * @author admin
*/
@Configuration(proxyBeanMethods = false)
@ConditionalOnProperty(value = "springdoc.api-docs.enabled", matchIfMissing = true)
diff --git a/se-gateway/src/main/java/com/terra/gateway/constant/Constants.java b/se-gateway/src/main/java/com/terra/gateway/constant/Constants.java
index df48702..fbc4e64 100644
--- a/se-gateway/src/main/java/com/terra/gateway/constant/Constants.java
+++ b/se-gateway/src/main/java/com/terra/gateway/constant/Constants.java
@@ -3,7 +3,7 @@
/**
* 閫氱敤甯搁噺淇℃伅
*
- * @author ruoyi
+ * @author admin
*/
public class Constants
{
diff --git a/se-gateway/src/main/java/com/terra/gateway/domain/R.java b/se-gateway/src/main/java/com/terra/gateway/domain/R.java
index c38fbee..f20ba55 100644
--- a/se-gateway/src/main/java/com/terra/gateway/domain/R.java
+++ b/se-gateway/src/main/java/com/terra/gateway/domain/R.java
@@ -7,7 +7,7 @@
/**
* 鍝嶅簲淇℃伅涓讳綋
*
- * @author ruoyi
+ * @author admin
*/
public class R<T> implements Serializable
{
diff --git a/se-gateway/src/main/java/com/terra/gateway/text/CharsetKit.java b/se-gateway/src/main/java/com/terra/gateway/text/CharsetKit.java
index c81074f..390a1d9 100644
--- a/se-gateway/src/main/java/com/terra/gateway/text/CharsetKit.java
+++ b/se-gateway/src/main/java/com/terra/gateway/text/CharsetKit.java
@@ -8,7 +8,7 @@
/**
* 瀛楃闆嗗伐鍏风被
*
- * @author ruoyi
+ * @author admin
*/
public class CharsetKit
{
diff --git a/se-gateway/src/main/java/com/terra/gateway/text/Convert.java b/se-gateway/src/main/java/com/terra/gateway/text/Convert.java
index 42d4d17..de8158c 100644
--- a/se-gateway/src/main/java/com/terra/gateway/text/Convert.java
+++ b/se-gateway/src/main/java/com/terra/gateway/text/Convert.java
@@ -13,7 +13,7 @@
/**
* 绫诲瀷杞崲鍣�
*
- * @author ruoyi
+ * @author admin
*/
public class Convert
{
diff --git a/se-gateway/src/main/java/com/terra/gateway/text/StrFormatter.java b/se-gateway/src/main/java/com/terra/gateway/text/StrFormatter.java
index 91a7e9c..7b47ade 100644
--- a/se-gateway/src/main/java/com/terra/gateway/text/StrFormatter.java
+++ b/se-gateway/src/main/java/com/terra/gateway/text/StrFormatter.java
@@ -6,7 +6,7 @@
/**
* 瀛楃涓叉牸寮忓寲
*
- * @author ruoyi
+ * @author admin
*/
public class StrFormatter
{
diff --git a/se-gateway/src/main/java/com/terra/gateway/utils/ServletUtils.java b/se-gateway/src/main/java/com/terra/gateway/utils/ServletUtils.java
index 8e3cfde..33142bb 100644
--- a/se-gateway/src/main/java/com/terra/gateway/utils/ServletUtils.java
+++ b/se-gateway/src/main/java/com/terra/gateway/utils/ServletUtils.java
@@ -31,7 +31,7 @@
/**
* 瀹㈡埛绔伐鍏风被
*
- * @author ruoyi
+ * @author admin
*/
public class ServletUtils
{
diff --git a/se-gateway/src/main/java/com/terra/gateway/utils/StringUtils.java b/se-gateway/src/main/java/com/terra/gateway/utils/StringUtils.java
index e0f3c7d..3ef04d6 100644
--- a/se-gateway/src/main/java/com/terra/gateway/utils/StringUtils.java
+++ b/se-gateway/src/main/java/com/terra/gateway/utils/StringUtils.java
@@ -11,7 +11,7 @@
/**
* 瀛楃涓插伐鍏风被
*
- * @author ruoyi
+ * @author admin
*/
public class StringUtils extends org.apache.commons.lang3.StringUtils
{
diff --git a/se-gateway/src/main/java/com/terra/gateway/utils/html/EscapeUtil.java b/se-gateway/src/main/java/com/terra/gateway/utils/html/EscapeUtil.java
index 1a263c1..f80efb6 100644
--- a/se-gateway/src/main/java/com/terra/gateway/utils/html/EscapeUtil.java
+++ b/se-gateway/src/main/java/com/terra/gateway/utils/html/EscapeUtil.java
@@ -6,7 +6,7 @@
/**
* 杞箟鍜屽弽杞箟宸ュ叿绫�
*
- * @author ruoyi
+ * @author admin
*/
public class EscapeUtil
{
diff --git a/se-gateway/src/main/java/com/terra/gateway/utils/html/HTMLFilter.java b/se-gateway/src/main/java/com/terra/gateway/utils/html/HTMLFilter.java
index 26fd990..dc68888 100644
--- a/se-gateway/src/main/java/com/terra/gateway/utils/html/HTMLFilter.java
+++ b/se-gateway/src/main/java/com/terra/gateway/utils/html/HTMLFilter.java
@@ -9,7 +9,7 @@
/**
* HTML杩囨护鍣紝鐢ㄤ簬鍘婚櫎XSS婕忔礊闅愭偅銆�
*
- * @author ruoyi
+ * @author admin
*/
public final class HTMLFilter
{
diff --git a/sm.txt b/sm.txt
index 8531e94..f670dee 100644
--- a/sm.txt
+++ b/sm.txt
@@ -20,12 +20,14 @@
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
http://localhost:8002/dir/selectDir?id=1
+http://localhost:8001/webjars/swagger-ui/index.html
+http://localhost:8003/swagger-ui/index.html
+
http://192.168.11.203:8848/nacos
http://192.168.11.203:8081/api/system/swagger-ui.html
------------------------------------------------------------------- PIE-Engine Server
--
Gitblit v1.9.3