整合se-collect的代码

13693261870

7 天以前 7f47e2cd4ed531b97e435af1a9f3f14b0faf5757

整合se-collect的代码

 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 è§£æžå™¨å’Œç”Ÿæˆå™¨ -->

 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 -->

 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

 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 {

 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>

 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;
    }
}

 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;
    }
}

 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;

 se-common/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -1 +1,2 @@
com.terra.common.config.MybatisPlusConfig
com.terra.common.config.MybatisPlusConfig
com.terra.common.config.SpringDocAutoConfiguration

 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)

 se-gateway/src/main/java/com/terra/gateway/constant/Constants.java

@@ -3,7 +3,7 @@
/**
 * é€šç”¨å¸¸é‡ä¿¡æ¯
 * 
 * @author ruoyi
 * @author admin
 */
public class Constants
{

 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
{

 se-gateway/src/main/java/com/terra/gateway/text/CharsetKit.java

@@ -8,7 +8,7 @@
/**
 * å­—符集工具类
 * 
 * @author ruoyi
 * @author admin
 */
public class CharsetKit
{

 se-gateway/src/main/java/com/terra/gateway/text/Convert.java

@@ -13,7 +13,7 @@
/**
 * ç±»åž‹è½¬æ¢å™¨
 * 
 * @author ruoyi
 * @author admin
 */
public class Convert
{

 se-gateway/src/main/java/com/terra/gateway/text/StrFormatter.java

@@ -6,7 +6,7 @@
/**
 * å­—符串格式化
 * 
 * @author ruoyi
 * @author admin
 */
public class StrFormatter
{

 se-gateway/src/main/java/com/terra/gateway/utils/ServletUtils.java

@@ -31,7 +31,7 @@
/**
 * å®¢æˆ·ç«¯å·¥å…·ç±»
 * 
 * @author ruoyi
 * @author admin
 */
public class ServletUtils
{

 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
{

 se-gateway/src/main/java/com/terra/gateway/utils/html/EscapeUtil.java

@@ -6,7 +6,7 @@
/**
 * è½¬ä¹‰å’Œåè½¬ä¹‰å·¥å…·ç±»
 * 
 * @author ruoyi
 * @author admin
 */
public class EscapeUtil
{

 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
{

 sm.txt

@@ -20,12 +20,14 @@
nacos：nAcos_!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