add

.idea/.gitignore

@@ -0,0 +1,8 @@
+# 默认忽略的文件
+/shelf/
+/workspace.xml
+# 基于编辑器的 HTTP 客户端请求
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml

.idea/compiler.xml

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <annotationProcessing>
+      <profile name="Maven default annotation processors profile" enabled="true">
+        <sourceOutputDir name="target/generated-sources/annotations" />
+        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
+        <outputRelativeToContentRoot value="true" />
+        <module name="base-springframework-util" />
+        <module name="base-springframework-redis" />
+        <module name="play_new" />
+        <module name="base-springframework-core" />
+        <module name="base-springframework-db" />
+        <module name="base-springframework-constant" />
+        <module name="base-springframework-mybatis-plus" />
+        <module name="base-springframework-swagger" />
+      </profile>
+    </annotationProcessing>
+    <bytecodeTargetLevel>
+      <module name="base-springframework-cloud" target="1.8" />
+      <module name="base-springframework-easyexcel" target="1.8" />
+      <module name="wei-developer-platform" target="1.8" />
+      <module name="wei-developer-platform-api" target="1.8" />
+      <module name="wei-developer-platform-app" target="1.8" />
+      <module name="wei-gateway" target="1.8" />
+      <module name="wei-user" target="1.8" />
+      <module name="wei-user-api" target="1.8" />
+      <module name="wei-user-app" target="1.8" />
+    </bytecodeTargetLevel>
+  </component>
+</project>

.idea/encodings.xml

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding" defaultCharsetForPropertiesFiles="UTF-8">
+    <file url="file://$PROJECT_DIR$/base-springframework-starter/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/base-springframework-starter/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/base-springframework/base-springframework-constant/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/base-springframework/base-springframework-constant/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/base-springframework/base-springframework-core/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/base-springframework/base-springframework-core/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/base-springframework/base-springframework-db/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/base-springframework/base-springframework-db/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/base-springframework/base-springframework-easyexcel/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/base-springframework/base-springframework-easyexcel/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/base-springframework/base-springframework-mybatis-plus/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/base-springframework/base-springframework-mybatis-plus/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/base-springframework/base-springframework-redis/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/base-springframework/base-springframework-redis/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/base-springframework/base-springframework-swagger/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/base-springframework/base-springframework-swagger/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/base-springframework/base-springframework-util/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/base-springframework/base-springframework-util/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/base-springframework/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/base-springframework/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/../play_new/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/../play_new/src/main/resources" charset="UTF-8" />
+    <file url="file://$APPLICATION_HOME_DIR$/src/main/java" charset="UTF-8" />
+    <file url="file://$APPLICATION_HOME_DIR$/src/main/resources" charset="UTF-8" />
+  </component>
+</project>

.idea/jarRepositories.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RemoteRepositoriesConfiguration">
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Central Repository" />
+      <option name="url" value="http://maven.aliyun.com/nexus/content/groups/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Maven Central repository" />
+      <option name="url" value="https://repo1.maven.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="jboss.community" />
+      <option name="name" value="JBoss Community repository" />
+      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven-ali" />
+      <option name="name" value="maven-ali" />
+      <option name="url" value="https://repo1.maven.org/maven2" />
+    </remote-repository>
+  </component>
+</project>

.idea/misc.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ExternalStorageConfigurationManager" enabled="true" />
+  <component name="MavenProjectsManager">
+    <option name="originalFiles">
+      <list>
+        <option value="$PROJECT_DIR$/pom.xml" />
+        <option value="$PROJECT_DIR$/../play_new/pom.xml" />
+      </list>
+    </option>
+    <option name="ignoredFiles">
+      <set>
+        <option value="$PROJECT_DIR$/base-springframework/base-springframework-cloud/pom.xml" />
+      </set>
+    </option>
+  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK" />
+</project>

.idea/saveactions_settings.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="SaveActionSettings">
+    <option name="actions">
+      <set>
+        <option value="activate" />
+        <option value="activateOnShortcut" />
+        <option value="noActionIfCompileErrors" />
+        <option value="organizeImports" />
+        <option value="reformat" />
+        <option value="unqualifiedFieldAccess" />
+        <option value="missingOverrideAnnotation" />
+        <option value="generateSerialVersionUID" />
+        <option value="unnecessaryThis" />
+        <option value="finalPrivateMethod" />
+        <option value="unnecessaryFinalOnLocalVariableOrParameter" />
+        <option value="explicitTypeCanBeDiamond" />
+      </set>
+    </option>
+    <option name="configurationPath" value="" />
+  </component>
+</project>

.idea/vcs.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/../play_new" vcs="Git" />
+  </component>
+</project>

base-springframework-starter/pom.xml

@@ -2,15 +2,13 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>com.wei</groupId>
+    <groupId>com.xxx</groupId>
     <artifactId>base-springframework-starter</artifactId>
     <packaging>pom</packaging>
     <version>0.0.1-SNAPSHOT</version>
 
     <modules>
-        <module>../wei-gateway</module>
-        <module>../wei-developer-platform</module>
-        <module>../wei-user</module>
+        <module>../../play_new</module>
     </modules>
 
     <properties>
@@ -21,23 +19,35 @@
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
         <lombok.version>1.18.12</lombok.version>
-        <spring-boot-starter.version>2.3.4.RELEASE</spring-boot-starter.version>
-        <spring.version>5.2.9.RELEASE</spring.version>
+        <spring-boot-starter.version>2.4.1</spring-boot-starter.version>
+        <spring.version>5.3.2</spring.version>
+        <jackson-annotations.version>2.11.3</jackson-annotations.version>
+        <spring-boot-maven-plugin.version>2.4.1</spring-boot-maven-plugin.version>
     </properties>
 
     <dependencies>
         <dependency>
-            <groupId>com.wei</groupId>
+            <groupId>com.xxx</groupId>
             <artifactId>base-springframework-core</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>com.wei</groupId>
-            <artifactId>base-springframework-cloud</artifactId>
+            <groupId>com.xxx</groupId>
+            <artifactId>base-springframework-db</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>com.wei</groupId>
+            <groupId>com.xxx</groupId>
+            <artifactId>base-springframework-mybatis-plus</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.xxx</groupId>
+            <artifactId>base-springframework-redis</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.xxx</groupId>
             <artifactId>base-springframework-swagger</artifactId>
             <version>${project.version}</version>
         </dependency>
@@ -60,12 +70,37 @@
                 <artifactId>spring-aop</artifactId>
                 <version>${spring.version}</version>
             </dependency>
+            <dependency>
+                <groupId>com.fasterxml.jackson.core</groupId>
+                <artifactId>jackson-annotations</artifactId>
+                <version>${jackson-annotations.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.fasterxml.jackson.core</groupId>
+                <artifactId>jackson-core</artifactId>
+                <version>${jackson-annotations.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.fasterxml.jackson.core</groupId>
+                <artifactId>jackson-databind</artifactId>
+                <version>${jackson-annotations.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.alibaba</groupId>
+                <artifactId>fastjson</artifactId>
+                <version>1.2.68</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
     <build>
         <plugins>
             <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <version>${spring-boot-maven-plugin.version}</version>
+            </plugin>
+            <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>${maven-compiler-plugin.version}</version>

base-springframework/base-springframework-cloud/.gitignore

@@ -1,5 +0,0 @@
-/target/
-/.classpath
-/.settings/
-/.project
-/base-springframework-cloud.iml

base-springframework/base-springframework-cloud/pom.xml

@@ -1,79 +0,0 @@
-<?xml version="1.0"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-         xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>com.wei</groupId>
-        <artifactId>base-springframework</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>base-springframework-cloud</artifactId>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <java.version>1.8</java.version>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
-        <spring-boot-maven-plugin.version>2.3.1.RELEASE</spring-boot-maven-plugin.version>
-        <spring-cloud.version>2.2.4.RELEASE</spring-cloud.version>
-        <feign-httpclient.version>10.11</feign-httpclient.version>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.wei</groupId>
-            <artifactId>base-springframework-util</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.wei</groupId>
-            <artifactId>base-springframework-constant</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-actuator</artifactId>
-            <version>${spring-boot-starter.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-consul-all</artifactId>
-            <version>${spring-cloud.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-openfeign</artifactId>
-            <version>${spring-cloud.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>io.github.openfeign</groupId>
-            <artifactId>feign-httpclient</artifactId>
-            <version>${feign-httpclient.version}</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.springframework.boot</groupId>
-                    <artifactId>spring-boot-maven-plugin</artifactId>
-                    <version>${spring-boot-maven-plugin.version}</version>
-                    <executions>
-                        <execution>
-                            <goals>
-                                <goal>repackage</goal>
-                            </goals>
-                        </execution>
-                    </executions>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
-</project>

base-springframework/base-springframework-cloud/src/main/java/com/wei/base/springframework/cloud/config/FeignConfigure.java

@@ -1,16 +0,0 @@
-package com.wei.base.springframework.cloud.config;
-
-import lombok.Data;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.context.annotation.Configuration;
-
-@Data
-@Configuration
-@ConfigurationProperties(prefix = "spring.cloud.feign")
-public class FeignConfigure {
-
-    /**
-     * 过滤header参数传递字段
-     */
-    private String headerTransmitFilter = "Filter-Enabled";
-}

base-springframework/base-springframework-cloud/src/main/java/com/wei/base/springframework/cloud/config/RibbonConfig.java

@@ -1,59 +0,0 @@
-package com.wei.base.springframework.cloud.config;
-
-import com.google.common.collect.Lists;
-import com.wei.base.springframework.cloud.vo.EagerLoad;
-import org.apache.commons.collections4.CollectionUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.cloud.client.ServiceInstance;
-import org.springframework.cloud.consul.discovery.ConsulDiscoveryClient;
-import org.springframework.cloud.netflix.ribbon.RibbonEagerLoadProperties;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-import java.util.List;
-
-@Configuration
-public class RibbonConfig {
-
-    @Autowired
-    private ConsulDiscoveryClient consulDiscoveryClient;
-
-    @Autowired
-    private RibbonEagerLoadProperties ribbonEagerLoadProperties;
-
-    @Autowired
-    private RibbonProperties ribbonProperties;
-
-    /**
-     * 全局自动懒加载
-     */
-    @Bean
-    @ConditionalOnProperty("ribbon.eager-load.enabled")
-    public void autoEagerLoad() {
-        //判断是否需要自动加载
-        EagerLoad eagerLoad = ribbonProperties.getEagerLoad();
-        if (eagerLoad == null && !eagerLoad.getAutoEnabled()) {
-            return;
-        }
-
-        // 在服务启动后读取consul中的注册列表缓存起来减少自定义配置
-        List<ServiceInstance> serviceInstances = consulDiscoveryClient.getAllInstances();
-        List<String> clients = Lists.newArrayListWithCapacity(serviceInstances.size());
-
-        List<String> excludes = eagerLoad.getExcludes();
-        for (ServiceInstance serviceInstance : serviceInstances) {
-            String serviceId = serviceInstance.getServiceId();
-            if (CollectionUtils.isNotEmpty(excludes)) {
-                if (excludes.contains(serviceId)) {
-                    continue;
-                }
-            }
-
-            clients.add(serviceId);
-        }
-
-        // 重新修改ribbon懒加载配置
-        ribbonEagerLoadProperties.setClients(clients);
-    }
-}

base-springframework/base-springframework-cloud/src/main/java/com/wei/base/springframework/cloud/config/RibbonProperties.java

@@ -1,21 +0,0 @@
-package com.wei.base.springframework.cloud.config;
-
-import com.wei.base.springframework.cloud.vo.EagerLoad;
-import lombok.Data;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.context.annotation.Configuration;
-
-import java.io.Serializable;
-
-@Data
-@Configuration
-@ConfigurationProperties(prefix = "ribbon")
-public class RibbonProperties implements Serializable {
-
-    private static final long serialVersionUID = -2085296475361063649L;
-
-    /**
-     * 懒加载配置
-     */
-    private EagerLoad eagerLoad;
-}

base-springframework/base-springframework-cloud/src/main/java/com/wei/base/springframework/cloud/env/InitializeCustomConfiguration.java

@@ -1,85 +0,0 @@
-package com.wei.base.springframework.cloud.env;
-
-import com.google.common.collect.Lists;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.env.EnvironmentPostProcessor;
-import org.springframework.boot.env.YamlPropertySourceLoader;
-import org.springframework.core.env.ConfigurableEnvironment;
-import org.springframework.core.env.MutablePropertySources;
-import org.springframework.core.env.PropertiesPropertySource;
-import org.springframework.core.env.PropertySource;
-import org.springframework.core.io.ClassPathResource;
-import org.springframework.core.io.Resource;
-
-import java.io.IOException;
-import java.util.List;
-import java.util.Properties;
-
-/**
- * 加载自定义配置文件
- *
- * @author : weierming
- * @date : 2020/7/13
- */
-public class InitializeCustomConfiguration implements EnvironmentPostProcessor {
-
-    //自定义配置文件地址
-    private static final List<String> PROFILES = Lists.newArrayList("application-cloud.yml");
-
-    @Override
-    public void postProcessEnvironment(ConfigurableEnvironment environment, SpringApplication application) {
-        PROFILES.stream().forEach(profile -> {
-            //从classpath路径下面查找文件
-            Resource resource = new ClassPathResource(profile);
-            if (resource == null || !resource.exists()) {
-                throw new IllegalArgumentException("资源" + resource + "不存在");
-            }
-
-            MutablePropertySources mutablePropertySources = environment.getPropertySources();
-            //加载成PropertySource对象，并添加到Environment环境中
-            switch (StringUtils.substringAfterLast(profile, ".")) {
-                case "yml":
-                    List<PropertySource<?>> propertySources = loadYmlProfiles(resource);
-                    propertySources.stream().forEach(propertySource -> {
-                        mutablePropertySources.addLast(propertySource);
-                    });
-                    break;
-                default:
-                    mutablePropertySources.addLast(loadProfiles(resource));
-                    break;
-            }
-        });
-    }
-
-    /**
-     * 加载单个配置文件
-     *
-     * @param resource
-     * @return
-     */
-    private PropertiesPropertySource loadProfiles(Resource resource) {
-        try {
-            Properties properties = new Properties();
-            properties.load(resource.getInputStream());
-            return new PropertiesPropertySource(resource.getFilename(), properties);
-        } catch (IOException ex) {
-            throw new IllegalStateException("加载配置文件失败" + resource, ex);
-        }
-    }
-
-    /**
-     * 加载yml格式配置文件
-     *
-     * @param resource
-     * @return
-     */
-    private List<PropertySource<?>> loadYmlProfiles(Resource resource) {
-        try {
-            YamlPropertySourceLoader yamlPropertySourceLoader = new YamlPropertySourceLoader();
-            return yamlPropertySourceLoader.load(resource.getFilename(), resource);
-        } catch (IOException ex) {
-            throw new IllegalStateException("加载配置文件失败" + resource, ex);
-        }
-    }
-}

base-springframework/base-springframework-cloud/src/main/java/com/wei/base/springframework/cloud/feign/FeignDecoder.java

@@ -1,34 +0,0 @@
-package com.wei.base.springframework.cloud.feign;
-
-import feign.FeignException;
-import feign.Response;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.ObjectFactory;
-import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
-import org.springframework.cloud.openfeign.support.SpringDecoder;
-import org.springframework.context.annotation.Configuration;
-
-import java.io.IOException;
-import java.lang.reflect.Type;
-
-/**
- * feign出参返回值
- *
- * @author : weierming
- * @date : 2020/7/24
- */
-@Slf4j
-@Configuration
-public class FeignDecoder extends SpringDecoder {
-
-    public FeignDecoder(ObjectFactory<HttpMessageConverters> messageConverters) {
-        super(messageConverters);
-    }
-
-    @Override
-    public Object decode(Response response, Type type) throws IOException, FeignException {
-        String rString = String.valueOf(super.decode(response, String.class));
-        log.info("url:{}, body:{}", response.request().url(), rString);
-        return rString;
-    }
-}

base-springframework/base-springframework-cloud/src/main/java/com/wei/base/springframework/cloud/feign/FeignErrorDecoder.java

@@ -1,45 +0,0 @@
-package com.wei.base.springframework.cloud.feign;
-
-import com.google.common.base.Charsets;
-import feign.FeignException;
-import feign.Response;
-import feign.Util;
-import feign.codec.ErrorDecoder;
-import lombok.extern.slf4j.Slf4j;
-
-import java.io.IOException;
-
-import static feign.FeignException.errorStatus;
-
-/**
- * feign错误拦截器
- *
- * @author : weierming
- * @date : 2020/7/24
- */
-@Slf4j
-public class FeignErrorDecoder implements ErrorDecoder {
-
-    @Override
-    public Exception decode(String methodKey, Response response) {
-        try {
-            String body = Util.toString(response.body().asReader(Charsets.UTF_8));
-            log.error("body:{}", body);
-        } catch (IOException e) {
-            log.error("读取body失败!", e);
-        }
-
-        FeignException e = errorStatus(methodKey, response);
-        log.error("request:{}", response.request(), e);
-        Exception exception = null;
-        switch (response.status()) {
-            case 404:
-                exception = new Exception("服务不存在!");
-
-            default:
-                break;
-        }
-
-        return exception;
-    }
-}

base-springframework/base-springframework-cloud/src/main/java/com/wei/base/springframework/cloud/feign/FeignInterceptor.java

@@ -1,59 +0,0 @@
-package com.wei.base.springframework.cloud.feign;
-
-import com.wei.base.springframework.cloud.config.FeignConfigure;
-import feign.RequestInterceptor;
-import feign.RequestTemplate;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.context.request.RequestAttributes;
-import org.springframework.web.context.request.RequestContextHolder;
-import org.springframework.web.context.request.ServletRequestAttributes;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.Collection;
-import java.util.Enumeration;
-import java.util.Map;
-
-/**
- * feign拦截器,主要用于往header中添加参数
- *
- * @author : weierming
- * @date : 2020/7/23
- */
-@Configuration
-public class FeignInterceptor implements RequestInterceptor {
-
-    @Autowired
-    private FeignConfigure feignConfigure;
-
-    /**
-     * 封装fegin header参数传递
-     *
-     * @param template
-     */
-    @Override
-    public void apply(RequestTemplate template) {
-        RequestAttributes requestAttributes = RequestContextHolder.getRequestAttributes();
-
-        if (requestAttributes != null) {
-            ServletRequestAttributes servletRequestAttributes = (ServletRequestAttributes) requestAttributes;
-            HttpServletRequest httpServletRequest = servletRequestAttributes.getRequest();
-            Map<String, Collection<String>> headers = template.headers();
-
-            // 有些第三方接口有做安全校验如果header传递的话会导致报错
-            String headerTransmitFilter = feignConfigure.getHeaderTransmitFilter();
-            if (headers.containsKey(headerTransmitFilter)) {
-                Collection<String> key = headers.get(headerTransmitFilter);
-                if (key.contains("true")) {
-                    return;
-                }
-            }
-
-            Enumeration<String> headNames = httpServletRequest.getHeaderNames();
-            while (headNames.hasMoreElements()) {
-                String headName = headNames.nextElement();
-                template.header(headName, httpServletRequest.getHeader(headName));
-            }
-        }
-    }
-}

base-springframework/base-springframework-cloud/src/main/java/com/wei/base/springframework/cloud/vo/EagerLoad.java

@@ -1,22 +0,0 @@
-package com.wei.base.springframework.cloud.vo;
-
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.List;
-
-@Data
-public class EagerLoad implements Serializable {
-
-    private static final long serialVersionUID = 6222379748331032436L;
-
-    /**
-     * 需要排除的服务
-     */
-    private Boolean autoEnabled = Boolean.FALSE;
-
-    /**
-     * 需要排除的服务
-     */
-    private List<String> excludes;
-}

base-springframework/base-springframework-cloud/src/main/java/com/wei/base/springframework/cloud/web/handler/BaseExceptionHandler.java

@@ -1,54 +0,0 @@
-package com.wei.base.springframework.cloud.web.handler;
-
-import com.netflix.hystrix.exception.HystrixRuntimeException;
-import com.wei.base.springframework.constant.enums.RestfulEnum;
-import com.wei.base.springframework.constant.vo.RestfulVO;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.web.bind.annotation.ControllerAdvice;
-import org.springframework.web.bind.annotation.ExceptionHandler;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import java.util.Set;
-
-/**
- * 公共异常处理类
- *
- * @author admin
- */
-@Slf4j
-@ControllerAdvice
-public class BaseExceptionHandler {
-
-    @Value("${debug:false}")
-    private boolean debug;
-
-    @ExceptionHandler(HystrixRuntimeException.class)
-    @ResponseBody
-    public RestfulVO<String> hystrixRuntimeException(HystrixRuntimeException e) {
-        log.error(e.getMessage(), e.getCause());
-        return new RestfulVO<>(RestfulEnum.FAIL, "系统异常!");
-    }
-
-    /**
-     * 封装javax.validation抛出的错误
-     *
-     * @param e
-     * @return
-     */
-    @ExceptionHandler(ConstraintViolationException.class)
-    @ResponseBody
-    public RestfulVO<String> constraintViolationException(ConstraintViolationException e) {
-        log.error(e.getMessage(), e);
-        Set<ConstraintViolation<?>> constraintViolations = e.getConstraintViolations();
-        StringBuilder stringBuilder = new StringBuilder();
-
-        constraintViolations.forEach(vo -> {
-            stringBuilder.append(vo.getMessage() + ";");
-        });
-
-        return new RestfulVO<>(RestfulEnum.FAIL, stringBuilder.toString());
-    }
-}

base-springframework/base-springframework-cloud/src/main/resources/META-INF/spring.factories

@@ -1,9 +0,0 @@
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-    com.wei.base.springframework.cloud.config.FeignConfigure,\
-    com.wei.base.springframework.cloud.feign.FeignInterceptor,\
-    com.wei.base.springframework.cloud.feign.FeignDecoder,\
-    com.wei.base.springframework.cloud.config.RibbonConfig,\
-    com.wei.base.springframework.cloud.config.RibbonProperties
-
-org.springframework.boot.env.EnvironmentPostProcessor=\
-    com.wei.base.springframework.cloud.env.InitializeCustomConfiguration

base-springframework/base-springframework-cloud/src/main/resources/application-cloud.yml

@@ -1,19 +0,0 @@
-spring:
-  cloud:
-    consul:
-      config:
-        # 表示consul上面文件的格式 有四种 yaml properties key_value files
-        format: yaml
-        prefix: config
-        data-key: application.yml
-      discovery:
-        prefer-ip-address: true
-        health-check-path: ${server.servlet.context-path:}/actuator/health
-
-ribbon:
-  eager-load:
-    enabled: true
-    # 是否自动加载
-    autoEnabled: true
-    # 需要过滤加载的服务
-    excludes: consul

base-springframework/base-springframework-constant/pom.xml

@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>com.wei</groupId>
+        <groupId>com.xxx</groupId>
         <artifactId>base-springframework</artifactId>
         <version>0.0.1-SNAPSHOT</version>
     </parent>
@@ -19,14 +19,11 @@
         <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
-        <spring-boot-maven-plugin.version>2.3.1.RELEASE</spring-boot-maven-plugin.version>
-        <springfox-swagger.version>2.10.5</springfox-swagger.version>
-        <mapstruct.version>1.3.1.Final</mapstruct.version>
     </properties>
 
     <dependencies>
         <!--<dependency>
-            <groupId>com.wei</groupId>
+            <groupId>com.xxx</groupId>
             <artifactId>base-springframework-util</artifactId>
             <version>${project.version}</version>
         </dependency>-->

base-springframework/base-springframework-constant/src/main/java/com/wei/base/springframework/constant/enums/RestfulEnum.java → base-springframework/base-springframework-constant/src/main/java/com/xxx/base/springframework/constant/enums/RestfulEnum.java

@@ -1,4 +1,4 @@
-package com.wei.base.springframework.constant.enums;
+package com.xxx.base.springframework.constant.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

base-springframework/base-springframework-constant/src/main/java/com/wei/base/springframework/constant/exception/BaseException.java → base-springframework/base-springframework-constant/src/main/java/com/xxx/base/springframework/constant/exception/BaseException.java

@@ -1,4 +1,4 @@
-package com.wei.base.springframework.constant.exception;
+package com.xxx.base.springframework.constant.exception;
 
 /**
  * 公共异常类

base-springframework/base-springframework-constant/src/main/java/com/wei/base/springframework/constant/exception/ServiceException.java → base-springframework/base-springframework-constant/src/main/java/com/xxx/base/springframework/constant/exception/ServiceException.java

@@ -1,4 +1,4 @@
-package com.wei.base.springframework.constant.exception;
+package com.xxx.base.springframework.constant.exception;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

base-springframework/base-springframework-constant/src/main/java/com/xxx/base/springframework/constant/vo/ErrorResponseData.java

@@ -0,0 +1,25 @@
+package com.xxx.base.springframework.constant.vo;
+
+import lombok.Data;
+
+/**
+ * @description:  请求失败的返回对象
+ * @author: huzhiwen
+ * @create: 2019-01-26 16:51
+ **/
+
+@Data
+public class ErrorResponseData extends ResponseData {
+
+    public ErrorResponseData(String message) {
+        super(false, ResponseData.DEFAULT_ERROR_CODE, message, null);
+    }
+
+    public ErrorResponseData(Integer code, String message) {
+        super(false, code, message, null);
+    }
+
+    public ErrorResponseData(Integer code, String message, Object object) {
+        super(false, code, message, object);
+    }
+}

base-springframework/base-springframework-constant/src/main/java/com/wei/base/springframework/constant/vo/PageRequest.java → base-springframework/base-springframework-constant/src/main/java/com/xxx/base/springframework/constant/vo/PageRequest.java

@@ -1,4 +1,4 @@
-package com.wei.base.springframework.constant.vo;
+package com.xxx.base.springframework.constant.vo;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

base-springframework/base-springframework-constant/src/main/java/com/xxx/base/springframework/constant/vo/ResponseData.java

@@ -0,0 +1,80 @@
+package com.xxx.base.springframework.constant.vo;
+
+import lombok.Data;
+
+/**
+ * @description: 返回给前台的通用包装
+ * @author: huzhiwen
+ * @create: 2019-01-26 16:42
+ **/
+
+@Data
+public class ResponseData<T> {
+    public static final String DEFAULT_SUCCESS_MESSAGE = "请求成功";
+
+    public static final String DEFAULT_ERROR_MESSAGE = "网络异常";
+
+    public static final Integer DEFAULT_SUCCESS_CODE = 200;
+
+    public static final Integer DEFAULT_ERROR_CODE = 500;
+
+    /**
+     * 请求是否成功
+     */
+    private Boolean success;
+
+    /**
+     * 响应状态码
+     */
+    private Integer code;
+
+    /**
+     * 响应信息
+     */
+    private String message;
+
+    /**
+     * 响应对象
+     */
+    private T data;
+
+    public ResponseData() {
+    }
+
+    public ResponseData(Boolean success, Integer code, String message, T data) {
+        this.success = success;
+        this.code = code;
+        this.message = message;
+        this.data = data;
+    }
+
+    public ResponseData(Boolean success, Integer code, String message) {
+        this.success = success;
+        this.code = code;
+        this.message = message;
+    }
+
+    public static SuccessResponseData success() {
+        return new SuccessResponseData();
+    }
+
+    public static SuccessResponseData success(Object object) {
+        return new SuccessResponseData(object);
+    }
+
+    public static SuccessResponseData success(Integer code, String message, Object object) {
+        return new SuccessResponseData(code, message, object);
+    }
+
+    public static ErrorResponseData error(String message) {
+        return new ErrorResponseData(message);
+    }
+
+    public static ErrorResponseData error(Integer code, String message) {
+        return new ErrorResponseData(code, message);
+    }
+
+    public static ErrorResponseData error(Integer code, String message, Object object) {
+        return new ErrorResponseData(code, message, object);
+    }
+}

base-springframework/base-springframework-constant/src/main/java/com/wei/base/springframework/constant/vo/RestfulVO.java → base-springframework/base-springframework-constant/src/main/java/com/xxx/base/springframework/constant/vo/RestfulVO.java

@@ -1,7 +1,7 @@
-package com.wei.base.springframework.constant.vo;
+package com.xxx.base.springframework.constant.vo;
 
-import com.wei.base.springframework.constant.enums.RestfulEnum;
-import com.wei.base.springframework.constant.exception.ServiceException;
+import com.xxx.base.springframework.constant.enums.RestfulEnum;
+import com.xxx.base.springframework.constant.exception.ServiceException;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

base-springframework/base-springframework-constant/src/main/java/com/xxx/base/springframework/constant/vo/SuccessResponseData.java

@@ -0,0 +1,24 @@
+package com.xxx.base.springframework.constant.vo;
+
+import lombok.Data;
+
+/**
+ * @description:  请求成功的返回对象
+ * @author: huzhiwen
+ * @create: 2019-01-26 16:53
+ **/
+
+@Data
+public class SuccessResponseData extends ResponseData {
+    public SuccessResponseData() {
+        super(true, DEFAULT_SUCCESS_CODE, DEFAULT_SUCCESS_MESSAGE,null);
+    }
+
+    public SuccessResponseData(Object object) {
+        super(true, DEFAULT_SUCCESS_CODE, DEFAULT_SUCCESS_MESSAGE, object);
+    }
+
+    public SuccessResponseData(Integer code, String message, Object object) {
+        super(true, code, message, object);
+    }
+}

base-springframework/base-springframework-core/pom.xml

@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>com.wei</groupId>
+        <groupId>com.xxx</groupId>
         <artifactId>base-springframework</artifactId>
         <version>0.0.1-SNAPSHOT</version>
     </parent>
@@ -19,20 +19,22 @@
         <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
-        <spring-boot-maven-plugin.version>2.3.1.RELEASE</spring-boot-maven-plugin.version>
+        <spring-boot-maven-plugin.version>2.4.1</spring-boot-maven-plugin.version>
         <springfox-boot-starter.version>3.0.0</springfox-boot-starter.version>
-        <mapstruct.version>1.3.1.Final</mapstruct.version>
+<!--
+        <mapstruct.version>1.6.3</mapstruct.version>
+-->
     </properties>
 
     <dependencies>
         <dependency>
-            <groupId>com.wei</groupId>
+            <groupId>com.xxx</groupId>
             <artifactId>base-springframework-constant</artifactId>
             <version>${project.version}</version>
         </dependency>
 
         <dependency>
-            <groupId>com.wei</groupId>
+            <groupId>com.xxx</groupId>
             <artifactId>base-springframework-util</artifactId>
             <version>${project.version}</version>
         </dependency>

base-springframework/base-springframework-core/src/main/java/com/wei/base/springframework/core/log/config/LogProperty.java → base-springframework/base-springframework-core/src/main/java/com/xxx/base/springframework/core/config/LogProperty.java

@@ -1,4 +1,4 @@
-package com.wei.base.springframework.core.log.config;
+package com.xxx.base.springframework.core.config;
 
 import ch.qos.logback.core.PropertyDefinerBase;
 

base-springframework/base-springframework-core/src/main/java/com/wei/base/springframework/core/http/converter/StringTrimmerEditorInitBinder.java → base-springframework/base-springframework-core/src/main/java/com/xxx/base/springframework/core/converter/StringTrimmerEditorInitBinder.java

@@ -1,4 +1,4 @@
-package com.wei.base.springframework.core.http.converter;
+package com.xxx.base.springframework.core.converter;
 
 
 import org.springframework.beans.propertyeditors.StringTrimmerEditor;

base-springframework/base-springframework-core/src/main/java/com/wei/base/springframework/core/http/converter/StringWithoutSpaceDeserializer.java → base-springframework/base-springframework-core/src/main/java/com/xxx/base/springframework/core/converter/StringWithoutSpaceDeserializer.java

@@ -1,9 +1,9 @@
-package com.wei.base.springframework.core.http.converter;
+package com.xxx.base.springframework.core.converter;
 
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
-import com.wei.base.springframework.util.StringUtil;
+import com.xxx.base.springframework.util.StringUtil;
 
 import java.io.IOException;
 

base-springframework/base-springframework-core/src/main/java/com/wei/base/springframework/core/env/InitializeCustomConfiguration.java → base-springframework/base-springframework-core/src/main/java/com/xxx/base/springframework/core/env/InitializeCustomConfiguration.java

@@ -1,4 +1,4 @@
-package com.wei.base.springframework.core.env;
+package com.xxx.base.springframework.core.env;
 
 import com.google.common.collect.Lists;
 import org.apache.commons.lang3.StringUtils;

base-springframework/base-springframework-core/src/main/java/com/xxx/base/springframework/core/web/config/PathLocaleResolver.java

@@ -0,0 +1,50 @@
+package com.xxx.base.springframework.core.web.config;
+
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.LocaleResolver;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Locale;
+
+@Slf4j
+@Configuration
+public class PathLocaleResolver implements LocaleResolver {
+
+    private static final String ADMIN_DEFAULT_LANGUAGE = "zh_CN";
+
+    private static final String DEFAULT_LANGUAGE = "idn";
+
+    @Autowired
+    private HttpServletRequest request;
+
+    public Locale getLocal() {
+        return resolveLocale(request);
+    }
+
+    @Override
+    public Locale resolveLocale(HttpServletRequest request) {
+        String lang = request.getParameter("lang");
+        if (StringUtils.isNotBlank(lang)) {
+            if (StringUtils.equals(lang, ADMIN_DEFAULT_LANGUAGE)) {
+                return Locale.SIMPLIFIED_CHINESE;
+            }
+            
+            return new Locale(lang);
+        }
+
+        String path = request.getRequestURI();
+        if (StringUtils.contains(path, "/admin/")) {
+            return Locale.SIMPLIFIED_CHINESE;
+        }
+        return new Locale(DEFAULT_LANGUAGE);
+    }
+
+    @Override
+    public void setLocale(HttpServletRequest request, HttpServletResponse response, Locale locale) {
+        // 可选：根据业务逻辑保存到 Session 或 Cookie
+    }
+}

base-springframework/base-springframework-core/src/main/java/com/wei/base/springframework/core/web/config/ResponseHandlerConfigure.java → base-springframework/base-springframework-core/src/main/java/com/xxx/base/springframework/core/web/config/ResponseHandlerConfigure.java

@@ -1,7 +1,7 @@
-package com.wei.base.springframework.core.web.config;
+package com.xxx.base.springframework.core.web.config;
 
-import com.wei.base.springframework.constant.vo.RestfulVO;
-import com.wei.base.springframework.util.StringUtil;
+import com.xxx.base.springframework.constant.vo.RestfulVO;
+import com.xxx.base.springframework.util.StringUtil;
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Configuration;

base-springframework/base-springframework-core/src/main/java/com/wei/base/springframework/core/web/config/WebConfiguration.java → base-springframework/base-springframework-core/src/main/java/com/xxx/base/springframework/core/web/config/WebConfiguration.java

@@ -1,4 +1,4 @@
-package com.wei.base.springframework.core.web.config;
+package com.xxx.base.springframework.core.web.config;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.databind.DeserializationFeature;
@@ -6,13 +6,19 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.module.SimpleModule;
 import com.google.common.base.Charsets;
 import com.google.common.collect.Lists;
-import com.wei.base.springframework.core.http.converter.StringWithoutSpaceDeserializer;
+import com.xxx.base.springframework.core.converter.StringWithoutSpaceDeserializer;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
 import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
+import org.springframework.web.servlet.LocaleResolver;
+import org.springframework.web.servlet.config.annotation.CorsRegistry;
+import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+import org.springframework.web.servlet.i18n.LocaleChangeInterceptor;
 
 import java.text.SimpleDateFormat;
 import java.util.List;
@@ -29,6 +35,9 @@ public class WebConfiguration implements WebMvcConfigurer {
     @Autowired
     private ResponseHandlerConfigure responseHandlerConfigure;
 
+    @Autowired
+    private PathLocaleResolver pathLocaleResolver;
+
     @Override
     public void configureMessageConverters(List<HttpMessageConverter<?>> converters) {
         MappingJackson2HttpMessageConverter mappingJackson2HttpMessageConverter = new MappingJackson2HttpMessageConverter();
@@ -53,4 +62,42 @@ public class WebConfiguration implements WebMvcConfigurer {
         mappingJackson2HttpMessageConverter.setSupportedMediaTypes(Lists.newArrayList(MediaType.APPLICATION_JSON));
         converters.add(0, mappingJackson2HttpMessageConverter);
     }
+
+    @Bean
+    public LocaleChangeInterceptor localeChangeInterceptor() {
+        LocaleChangeInterceptor interceptor = new LocaleChangeInterceptor();
+        interceptor.setParamName("lang");
+        return interceptor;
+    }
+
+    @Override
+    public void addInterceptors(InterceptorRegistry registry) {
+        registry.addInterceptor(localeChangeInterceptor());
+    }
+
+    /**
+     * 默认解析器 其中locale表示默认语言
+     */
+    @Bean
+    public WebMvcConfigurer corsConfigurer() {
+        return new WebMvcConfigurer() {
+            @Override
+            public void addCorsMappings(CorsRegistry registry) {
+                registry.addMapping("/**").
+                        allowedOriginPatterns("*"). //允许跨域的域名，可以用*表示允许任何域名使用
+                        allowedMethods("GET", "POST"). //允许任何方法（post、get等）
+                        allowedHeaders("*"). //允许任何请求头
+                        allowCredentials(true). //带上cookie信息
+                        exposedHeaders(HttpHeaders.SET_COOKIE).maxAge(3600L); //maxAge(3600)表明在3600秒内，不需要再发送预检验请求，可以缓存该结果
+            }
+        };
+    }
+
+    /**
+     * 默认解析器 其中locale表示默认语言
+     */
+    @Bean
+    public LocaleResolver localeResolver() {
+        return pathLocaleResolver;
+    }
 }

base-springframework/base-springframework-core/src/main/java/com/wei/base/springframework/core/web/handler/BaseExceptionHandler.java → base-springframework/base-springframework-core/src/main/java/com/xxx/base/springframework/core/web/handler/BaseExceptionHandler.java

@@ -1,8 +1,8 @@
-package com.wei.base.springframework.core.web.handler;
+package com.xxx.base.springframework.core.web.handler;
 
-import com.wei.base.springframework.constant.enums.RestfulEnum;
-import com.wei.base.springframework.constant.exception.ServiceException;
-import com.wei.base.springframework.constant.vo.RestfulVO;
+import com.xxx.base.springframework.constant.enums.RestfulEnum;
+import com.xxx.base.springframework.constant.exception.ServiceException;
+import com.xxx.base.springframework.constant.vo.RestfulVO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.converter.HttpMessageNotReadableException;

base-springframework/base-springframework-core/src/main/java/com/wei/base/springframework/core/web/handler/ResponseHandler.java → base-springframework/base-springframework-core/src/main/java/com/xxx/base/springframework/core/web/handler/ResponseHandler.java

@@ -1,10 +1,11 @@
-package com.wei.base.springframework.core.web.handler;
+package com.xxx.base.springframework.core.web.handler;
 
-import com.wei.base.springframework.constant.vo.RestfulVO;
-import com.wei.base.springframework.core.web.config.ResponseHandlerConfigure;
-import com.wei.base.springframework.util.RegexUtil;
+import com.google.common.collect.Sets;
+import com.xxx.base.springframework.constant.vo.ResponseData;
+import com.xxx.base.springframework.util.RegexUtil;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.context.annotation.Bean;
 import org.springframework.core.MethodParameter;
 import org.springframework.http.MediaType;
 import org.springframework.http.converter.HttpMessageConverter;
@@ -13,28 +14,19 @@ import org.springframework.http.server.ServerHttpResponse;
 import org.springframework.web.bind.annotation.ControllerAdvice;
 import org.springframework.web.servlet.mvc.method.annotation.ResponseBodyAdvice;
 
-/**
- * 返回值封装
- *
- * @author : weierming
- * @date : 2020/7/10
- */
+import java.util.Set;
+
 @Slf4j
 @ControllerAdvice
 public class ResponseHandler implements ResponseBodyAdvice<Object> {
 
-    @Autowired
-    private ResponseHandlerConfigure responseHandlerConfigure;
-
     // 只对以下路径进行封装 以防封装到spring以及第三方接口导致出现问题情况
-    private static final String PACKAGE_PATH = ".*.controller.*";
+    private static final String PACKAGE_PATH = ".*.modulesV2.controller.*";
+
+    private static final Set<String> FILTER_URI = Sets.newHashSet("/onLinePayment/notify");
 
     @Override
     public boolean supports(MethodParameter methodParameter, Class<? extends HttpMessageConverter<?>> aClass) {
-        // 如果没启用的话就跳过
-        if (!responseHandlerConfigure.getEnabled()) {
-            return Boolean.FALSE;
-        }
 
         // 如果不是controller包下的不进行封装 以防封装到spring以及第三方接口导致出现问题情况
         if (!RegexUtil.matcher(PACKAGE_PATH, methodParameter.getExecutable().getDeclaringClass().getName())) {
@@ -48,7 +40,10 @@ public class ResponseHandler implements ResponseBodyAdvice<Object> {
     public Object beforeBodyWrite(Object t, MethodParameter methodParameter, MediaType mediaType,
                                   Class<? extends HttpMessageConverter<?>> httpMessageConverter,
                                   ServerHttpRequest serverHttpRequest, ServerHttpResponse serverHttpResponse) {
-        RestfulVO restfulVO = responseHandlerConfigure.getRestfulVO();
-        return restfulVO.success(t);
+        if (CollectionUtils.containsAny(FILTER_URI, serverHttpRequest.getURI().getPath())) {
+            return t;
+        }
+
+        return ResponseData.success(t);
     }
 }

base-springframework/base-springframework-core/src/main/resources/META-INF/spring.factories

@@ -1,9 +1,10 @@
 org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-  com.wei.base.springframework.core.web.config.ResponseHandlerConfigure,\
-  com.wei.base.springframework.core.web.handler.BaseExceptionHandler,\
-  com.wei.base.springframework.core.web.handler.ResponseHandler,\
-  com.wei.base.springframework.core.web.config.WebConfiguration,\
-  com.wei.base.springframework.core.http.converter.StringTrimmerEditorInitBinder
+  com.xxx.base.springframework.core.web.config.ResponseHandlerConfigure,\
+  com.xxx.base.springframework.core.web.handler.BaseExceptionHandler,\
+  com.xxx.base.springframework.core.web.handler.ResponseHandler,\
+  com.xxx.base.springframework.core.web.config.WebConfiguration,\
+  com.xxx.base.springframework.core.converter.StringTrimmerEditorInitBinder,\
+  com.xxx.base.springframework.core.web.config.PathLocaleResolver
 
 org.springframework.boot.env.EnvironmentPostProcessor=\
-  com.wei.base.springframework.core.env.InitializeCustomConfiguration
+  com.xxx.base.springframework.core.env.InitializeCustomConfiguration

base-springframework/base-springframework-core/src/main/resources/application-common.yml

@@ -3,11 +3,19 @@ spring:
     servlet:
       #启动时加载所有servlet 避免访问后在加载会延长第一次的请求时间
       load-on-startup: 0
-
+  messages:
+    encoding: UTF-8
+    basename: i18n/messages
+    fallback-to-system-locale: false
+    cache-duration: 600s
+  servlet:
+    multipart:
+      enabled: true
+      max-file-size: 1024MB #单个文件的上限大小
+      max-request-size: 10240MB #总文件的上限大小
+      
 #公共配置 减少各个项目中的配置
 server:
-  servlet:
-    context-path: /${spring.application.name}
   undertow:
     threads:
       # 设置IO线程数, 它主要执行非阻塞的任务,它们会负责多个连接, 默认设置每个CPU核心一个线程

base-springframework/base-springframework-core/src/main/resources/logback-spring.xml

@@ -5,7 +5,7 @@
 <!-- debug:当此属性设置为true时，将打印出logback内部日志信息，实时查看logback运行状态。默认值为false。 -->
 <configuration scan="true" scanPeriod="10 seconds">
 
-    <define name="logPath" class="com.wei.base.springframework.core.log.config.LogProperty"/>
+    <define name="logPath" class="com.xxx.base.springframework.core.config.LogProperty"/>
     <property name="log.path" value="/data/release/logs/${logPath}"/>
     <!--<property name="log.path" value="/data/release/logs"/>-->
     <property name="log.lever" value="debug"/>
@@ -13,8 +13,10 @@
     <!-- 彩色日志 -->
     <!-- 彩色日志依赖的渲染类 -->
     <conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter"/>
-    <conversionRule conversionWord="wex" converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter"/>
-    <conversionRule conversionWord="wEx" converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter"/>
+    <conversionRule conversionWord="wex"
+                    converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter"/>
+    <conversionRule conversionWord="wEx"
+                    converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter"/>
     <!-- 彩色日志格式 -->
     <property name="CONSOLE_LOG_PATTERN"
               value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
@@ -173,4 +175,11 @@
         <appender-ref ref="WARN_FILE"/>
         <appender-ref ref="ERROR_FILE"/>
     </root>
+    <root level="">
+        <appender-ref ref="CONSOLE"/>
+        <appender-ref ref="DEBUG_FILE"/>
+        <appender-ref ref="INFO_FILE"/>
+        <appender-ref ref="WARN_FILE"/>
+        <appender-ref ref="ERROR_FILE"/>
+    </root>
 </configuration>

base-springframework/base-springframework-db/pom.xml

@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>com.wei</groupId>
+        <groupId>com.xxx</groupId>
         <artifactId>base-springframework</artifactId>
         <version>0.0.1-SNAPSHOT</version>
     </parent>
@@ -16,16 +16,16 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <java.version>1.8</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <spring-boot-maven-plugin.version>2.3.4.RELEASE</spring-boot-maven-plugin.version>
-        <mysql-connector-java.version>8.0.21</mysql-connector-java.version>
-        <mybatis-plus.version>3.3.2</mybatis-plus.version>
-        <freemarker.version>2.3.30</freemarker.version>
+        <spring-boot-maven-plugin.version>2.4.1</spring-boot-maven-plugin.version>
+        <mysql-connector-java.version>8.0.22</mysql-connector-java.version>
+        <mybatis-plus.version>3.4.1</mybatis-plus.version>
         <p6spy.version>3.9.1</p6spy.version>
+        <druid.version>1.2.3</druid.version>
     </properties>
 
     <dependencies>
         <dependency>
-            <groupId>com.wei</groupId>
+            <groupId>com.xxx</groupId>
             <artifactId>base-springframework-util</artifactId>
             <version>${project.version}</version>
         </dependency>
@@ -40,10 +40,15 @@
             <version>${mysql-connector-java.version}</version>
         </dependency>
         <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>druid</artifactId>
+            <version>${druid.version}</version>
+        </dependency>
+<!--        <dependency>
             <groupId>p6spy</groupId>
             <artifactId>p6spy</artifactId>
             <version>${p6spy.version}</version>
-        </dependency>
+        </dependency>-->
     </dependencies>
 
     <build>

base-springframework/base-springframework-db/src/main/java/com/xxx/base/springframework/db/config/SingleDataSource.java

@@ -0,0 +1,38 @@
+package com.xxx.base.springframework.db.config;
+
+import com.alibaba.druid.pool.DruidDataSource;
+
+import com.xxx.base.springframework.db.propertiesv.DruidProperties;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
+
+/**
+ * @description: 单数据源配置
+ * @author: huzhiwen
+ * @create: 2020-11-16 17:56
+ **/
+
+@Configuration
+@EnableTransactionManagement(proxyTargetClass = true)
+public class SingleDataSource {
+    /**
+     * druid配置
+     */
+    @Bean
+    @ConfigurationProperties(prefix = "spring.datasource")
+    public DruidProperties druidProperties() {
+        return new DruidProperties();
+    }
+
+    /**
+     * 单数据源连接池配置
+     */
+    @Bean
+    public DruidDataSource dataSource(DruidProperties druidProperties) {
+        DruidDataSource dataSource = new DruidDataSource();
+        druidProperties.config(dataSource);
+        return dataSource;
+    }
+}

base-springframework/base-springframework-db/src/main/java/com/wei/base/springframework/db/env/InitializeCustomConfiguration.java → base-springframework/base-springframework-db/src/main/java/com/xxx/base/springframework/db/env/InitializeCustomConfiguration.java

@@ -1,4 +1,4 @@
-package com.wei.base.springframework.db.env;
+package com.xxx.base.springframework.db.env;
 
 import com.google.common.collect.Lists;
 import org.apache.commons.lang3.StringUtils;

base-springframework/base-springframework-db/src/main/java/com/xxx/base/springframework/db/propertiesv/DruidProperties.java

@@ -0,0 +1,81 @@
+package com.xxx.base.springframework.db.propertiesv;
+
+import com.alibaba.druid.pool.DruidDataSource;
+import lombok.Data;
+
+import java.sql.SQLException;
+
+/**
+ * @description:  数据库数据源配置
+ * @author: huzhiwen
+ * @create: 2019-01-27 17:59
+ **/
+
+@Data
+public class DruidProperties {
+    private String url;
+
+    private String username;
+
+    private String password;
+
+    private String driverClassName;
+
+    private Integer initialSize = 2;
+
+    private Integer minIdle = 1;
+
+    private Integer maxActive = 20;
+
+    private Integer maxWait = 60000;
+
+    private Integer timeBetweenEvictionRunsMillis = 60000;
+
+    private Integer minEvictableIdleTimeMillis = 300000;
+
+    private String validationQuery = "SELECT 'x'";
+
+    private Boolean testWhileIdle = true;
+
+    private Boolean testOnBorrow = false;
+
+    private Boolean testOnReturn = false;
+
+    private Boolean poolPreparedStatements = true;
+
+    private Integer maxPoolPreparedStatementPerConnectionSize = 20;
+
+    private String filters = "stat";
+
+    public void config(DruidDataSource dataSource) {
+        dataSource.setUrl(url);
+        dataSource.setUsername(username);
+        dataSource.setPassword(password);
+
+        dataSource.setDriverClassName(driverClassName);
+        dataSource.setInitialSize(initialSize);     //定义初始连接数
+        dataSource.setMinIdle(minIdle);             //最小空闲
+        dataSource.setMaxActive(maxActive);         //定义最大连接数
+        dataSource.setMaxWait(maxWait);             //最长等待时间
+
+        // 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+        dataSource.setTimeBetweenEvictionRunsMillis(timeBetweenEvictionRunsMillis);
+
+        // 配置一个连接在池中最小生存的时间，单位是毫秒
+        dataSource.setMinEvictableIdleTimeMillis(minEvictableIdleTimeMillis);
+        dataSource.setValidationQuery(validationQuery);
+        dataSource.setTestWhileIdle(testWhileIdle);
+        dataSource.setTestOnBorrow(testOnBorrow);
+        dataSource.setTestOnReturn(testOnReturn);
+
+        // 打开PSCache，并且指定每个连接上PSCache的大小
+        dataSource.setPoolPreparedStatements(poolPreparedStatements);
+        dataSource.setMaxPoolPreparedStatementPerConnectionSize(maxPoolPreparedStatementPerConnectionSize);
+
+        try {
+            dataSource.setFilters(filters);
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+    }
+}

base-springframework/base-springframework-db/src/main/resources/META-INF/spring.factories

@@ -1,2 +1,2 @@
 org.springframework.boot.env.EnvironmentPostProcessor=\
-  com.wei.base.springframework.db.env.InitializeCustomConfiguration
+  com.xxx.base.springframework.db.env.InitializeCustomConfiguration

base-springframework/base-springframework-db/src/main/resources/application-db.yml

@@ -1,4 +1,6 @@
 #公共配置 减少各个项目中的配置
 spring:
   datasource:
-    driver-class-name: com.p6spy.engine.spy.P6SpyDriver
+    filters: wall,mergeStat
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    max-active: 50

base-springframework/base-springframework-easyexcel/pom.xml

@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>com.wei</groupId>
+        <groupId>com.xxx</groupId>
         <artifactId>base-springframework</artifactId>
         <version>0.0.1-SNAPSHOT</version>
     </parent>
@@ -22,19 +22,19 @@
 
     <dependencies>
         <dependency>
-            <groupId>com.wei</groupId>
+            <groupId>com.xxx</groupId>
             <artifactId>base-springframework-core</artifactId>
             <version>${project.version}</version>
         </dependency>
 
         <dependency>
-            <groupId>com.wei</groupId>
+            <groupId>com.xxx</groupId>
             <artifactId>base-springframework-swagger</artifactId>
             <version>${project.version}</version>
         </dependency>
 
         <dependency>
-            <groupId>com.wei</groupId>
+            <groupId>com.xxx</groupId>
             <artifactId>base-springframework-mybatis-plus</artifactId>
             <version>${project.version}</version>
         </dependency>

base-springframework/base-springframework-easyexcel/src/main/java/com/wei/base/springframework/easyexcel/controller/BaseExport.java

@@ -1,13 +1,13 @@
-package com.wei.base.springframework.easyexcel.controller;
+package com.xxx.base.springframework.easyexcel.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.base.Charsets;
-import com.wei.base.springframework.constant.exception.ServiceException;
-import com.wei.base.springframework.easyexcel.enums.EsayExcelExceptionEnum;
-import com.wei.base.springframework.easyexcel.vo.ExportParam;
-import com.wei.base.springframework.easyexcel.vo.ExportRequest;
-import com.wei.base.springframework.util.HttpServletUtil;
-import com.wei.base.springframework.util.ReflectionUtil;
+import com.xxx.base.springframework.constant.exception.ServiceException;
+import com.xxx.base.springframework.easyexcel.enums.EsayExcelExceptionEnum;
+import com.xxx.base.springframework.easyexcel.vo.ExportParam;
+import com.xxx.base.springframework.easyexcel.vo.ExportRequest;
+import com.xxx.base.springframework.util.HttpServletUtil;
+import com.xxx.base.springframework.util.ReflectionUtil;
 import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

base-springframework/base-springframework-easyexcel/src/main/java/com/wei/base/springframework/easyexcel/controller/BaseExportLogic.java

@@ -1,4 +1,4 @@
-package com.wei.base.springframework.easyexcel.controller;
+package com.xxx.base.springframework.easyexcel.controller;
 
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.ExcelWriter;
@@ -8,15 +8,15 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.wei.base.springframework.constant.exception.ServiceException;
-import com.wei.base.springframework.easyexcel.enums.EsayExcelExceptionEnum;
-import com.wei.base.springframework.easyexcel.enums.ExportFileTypeEnum;
-import com.wei.base.springframework.easyexcel.vo.ExportParam;
-import com.wei.base.springframework.easyexcel.vo.ExportRequest;
-import com.wei.base.springframework.util.BeanUtil;
-import com.wei.base.springframework.util.PageUtil;
-import com.wei.base.springframework.util.SpringBeanUtil;
-import com.wei.base.springframework.util.StringUtil;
+import com.xxx.base.springframework.constant.exception.ServiceException;
+import com.xxx.base.springframework.easyexcel.enums.EsayExcelExceptionEnum;
+import com.xxx.base.springframework.easyexcel.enums.ExportFileTypeEnum;
+import com.xxx.base.springframework.easyexcel.vo.ExportParam;
+import com.xxx.base.springframework.easyexcel.vo.ExportRequest;
+import com.xxx.base.springframework.util.BeanUtil;
+import com.xxx.base.springframework.util.PageUtil;
+import com.xxx.base.springframework.util.SpringBeanUtil;
+import com.xxx.base.springframework.util.StringUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
 

base-springframework/base-springframework-easyexcel/src/main/java/com/wei/base/springframework/easyexcel/enums/EsayExcelExceptionEnum.java

@@ -1,6 +1,6 @@
-package com.wei.base.springframework.easyexcel.enums;
+package com.xxx.base.springframework.easyexcel.enums;
 
-import com.wei.base.springframework.constant.exception.BaseException;
+import com.xxx.base.springframework.constant.exception.BaseException;
 import lombok.Getter;
 
 @Getter

base-springframework/base-springframework-easyexcel/src/main/java/com/wei/base/springframework/easyexcel/enums/ExportFileTypeEnum.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.wei.base.springframework.easyexcel.enums;
+package com.xxx.base.springframework.easyexcel.enums;
 
 import com.alibaba.excel.support.ExcelTypeEnum;
 import lombok.AllArgsConstructor;

base-springframework/base-springframework-easyexcel/src/main/java/com/wei/base/springframework/easyexcel/util/ExcelUtil.java

@@ -1,4 +1,4 @@
-package com.wei.base.springframework.easyexcel.util;
+package com.xxx.base.springframework.easyexcel.util;
 
 public class ExcelUtil {
 }

base-springframework/base-springframework-easyexcel/src/main/java/com/wei/base/springframework/easyexcel/vo/ExportParam.java

@@ -1,7 +1,7 @@
-package com.wei.base.springframework.easyexcel.vo;
+package com.xxx.base.springframework.easyexcel.vo;
 
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.wei.base.springframework.easyexcel.enums.ExportFileTypeEnum;
+import com.xxx.base.springframework.easyexcel.enums.ExportFileTypeEnum;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 

base-springframework/base-springframework-easyexcel/src/main/java/com/wei/base/springframework/easyexcel/vo/ExportRequest.java

@@ -1,7 +1,7 @@
-package com.wei.base.springframework.easyexcel.vo;
+package com.xxx.base.springframework.easyexcel.vo;
 
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
-import com.wei.base.springframework.easyexcel.enums.ExportFileTypeEnum;
+import com.xxx.base.springframework.easyexcel.enums.ExportFileTypeEnum;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 

base-springframework/base-springframework-easyexcel/src/main/resources/META-INF/spring.factories

@@ -1,2 +1,2 @@
 #org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-#  com.wei.base.springframework.easyexcel.controller.BaseExportImpl
+#  com.xxx.base.springframework.easyexcel.controller.BaseExportImpl

base-springframework/base-springframework-easyexcel/target/classes/META-INF/spring.factories

@@ -0,0 +1,2 @@
+#org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+#  com.xxx.base.springframework.easyexcel.controller.BaseExportImpl

base-springframework/base-springframework-easyexcel/target/maven-archiver/pom.properties

@@ -0,0 +1,3 @@
+artifactId=base-springframework-easyexcel
+groupId=com.xxx
+version=0.0.1-SNAPSHOT

base-springframework/base-springframework-easyexcel/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -0,0 +1,7 @@
+com\xxx\base\springframework\easyexcel\controller\BaseExport.class
+com\xxx\base\springframework\easyexcel\enums\EsayExcelExceptionEnum.class
+com\xxx\base\springframework\easyexcel\util\ExcelUtil.class
+com\xxx\base\springframework\easyexcel\enums\ExportFileTypeEnum.class
+com\xxx\base\springframework\easyexcel\vo\ExportRequest.class
+com\xxx\base\springframework\easyexcel\controller\BaseExportLogic.class
+com\xxx\base\springframework\easyexcel\vo\ExportParam.class

base-springframework/base-springframework-easyexcel/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -0,0 +1,7 @@
+D:\IdeaProjects\base-framework\base-springframework\base-springframework-easyexcel\src\main\java\com\wei\base\springframework\easyexcel\enums\ExportFileTypeEnum.java
+D:\IdeaProjects\base-framework\base-springframework\base-springframework-easyexcel\src\main\java\com\wei\base\springframework\easyexcel\vo\ExportParam.java
+D:\IdeaProjects\base-framework\base-springframework\base-springframework-easyexcel\src\main\java\com\wei\base\springframework\easyexcel\controller\BaseExportLogic.java
+D:\IdeaProjects\base-framework\base-springframework\base-springframework-easyexcel\src\main\java\com\wei\base\springframework\easyexcel\util\ExcelUtil.java
+D:\IdeaProjects\base-framework\base-springframework\base-springframework-easyexcel\src\main\java\com\wei\base\springframework\easyexcel\enums\EsayExcelExceptionEnum.java
+D:\IdeaProjects\base-framework\base-springframework\base-springframework-easyexcel\src\main\java\com\wei\base\springframework\easyexcel\vo\ExportRequest.java
+D:\IdeaProjects\base-framework\base-springframework\base-springframework-easyexcel\src\main\java\com\wei\base\springframework\easyexcel\controller\BaseExport.java

base-springframework/base-springframework-mybatis-plus/pom.xml

@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>com.wei</groupId>
+        <groupId>com.xxx</groupId>
         <artifactId>base-springframework</artifactId>
         <version>0.0.1-SNAPSHOT</version>
     </parent>
@@ -16,14 +16,14 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <java.version>1.8</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <spring-boot-maven-plugin.version>2.3.4.RELEASE</spring-boot-maven-plugin.version>
-        <mybatis-plus.version>3.3.2</mybatis-plus.version>
+        <spring-boot-maven-plugin.version>2.4.1</spring-boot-maven-plugin.version>
+        <mybatis-plus.version>3.4.1</mybatis-plus.version>
         <freemarker.version>2.3.30</freemarker.version>
     </properties>
 
     <dependencies>
         <dependency>
-            <groupId>com.wei</groupId>
+            <groupId>com.xxx</groupId>
             <artifactId>base-springframework-util</artifactId>
             <version>${project.version}</version>
         </dependency>

base-springframework/base-springframework-mybatis-plus/src/main/java/com/wei/base/springframework/mybatisplus/config/CustomMybatisPlusProperties.java → base-springframework/base-springframework-mybatis-plus/src/main/java/com/xxx/base/springframework/mybatisplus/config/CustomMybatisPlusProperties.java

@@ -1,4 +1,4 @@
-package com.wei.base.springframework.mybatisplus.config;
+package com.xxx.base.springframework.mybatisplus.config;
 
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import lombok.Data;

base-springframework/base-springframework-mybatis-plus/src/main/java/com/wei/base/springframework/mybatisplus/config/MybatisPlusConfig.java → base-springframework/base-springframework-mybatis-plus/src/main/java/com/xxx/base/springframework/mybatisplus/config/MybatisPlusConfig.java

@@ -1,4 +1,4 @@
-package com.wei.base.springframework.mybatisplus.config;
+package com.xxx.base.springframework.mybatisplus.config;
 
 import com.baomidou.mybatisplus.annotation.DbType;
 import com.baomidou.mybatisplus.core.parser.ISqlParser;
@@ -15,7 +15,8 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
 import java.util.List;
 
 @EnableTransactionManagement
-@MapperScan("com.**.mapper")
+//@MapperScan("com.**.mapper")
+@MapperScan(basePackages = {"com.xxx.play.modules.*.mapper", "com.xxx.play.modulesV2.mapper"})
 @Configuration
 public class MybatisPlusConfig {
 

base-springframework/base-springframework-mybatis-plus/src/main/java/com/wei/base/springframework/mybatisplus/constants/GeneratorParam.java → base-springframework/base-springframework-mybatis-plus/src/main/java/com/xxx/base/springframework/mybatisplus/constants/GeneratorParam.java

@@ -1,4 +1,4 @@
-package com.wei.base.springframework.mybatisplus.constants;
+package com.xxx.base.springframework.mybatisplus.constants;
 
 import lombok.Data;
 

base-springframework/base-springframework-mybatis-plus/src/main/java/com/wei/base/springframework/mybatisplus/core/BaseIService.java → base-springframework/base-springframework-mybatis-plus/src/main/java/com/xxx/base/springframework/mybatisplus/core/BaseIService.java

@@ -1,4 +1,4 @@
-package com.wei.base.springframework.mybatisplus.core;
+package com.xxx.base.springframework.mybatisplus.core;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 

base-springframework/base-springframework-mybatis-plus/src/main/java/com/wei/base/springframework/mybatisplus/core/BaseMapper.java → base-springframework/base-springframework-mybatis-plus/src/main/java/com/xxx/base/springframework/mybatisplus/core/BaseMapper.java

@@ -1,4 +1,4 @@
-package com.wei.base.springframework.mybatisplus.core;
+package com.xxx.base.springframework.mybatisplus.core;
 
 import java.util.List;
 

base-springframework/base-springframework-mybatis-plus/src/main/java/com/wei/base/springframework/mybatisplus/core/BaseServiceImpl.java → base-springframework/base-springframework-mybatis-plus/src/main/java/com/xxx/base/springframework/mybatisplus/core/BaseServiceImpl.java

@@ -1,8 +1,8 @@
-package com.wei.base.springframework.mybatisplus.core;
+package com.xxx.base.springframework.mybatisplus.core;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.common.collect.Lists;
-import com.wei.base.springframework.mybatisplus.config.CustomMybatisPlusProperties;
+import com.xxx.base.springframework.mybatisplus.config.CustomMybatisPlusProperties;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import java.util.List;

base-springframework/base-springframework-mybatis-plus/src/main/java/com/wei/base/springframework/mybatisplus/core/injector/CustomSqlInjector.java → base-springframework/base-springframework-mybatis-plus/src/main/java/com/xxx/base/springframework/mybatisplus/core/injector/CustomSqlInjector.java

@@ -1,4 +1,4 @@
-package com.wei.base.springframework.mybatisplus.core.injector;
+package com.xxx.base.springframework.mybatisplus.core.injector;
 
 import com.baomidou.mybatisplus.core.injector.AbstractMethod;
 import com.baomidou.mybatisplus.core.injector.DefaultSqlInjector;

base-springframework/base-springframework-mybatis-plus/src/main/java/com/wei/base/springframework/mybatisplus/env/InitializeCustomConfiguration.java → base-springframework/base-springframework-mybatis-plus/src/main/java/com/xxx/base/springframework/mybatisplus/env/InitializeCustomConfiguration.java

@@ -1,4 +1,4 @@
-package com.wei.base.springframework.mybatisplus.env;
+package com.xxx.base.springframework.mybatisplus.env;
 
 import com.google.common.collect.Lists;
 import org.apache.commons.lang3.StringUtils;

base-springframework/base-springframework-mybatis-plus/src/main/java/com/xxx/base/springframework/mybatisplus/util/PageResult.java

@@ -0,0 +1,54 @@
+package com.xxx.base.springframework.mybatisplus.util;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @description: 封装分页结果集
+ * @author: huzhiwen
+ * @create: 2019-01-26 20:39
+ **/
+@AllArgsConstructor
+@NoArgsConstructor
+@Data
+public class PageResult<T> implements Serializable {
+
+    private static final long serialVersionUID = -244633338430857286L;
+
+//    @ApiModelProperty(value = "要查找第几页", name = "page", dataType = "Integer")
+    private Integer page = 1;
+//    @ApiModelProperty(value = "每页显示多少条", name = "pageSize", dataType = "Integer")
+    private Integer pageSize = 20;
+//    @ApiModelProperty(value = "总页数", name = "totalPage", dataType = "Integer")
+    private Integer totalPage = 0;
+//    @ApiModelProperty(value = "总记录数", name = "totalRows", dataType = "Long")
+    private Long totalRows = 0L;
+//    @ApiModelProperty(value = "结果集", name = "rows", dataType = "List<T>")
+    private List<T> rows;
+
+    public PageResult(IPage<T> page) {
+        setRows(page.getRecords());
+        setTotalRows(page.getTotal());
+        setPage((int) page.getCurrent());
+        setPageSize((int) page.getSize());
+        setTotalPage((int) page.getPages());
+    }
+
+    public PageResult(IPage page, List<T> list) {
+        setRows(list);
+        setTotalRows(page.getTotal());
+        setPage((int) page.getCurrent());
+        setPageSize((int) page.getSize());
+        setTotalPage((int) page.getPages());
+    }
+
+    public PageResult(Integer page, Integer pageSize) {
+        setPage(page);
+        setPageSize(pageSize);
+    }
+}

base-springframework/base-springframework-mybatis-plus/src/main/resources/META-INF/spring.factories

@@ -1,7 +1,7 @@
 org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-  com.wei.base.springframework.mybatisplus.config.MybatisPlusConfig,\
-  com.wei.base.springframework.mybatisplus.core.injector.CustomSqlInjector,\
-  com.wei.base.springframework.mybatisplus.config.CustomMybatisPlusProperties
+  com.xxx.base.springframework.mybatisplus.config.MybatisPlusConfig,\
+  com.xxx.base.springframework.mybatisplus.core.injector.CustomSqlInjector,\
+  com.xxx.base.springframework.mybatisplus.config.CustomMybatisPlusProperties
 
 org.springframework.boot.env.EnvironmentPostProcessor=\
-  com.wei.base.springframework.mybatisplus.env.InitializeCustomConfiguration
+  com.xxx.base.springframework.mybatisplus.env.InitializeCustomConfiguration

base-springframework/base-springframework-mybatis-plus/src/main/resources/application-mybatis-plus.yml

@@ -1,11 +1,6 @@
-#公共配置 减少各个项目中的配置
-spring:
-  datasource:
-    driver-class-name: com.p6spy.engine.spy.P6SpyDriver
-
 mybatis-plus:
   #指明mapper.xml扫描位置(classpath* 代表编译后类文件根目录)
-  mapper-locations: classpath:/mapper/*.xml
+  mapper-locations: classpath:com/xxx/play/modules/**/mapper/mapping/*.xml,classpath:/mappers/*.xml
   batchSize: 500
   global-config:
     #主键类型 0:数据库ID自增, 1:用户输入ID,2:全局唯一ID (数字类型唯一ID), 3:全局唯一ID UUID

base-springframework/base-springframework-mybatis-plus/target/classes/META-INF/spring.factories

@@ -0,0 +1,7 @@
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+  com.xxx.base.springframework.mybatisplus.config.MybatisPlusConfig,\
+  com.xxx.base.springframework.mybatisplus.core.injector.CustomSqlInjector,\
+  com.xxx.base.springframework.mybatisplus.config.CustomMybatisPlusProperties
+
+org.springframework.boot.env.EnvironmentPostProcessor=\
+  com.xxx.base.springframework.mybatisplus.env.InitializeCustomConfiguration

base-springframework/base-springframework-mybatis-plus/target/classes/application-mybatis-plus.yml

@@ -0,0 +1,13 @@
+mybatis-plus:
+  #指明mapper.xml扫描位置(classpath* 代表编译后类文件根目录)
+  mapper-locations: classpath:com/xxx/play/modules/**/mapper/mapping/*.xml,classpath:/mappers/*.xml
+  batchSize: 500
+  global-config:
+    #主键类型 0:数据库ID自增, 1:用户输入ID,2:全局唯一ID (数字类型唯一ID), 3:全局唯一ID UUID
+    id-type: 2
+    #字段策略(拼接sql时用于判断属性值是否拼接) 0:忽略判断,1:非NULL判断,2:非空判断
+    field-strategy: 2
+    #驼峰下划线转换含查询column及返回column(column下划线命名create_time，返回java实体是驼峰命名createTime，开启后自动转换否则保留原样)
+    db-column-underline: true
+    #是否动态刷新mapper
+    refresh-mapper: false

base-springframework/base-springframework-mybatis-plus/target/classes/spy.properties

@@ -0,0 +1,24 @@
+#3.2.1以上使用
+modulelist=com.baomidou.mybatisplus.extension.p6spy.MybatisPlusLogFactory,com.p6spy.engine.outage.P6OutageFactory
+#3.2.1以下使用或者不配置
+#modulelist=com.p6spy.engine.logging.P6LogFactory,com.p6spy.engine.outage.P6OutageFactory
+# 自定义日志打印
+logMessageFormat=com.baomidou.mybatisplus.extension.p6spy.P6SpyLogger
+#日志输出到控制台
+appender=com.baomidou.mybatisplus.extension.p6spy.StdoutLogger
+# 使用日志系统记录 sql
+#appender=com.p6spy.engine.spy.appender.Slf4JLogger
+# 设置 p6spy driver 代理
+deregisterdrivers=true
+# 取消JDBC URL前缀
+useprefix=true
+# 配置记录 Log 例外,可去掉的结果集有error,info,batch,debug,statement,commit,rollback,result,resultset.
+excludecategories=info,debug,result,commit,resultset
+# 日期格式
+dateformat=yyyy-MM-dd HH:mm:ss
+# 实际驱动可多个
+#driverlist=org.h2.Driver
+# 是否开启慢SQL记录
+outagedetection=true
+# 慢SQL记录标准 2 秒
+outagedetectioninterval=2

base-springframework/base-springframework-mybatis-plus/target/classes/templates/controller.java.ftl

@@ -0,0 +1,42 @@
+package ${package.Controller};
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import ${package.Service}.${table.serviceName};
+
+<#if restControllerStyle>
+import org.springframework.web.bind.annotation.RestController;
+<#else>
+import org.springframework.stereotype.Controller;
+</#if>
+<#if superControllerClassPackage??>
+import ${superControllerClassPackage};
+</#if>
+
+/**
+ * <p>
+ * ${table.comment!} 前端控制器
+ * </p>
+ *
+ * @author ${author}
+ * @since ${date}
+ */
+<#if restControllerStyle>
+@RestController
+<#else>
+@Controller
+</#if>
+@RequestMapping("/<#if controllerMappingHyphenStyle??>${controllerMappingHyphen}<#else>${table.entityPath}</#if>")
+<#if kotlin>
+class ${table.controllerName}<#if superControllerClass??> : ${superControllerClass}()</#if>
+<#else>
+<#if superControllerClass??>
+public class ${table.controllerName} extends ${superControllerClass} {
+<#else>
+public class ${table.controllerName} {
+</#if>
+
+	@Autowired
+	private ${table.serviceName} <#if controllerMappingHyphenStyle??>${controllerMappingHyphen}<#else>${table.entityPath}</#if>Service;
+}
+</#if>

base-springframework/base-springframework-mybatis-plus/target/classes/templates/mapstruct.java.ftl

@@ -0,0 +1,14 @@
+package ${cfg.mapstructPageName};
+
+import org.mapstruct.Mapper;
+
+/**
+* ${table.comment!} 服务类型实体转换
+*
+* @author ${author}
+* @since ${date}
+*/
+@Mapper(componentModel = "spring")
+public interface ${entity}Mapstruct {
+
+}

base-springframework/base-springframework-mybatis-plus/target/classes/templates/serviceImpl.java.ftl

@@ -0,0 +1,29 @@
+package ${package.ServiceImpl};
+
+import ${package.Entity}.${entity};
+import ${package.Mapper}.${table.mapperName};
+import ${package.Service}.${table.serviceName};
+import ${superServiceImplClassPackage};
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * ${table.comment!} 服务实现类
+ * </p>
+ *
+ * @author ${author}
+ * @since ${date}
+ */
+@Service
+<#if kotlin>
+open class ${table.serviceImplName} : ${superServiceImplClass}<${table.mapperName}, ${entity}>(), ${table.serviceName} {
+
+}
+<#else>
+public class ${table.serviceImplName} extends ${superServiceImplClass}<${table.mapperName}, ${entity}> implements ${table.serviceName} {
+
+	@Autowired
+	private ${table.mapperName} <#if controllerMappingHyphenStyle??>${controllerMappingHyphen}<#else>${table.entityPath}</#if>Mapper;
+}
+</#if>

base-springframework/base-springframework-mybatis-plus/target/maven-archiver/pom.properties

@@ -0,0 +1,3 @@
+artifactId=base-springframework-mybatis-plus
+groupId=com.xxx
+version=0.0.1-SNAPSHOT

base-springframework/base-springframework-mybatis-plus/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -0,0 +1,9 @@
+com\xxx\base\springframework\mybatisplus\core\BaseServiceImpl.class
+com\xxx\base\springframework\mybatisplus\config\CustomMybatisPlusProperties.class
+com\xxx\base\springframework\mybatisplus\util\PageResult.class
+com\xxx\base\springframework\mybatisplus\constants\GeneratorParam.class
+com\xxx\base\springframework\mybatisplus\env\InitializeCustomConfiguration.class
+com\xxx\base\springframework\mybatisplus\config\MybatisPlusConfig.class
+com\xxx\base\springframework\mybatisplus\core\BaseIService.class
+com\xxx\base\springframework\mybatisplus\core\BaseMapper.class
+com\xxx\base\springframework\mybatisplus\core\injector\CustomSqlInjector.class