pom.xml

@@ -23,7 +23,7 @@
        <tobato.version>1.27.2</tobato.version>
        <kaptcha.version>2.3.3</kaptcha.version>
        <pagehelper.boot.version>2.0.0</pagehelper.boot.version>
        <druid.version>1.2.23</druid.version>
<!--        <druid.version>1.2.23</druid.version>-->
        <dynamic-ds.version>4.3.1</dynamic-ds.version>
        <commons.io.version>2.19.0</commons.io.version>
        <velocity.version>2.3</velocity.version>
@@ -109,13 +109,6 @@
                <groupId>org.apache.tomcat.embed</groupId>
                <artifactId>tomcat-embed-websocket</artifactId>
                <version>${tomcat.version}</version>
            </dependency>

            <!-- Springdoc webmvc ä¾èµ–配置 -->
            <dependency>
                <groupId>org.springdoc</groupId>
                <artifactId>springdoc-openapi-ui</artifactId>
                <version>${springdoc.version}</version>
            </dependency>

            <!-- pagehelper åˆ†é¡µæ’件 -->

 se-common/pom.xml

@@ -113,11 +113,6 @@
            <artifactId>spring-boot-starter-data-redis</artifactId>
        </dependency>

        <!-- SpringDoc webmvc -->
        <dependency>
            <groupId>org.springdoc</groupId>
            <artifactId>springdoc-openapi-ui</artifactId>
        </dependency>
    </dependencies>

</project>

 se-common/src/main/java/com/terra/common/configure/SpringDocAutoConfiguration.java

ÎļþÒÑɾ³ý

 se-common/src/main/java/com/terra/common/configure/properties/SpringDocProperties.java

ÎļþÒÑɾ³ý

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

@@ -1,4 +1,3 @@
com.terra.common.utils.SpringUtils
com.terra.common.service.RedisService
com.terra.common.configure.RedisConfig
com.terra.common.configure.SpringDocAutoConfiguration
com.terra.common.configure.RedisConfig

 se-gateway/pom.xml

@@ -52,23 +52,10 @@
            <artifactId>sentinel-datasource-nacos</artifactId>
        </dependency>

        <!-- SpringBoot Actuator -->
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-actuator</artifactId>
        </dependency>
        
        <!-- SpringCloud Loadbalancer -->
        <dependency>
            <groupId>org.springframework.cloud</groupId>
            <artifactId>spring-cloud-loadbalancer</artifactId>
        </dependency>

        <!-- Springdoc -->
        <dependency>
            <groupId>org.springdoc</groupId>
            <artifactId>springdoc-openapi-webflux-ui</artifactId>
            <version>${springdoc.version}</version>
        </dependency>

        <!-- se-common -->

 se-gateway/src/main/java/com/terra/gateway/config/SpringDocConfig.java

ÎļþÒÑɾ³ý

 se-system/pom.xml

@@ -34,12 +34,6 @@
            <groupId>com.alibaba.cloud</groupId>
            <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
        </dependency>
        
        <!-- SpringBoot Actuator -->
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-actuator</artifactId>
        </dependency>



@@ -47,6 +41,13 @@
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-web</artifactId>
        </dependency>

        <!--thymeleaf-->
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-thymeleaf</artifactId>
<!--            <version>2.2.2.RELEASE</version>-->
        </dependency>

        <!--lombok-->
@@ -123,6 +124,11 @@
            <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>
@@ -145,7 +151,14 @@
        <dependency>
            <groupId>com.github.oshi</groupId>
            <artifactId>oshi-core</artifactId>
            <version>4.4.2</version>
            <version>6.8.0</version>
        </dependency>

        <!--hutool-->
        <dependency>
            <groupId>cn.hutool</groupId>
            <artifactId>hutool-all</artifactId>
            <version>5.7.20</version>
        </dependency>

        <!--commons-fileupload-->
@@ -217,6 +230,14 @@
            <version>1.19.0</version>
        </dependency>

        <!-- se-common -->
        <!--dependency>
            <groupId>com.terra</groupId>
            <artifactId>se-common</artifactId>
            <version>1.0.2</version>
            <scope>compile</scope>
        </dependency-->

    </dependencies>

    <build>

 se-system/src/main/java/com/terra/system/SeSystemApplication.java

@@ -2,6 +2,8 @@

import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.context.annotation.EnableAspectJAutoProxy;
import org.springframework.scheduling.annotation.EnableAsync;
import springfox.documentation.swagger2.annotations.EnableSwagger2;

/**
@@ -11,7 +13,9 @@
 *
 * @author admin
 */
@EnableAsync
@EnableSwagger2
@EnableAspectJAutoProxy(exposeProxy = true)
@SpringBootApplication(scanBasePackages = {"com.terra.system.*"})
public class SeSystemApplication
{

 se-system/src/main/java/com/terra/system/config/InitConfig.java

@@ -58,7 +58,7 @@
            argsService.initSettingData();

            log.info("***************** ç³»ç»Ÿå¯åŠ¨å®Œæ¯• *****************" + "\n");
            log.info("API文档：http://localhost:" + serverPort + contextPath + "/swagger-ui.html");
            log.info("API文档：http://localhost:" + serverPort + "/swagger-ui.html");

            String autoQuery = env.getProperty("sys.autoQuery");
            if (StaticData.S1.equals(autoQuery)) {

 se-system/src/main/java/com/terra/system/config/PropertiesConfig.java

@@ -19,10 +19,10 @@
    @Value("${sys.path.temp}")
    private String tempPath;

    // @Value("${spring.datasource.druid.stat-view-servlet.login-username}")
    @Value("${spring.datasource.druid.stat-view-servlet.login-username}")
    private String druidUser;

    // @Value("${spring.datasource.druid.stat-view-servlet.login-password}")
    @Value("${spring.datasource.druid.stat-view-servlet.login-password}")
    private String druidPwd;

    @Value("${sys.tile_path}")

 se-system/src/main/java/com/terra/system/config/ScheduleConfig.java

@@ -100,27 +100,4 @@
            log.error(ex.getMessage(), ex);
        }
    }

    /**
     * åŒæ­¥é™„件
     */
    @Scheduled(fixedRate = 30 * 1000)
    public void syncAttaches() {
        try {
            List<FmeLogEntity> list = attachService.selectFmeLogs();
            if (isBusy || null == list || list.isEmpty()) {
                return;
            }

            isBusy = true;
            for (FmeLogEntity entity : list) {
                attachService.syncAttaches(entity);
                attachService.updateFmeLog(entity.getId());
            }
            isBusy = false;
        } catch (Exception ex) {
            isBusy = false;
            log.error(ex.getMessage(), ex);
        }
    }
}

 se-system/src/main/java/com/terra/system/config/SwaggerConfig.java

@@ -2,6 +2,7 @@

import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.env.Environment;
import springfox.documentation.builders.ApiInfoBuilder;
import springfox.documentation.builders.PathSelectors;
import springfox.documentation.builders.RequestHandlerSelectors;
@@ -11,6 +12,7 @@
import springfox.documentation.spring.web.plugins.Docket;
import springfox.documentation.swagger2.annotations.EnableSwagger2;

import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;

@@ -21,6 +23,9 @@
@Configuration
@EnableSwagger2
public class SwaggerConfig {
    @Resource
    Environment env;

    private List<ApiKey> securitySchemes() {
        List<ApiKey> apiKeys = new ArrayList<ApiKey>();
        apiKeys.add(new ApiKey("Authorization", "token", "header"));
@@ -49,8 +54,13 @@

    @Bean
    public Docket createRestApi() {
        String swaggerEnable = env.getProperty("sys.swaggerEnable");
        boolean enable = "true".equals(swaggerEnable);

        return new Docket(DocumentationType.SWAGGER_2)
                .apiInfo(apiInfo()).select()
                .enable(enable)
                .apiInfo(apiInfo())
                .select()
                .apis(RequestHandlerSelectors.basePackage("com.terra.system.controller"))
                //.securitySchemes(securitySchemes())
                //.securityContexts(securityContexts())
@@ -59,8 +69,8 @@

    private ApiInfo apiInfo() {
        return new ApiInfoBuilder()
                .title("Spring Boot接口API")
                .description("Spring Boot接口API查看")
                .title("接口API")
                .description("接口API")
                .version("1.0").build();
    }
}

 se-system/src/main/java/com/terra/system/config/WebConfig.java

@@ -13,6 +13,7 @@
import org.springframework.web.servlet.config.annotation.*;

import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.util.List;

/**
@@ -66,7 +67,7 @@
    /**
     * è·¨åŸŸè¯·æ±‚
     */
    @Override
    /*@Override
    protected void addCorsMappings(CorsRegistry registry) {
        registry.addMapping("/**")
                .allowCredentials(true)
@@ -74,7 +75,7 @@
                .allowedMethods("GET", "POST", "PUT", "DELETE", "OPTIONS")
                .allowedHeaders("*")
                .maxAge(3600);
    }
    }*/

    /**
     * æ·»åŠ ç»Ÿä¸€çš„拦截器
@@ -104,7 +105,7 @@
        //SerializerFeature.PrettyFormat);

        converter.setFastJsonConfig(config);
        converter.setDefaultCharset(Charset.forName("UTF-8"));
        converter.setDefaultCharset(StandardCharsets.UTF_8);
        converters.add(converter);
    }
}

 se-system/src/main/java/com/terra/system/controller/all/SignController.java

@@ -65,7 +65,7 @@

        UserEntity ue = tokenService.getCurrentUser(req);
        if (ue != null) {
            mv.addObject("msg", "Hello " + ue.getUname() + " !");
            mv.addObject("msg", "Hello，" + ue.getUname() + " ï¼");
        }

        return mv;

 se-system/src/main/java/com/terra/system/mapper/sys/AttachMapper.java

@@ -140,22 +140,6 @@
    public Integer updates(List<AttachEntity> list);

    /**
     * æŸ¥è¯¢FME日志
     *
     * @param tabs
     * @return
     */
    public List<FmeLogEntity> selectFmeLogs(String tabs);

    /**
     * æ›´æ–°FME日志
     *
     * @param id ID
     * @return
     */
    public Integer updateFmeLog(Integer id);

    /**
     * æ ¹æ®å…ƒæ•°æ®åç§°æ’入附件
     *
     * @param tab

 se-system/src/main/java/com/terra/system/service/sys/AttachService.java

@@ -106,27 +106,6 @@
    }

    @Override
    public List<FmeLogEntity> selectFmeLogs(String tabs) {
        return attachMapper.selectFmeLogs(tabs);
    }

    /**
     * æŸ¥è¯¢FME日志
     */
    public List<FmeLogEntity> selectFmeLogs() {
        if (StringHelper.isEmpty(tabs)) {
            tabs = UploadAttachService.getTabs().replace("'", "");
        }

        return attachMapper.selectFmeLogs(tabs);
    }

    @Override
    public Integer updateFmeLog(Integer id) {
        return attachMapper.updateFmeLog(id);
    }

    @Override
    public Integer insertAttachByMeta(String tab, String tabGuid, String metaName, String dirid) {
        return attachMapper.insertAttachByMeta(tab, tabGuid, metaName, dirid);
    }

 se-system/src/main/resources/application-test.yml

@@ -9,6 +9,8 @@
    context-path: /

spring:
  application:
    name: se-system
  # redis
  redis:
    database: 0
@@ -122,6 +124,8 @@

# ç³»ç»Ÿé…ç½®
sys:
  # å¯ç”¨swagger
  swaggerEnable: true
  # è‡ªåŠ¨æŸ¥è¯¢
  autoQuery: 0
  # ç®¡ç†å‘˜ID
@@ -151,4 +155,4 @@
    exePath: C:/360/MxDrawCloudServer1.0TryVersion/MxDrawCloudServer/Bin/MxCAD/Release/mxcadassembly.exe
    targetPath: C:/360/MxDrawCloudServer1.0TryVersion/MxDrawCloudServer/SRC/TsWeb/public/data
  # ä¸Šä¼ é™„件表
  attachTabs: bd.b_pac_hydrogeology,bd.b_pac_frozensoil,bd.b_pac_geologic_hazard,bd.b_pac_marine_meteorological,bd.b_pac_meteorological,bs.m_equipment_nameplate,bs.m_hydraulic_protection,bs.m_marker,bs.s_explorationpoint,bs.u_sectionline
  attachTabs: bd.b_pac_hydrogeology,bd.b_pac_frozensoil

 se-system/src/main/resources/mapper/data/UploadMapper.xml

@@ -19,8 +19,4 @@
    <select id="selectProject" resultType="com.terra.system.entity.data.DirEntity">
        select * from lf.sys_dir where pid = 0 and id > 1 order by order_num, code;
    </select>

    <select id="selectFmeLog" resultType="com.terra.system.entity.data.FmeLogEntity">
        select * from lf.sys_fme_log where parentid = #{parentid};
    </select>
</mapper>

 se-system/src/main/resources/mapper/sys/AttachMapper.xml

@@ -104,16 +104,6 @@
        </foreach>
    </update>

    <!-- where count > 0 and update_time is null and create_time > now()::timestamp + '-5 min' and position(tcdm in '${tabs}') > 0; -->
    <select id="selectFmeLogs" resultType="com.terra.system.entity.data.FmeLogEntity">
        select * from lf.sys_fme_log
        where count > 0 and update_time is null and position(tcdm in '${tabs}') > 0;
    </select>

    <update id="updateFmeLog">
        update lf.sys_fme_log set update_time = now() where id = #{id};
    </update>

    <!-- and create_time > now()::timestamp + '-15 min' -->
    <insert id="insertAttachByMeta">
        insert into lf.sys_attach (name, guid, path, sizes, create_user, tab, tab_guid)

 se-system/src/main/resources/static/html/login.html

@@ -1,7 +1,7 @@
<!DOCTYPE>
<html>
<head>
  <title>管道基础大数据平台服务-登录</title>
  <title>系统服务-登录</title>
  <meta http-equiv="Expires" content="0" />
  <meta http-equiv="Cache" content="no-cache" />
  <meta http-equiv="Pragma" content="no-cache" />

 se-system/src/main/resources/templates/druid.html

@@ -2,7 +2,7 @@
<html>
<head>
  <meta charset="UTF-8">
  <title>管道基础大数据平台服务-数据库监控</title>
  <title>系统服务-数据库监控</title>
  <script>
    location.href = "../druid/index.html";
  </script>

 se-system/src/main/resources/templates/index.html

@@ -2,7 +2,7 @@
<html lang="en" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
<head>
  <meta charset="UTF-8">
  <title>管道基础大数据平台服务-首页</title>
  <title>系统服务-首页</title>
  <script src="../js/jquery.min.js"></script>
  <script>
    window.onload = function () {

 se-system/src/main/resources/templates/login.html

@@ -1,7 +1,7 @@
<!DOCTYPE>
<html>
<head>
  <title>管道基础大数据平台服务-登录</title>
  <title>系统服务-登录</title>
  <meta http-equiv="Expires" content="0" />
  <meta http-equiv="Cache" content="no-cache" />
  <meta http-equiv="Pragma" content="no-cache" />
@@ -62,9 +62,9 @@
    </form>
  </div>

  <div class="title">
  <!--<div class="title">
    <img src="../images/login/lg_03.png" alt=""/>
  </div>
  </div>-->

  <script src='../js/earth/dat.gui.min.js'></script>
  <script src='../js/earth/Stats.js'></script>

 se-system/src/main/resources/templates/login_old.html

ÎļþÒÑɾ³ý

 se-system/src/main/resources/templates/monitor.html

@@ -4,7 +4,7 @@
<head>
  <meta charset="UTF-8">
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
  <title>运维监控</title>
  <title>系统服务-运维监控</title>

  <link rel="stylesheet" href="./css/main/main1.css">
  <link rel="stylesheet" href="./css/main/jquery-ui.min.css">