修改通用模块

13693261870

7 天以前 ec7845c825b1ff0f566113c9cf0abd002b8440a0

修改通用模块

 se-collect/pom.xml

@@ -50,13 +50,6 @@
            <optional>true</optional>
        </dependency>

        <!--mybatis-plus-->
        <dependency>
            <groupId>com.baomidou</groupId>
            <artifactId>mybatis-plus-boot-starter</artifactId>
            <version>3.5.1</version>
        </dependency>

        <!--redis-->
        <dependency>
            <groupId>org.springframework.boot</groupId>
@@ -78,13 +71,6 @@
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-aop</artifactId>
        </dependency>

        <!--fastjson-->
        <dependency>
            <groupId>com.alibaba</groupId>
            <artifactId>fastjson</artifactId>
            <version>1.2.47</version>
        </dependency>

        <!--整合druid数据源-->

 se-collect/src/main/java/com/terra/collect/controller/TestController.java

@@ -1,10 +1,10 @@
package com.terra.collect.controller;

import com.terra.collect.controller.all.BaseController;
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.collect.entity.all.ResponseMsg;
import com.terra.common.entity.all.ResponseMsg;
import java.util.Date;

import java.text.SimpleDateFormat;
@@ -21,7 +21,7 @@
        try {
            String date = YMDHMS_FORMAT.format(new Date());

            return success(date);
            return success("Collect", date);
        } catch (Exception ex) {
            return fail(ex, null);
        }

 se-collect/src/main/java/com/terra/collect/entity/all/ResponseMsg.java

ÎļþÒÑɾ³ý

 se-collect/src/main/java/com/terra/collect/mapper/all/PermsMapper.java

ÎļþÒÑɾ³ý

 se-collect/src/main/resources/mapper/all/PermsMapper.xml

ÎļþÒÑɾ³ý

 se-common/pom.xml

@@ -17,100 +17,18 @@

    <dependencies>

        <!-- SpringCloud Openfeign -->
        <!--mybatis-plus-->
        <dependency>
            <groupId>org.springframework.cloud</groupId>
            <artifactId>spring-cloud-starter-openfeign</artifactId>
        </dependency>
        
        <!-- SpringCloud Loadbalancer -->
        <dependency>
            <groupId>org.springframework.cloud</groupId>
            <artifactId>spring-cloud-starter-loadbalancer</artifactId>
            <groupId>com.baomidou</groupId>
            <artifactId>mybatis-plus-boot-starter</artifactId>
            <version>3.5.1</version>
        </dependency>

        <!-- Spring Context Support -->
        <dependency>
            <groupId>org.springframework</groupId>
            <artifactId>spring-context-support</artifactId>
        </dependency>

        <!-- Spring Web -->
        <dependency>
            <groupId>org.springframework</groupId>
            <artifactId>spring-web</artifactId>
        </dependency>

        <!-- Transmittable ThreadLocal -->
        <!--fastjson-->
        <dependency>
            <groupId>com.alibaba</groupId>
            <artifactId>transmittable-thread-local</artifactId>
        </dependency>

        <!-- Pagehelper -->
        <dependency>
            <groupId>com.github.pagehelper</groupId>
            <artifactId>pagehelper-spring-boot-starter</artifactId>
        </dependency>

        <!-- Hibernate Validator -->
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-validation</artifactId>
        </dependency>

        <!-- Jackson -->
        <dependency>
            <groupId>com.fasterxml.jackson.core</groupId>
            <artifactId>jackson-databind</artifactId>
        </dependency>

        <!-- Alibaba Fastjson -->
        <dependency>
            <groupId>com.alibaba.fastjson2</groupId>
            <artifactId>fastjson2</artifactId>
        </dependency>

        <!-- Jwt -->
        <dependency>
            <groupId>io.jsonwebtoken</groupId>
            <artifactId>jjwt</artifactId>
        </dependency>

        <!-- Jaxb -->
        <dependency>
            <groupId>javax.xml.bind</groupId>
            <artifactId>jaxb-api</artifactId>
        </dependency>

        <!-- Apache Lang3 -->
        <dependency>
            <groupId>org.apache.commons</groupId>
            <artifactId>commons-lang3</artifactId>
        </dependency>

        <!-- Commons Io -->
        <dependency>
            <groupId>commons-io</groupId>
            <artifactId>commons-io</artifactId>
        </dependency>

        <!-- excel工具 -->
        <dependency>
            <groupId>org.apache.poi</groupId>
            <artifactId>poi-ooxml</artifactId>
        </dependency>

        <!-- Java Servlet -->
        <dependency>
            <groupId>javax.servlet</groupId>
            <artifactId>javax.servlet-api</artifactId>
        </dependency>

        <!-- SpringBoot Boot Redis -->
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-data-redis</artifactId>
            <artifactId>fastjson</artifactId>
            <version>1.2.47</version>
        </dependency>

    </dependencies>

 se-common/src/main/java/com/terra/common/config/MybatisPlusConfig.java

ÎļþÃû´Ó se-collect/src/main/java/com/terra/collect/config/MybatisPlusConfig.java ÐÞ¸Ä
@@ -1,11 +1,11 @@
package com.terra.collect.config;
package com.terra.common.config;

import com.baomidou.mybatisplus.annotation.DbType;
import com.baomidou.mybatisplus.autoconfigure.ConfigurationCustomizer;
import com.baomidou.mybatisplus.core.MybatisConfiguration;
import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
import com.terra.collect.extend.CustomizedSqlInjector;
import com.terra.common.extend.CustomizedSqlInjector;
import org.apache.ibatis.type.JdbcType;
import org.mybatis.spring.annotation.MapperScan;
import org.springframework.context.annotation.Bean;
@@ -18,7 +18,7 @@
 */
@EnableTransactionManagement
@Configuration
@MapperScan("com.terra.system.mapper")
@MapperScan("com.terra.*.mapper")
public class MybatisPlusConfig {
    /**
     * æ–°çš„分页插件,一缓和二缓遵循mybatis的规则,需要设置

 se-common/src/main/java/com/terra/common/controller/all/BaseController.java

ÎļþÃû´Ó se-collect/src/main/java/com/terra/collect/controller/all/BaseController.java ÐÞ¸Ä
@@ -1,7 +1,7 @@
package com.terra.collect.controller.all;
package com.terra.common.controller.all;

import com.terra.collect.entity.all.HttpStatus;
import com.terra.collect.entity.all.ResponseMsg;
import com.terra.common.entity.all.HttpStatus;
import com.terra.common.entity.all.ResponseMsg;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;


 se-common/src/main/java/com/terra/common/entity/all/HttpStatus.java

ÎļþÃû´Ó se-collect/src/main/java/com/terra/collect/entity/all/HttpStatus.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.terra.collect.entity.all;
package com.terra.common.entity.all;

/**
 * Http状态码类

 se-common/src/main/java/com/terra/common/entity/all/ResponseMsg.java

ÎļþÃû´Ó se-publish/src/main/java/com/terra/publish/entity/all/ResponseMsg.java ÐÞ¸Ä
@@ -1,4 +1,6 @@
package com.terra.publish.entity.all;
package com.terra.common.entity.all;

import com.terra.common.entity.all.HttpStatus;

/**
 * å“åº”消息类

 se-common/src/main/java/com/terra/common/entity/all/StaticData.java

ÎļþÃû´Ó se-collect/src/main/java/com/terra/collect/entity/all/StaticData.java ÐÞ¸Ä
@@ -1,6 +1,7 @@
package com.terra.collect.entity.all;
package com.terra.common.entity.all;

import com.alibaba.fastjson.JSON;
import com.terra.common.entity.all.HttpStatus;

import java.util.ArrayList;
import java.util.Arrays;

 se-common/src/main/java/com/terra/common/extend/CustomizedSqlInjector.java

ÎļþÃû´Ó se-collect/src/main/java/com/terra/collect/extend/CustomizedSqlInjector.java ÐÞ¸Ä
@@ -1,9 +1,9 @@
package com.terra.collect.extend;
package com.terra.common.extend;

import com.baomidou.mybatisplus.core.injector.AbstractMethod;
import com.baomidou.mybatisplus.core.injector.DefaultSqlInjector;
import com.baomidou.mybatisplus.core.metadata.TableInfo;
import com.terra.collect.extend.UpdateBatchMethod;
import com.terra.common.extend.UpdateBatchMethod;

import java.util.List;


 se-common/src/main/java/com/terra/common/extend/InsertBatchMethod.java

ÎļþÃû´Ó se-collect/src/main/java/com/terra/collect/extend/InsertBatchMethod.java ÐÞ¸Ä
@@ -1,9 +1,9 @@
package com.terra.collect.extend;
package com.terra.common.extend;

import com.baomidou.mybatisplus.core.injector.AbstractMethod;
import com.baomidou.mybatisplus.core.metadata.TableFieldInfo;
import com.baomidou.mybatisplus.core.metadata.TableInfo;
import com.terra.collect.entity.all.StaticData;
import com.terra.common.entity.all.StaticData;
import org.apache.ibatis.executor.keygen.NoKeyGenerator;
import org.apache.ibatis.mapping.MappedStatement;
import org.apache.ibatis.mapping.SqlSource;

 se-common/src/main/java/com/terra/common/extend/UpdateBatchMethod.java

ÎļþÃû´Ó se-collect/src/main/java/com/terra/collect/extend/UpdateBatchMethod.java ÐÞ¸Ä
@@ -1,10 +1,10 @@
package com.terra.collect.extend;
package com.terra.common.extend;

import com.baomidou.mybatisplus.core.injector.AbstractMethod;
import com.baomidou.mybatisplus.core.metadata.TableFieldInfo;
import com.baomidou.mybatisplus.core.metadata.TableInfo;
import com.baomidou.mybatisplus.core.toolkit.sql.SqlScriptUtils;
import com.terra.collect.entity.all.StaticData;
import com.terra.common.entity.all.StaticData;
import org.apache.ibatis.mapping.MappedStatement;
import org.apache.ibatis.mapping.SqlSource;


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

@@ -0,0 +1 @@
com.terra.common.config.MybatisPlusConfig

 se-discover/pom.xml

@@ -50,13 +50,6 @@
            <optional>true</optional>
        </dependency>

        <!--mybatis-plus-->
        <dependency>
            <groupId>com.baomidou</groupId>
            <artifactId>mybatis-plus-boot-starter</artifactId>
            <version>3.5.1</version>
        </dependency>

        <!--redis-->
        <dependency>
            <groupId>org.springframework.boot</groupId>
@@ -78,13 +71,6 @@
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-aop</artifactId>
        </dependency>

        <!--fastjson-->
        <dependency>
            <groupId>com.alibaba</groupId>
            <artifactId>fastjson</artifactId>
            <version>1.2.47</version>
        </dependency>

        <!--整合druid数据源-->

 se-discover/src/main/java/com/terra/discover/controller/TestController.java

@@ -1,10 +1,10 @@
package com.terra.discover.controller;

import com.terra.discover.controller.all.BaseController;
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.discover.entity.all.ResponseMsg;
import com.terra.common.entity.all.ResponseMsg;
import java.util.Date;

import java.text.SimpleDateFormat;
@@ -21,7 +21,7 @@
        try {
            String date = YMDHMS_FORMAT.format(new Date());

            return success(date);
            return success("Discover", date);
        } catch (Exception ex) {
            return fail(ex, null);
        }

 se-discover/src/main/java/com/terra/discover/controller/all/BaseController.java

ÎļþÒÑɾ³ý

 se-discover/src/main/java/com/terra/discover/entity/all/HttpStatus.java

ÎļþÒÑɾ³ý

 se-discover/src/main/java/com/terra/discover/entity/all/ResponseMsg.java

ÎļþÒÑɾ³ý

 se-publish/pom.xml

@@ -50,13 +50,6 @@
            <optional>true</optional>
        </dependency>

        <!--mybatis-plus-->
        <dependency>
            <groupId>com.baomidou</groupId>
            <artifactId>mybatis-plus-boot-starter</artifactId>
            <version>3.5.1</version>
        </dependency>

        <!--redis-->
        <dependency>
            <groupId>org.springframework.boot</groupId>
@@ -78,13 +71,6 @@
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-aop</artifactId>
        </dependency>

        <!--fastjson-->
        <dependency>
            <groupId>com.alibaba</groupId>
            <artifactId>fastjson</artifactId>
            <version>1.2.47</version>
        </dependency>

        <!--整合druid数据源-->

 se-publish/src/main/java/com/terra/publish/controller/TestController.java

@@ -1,10 +1,10 @@
package com.terra.publish.controller;

import com.terra.publish.controller.all.BaseController;
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.publish.entity.all.ResponseMsg;
import com.terra.common.entity.all.ResponseMsg;
import java.util.Date;

import java.text.SimpleDateFormat;
@@ -21,7 +21,7 @@
        try {
            String date = YMDHMS_FORMAT.format(new Date());

            return success(date);
            return success("Publish", date);
        } catch (Exception ex) {
            return fail(ex, null);
        }

 se-publish/src/main/java/com/terra/publish/controller/all/BaseController.java

ÎļþÒÑɾ³ý

 se-publish/src/main/java/com/terra/publish/entity/all/HttpStatus.java

ÎļþÒÑɾ³ý

 sm.txt

@@ -20,6 +20,7 @@
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