redis配置修改

common/pom.xml

@@ -65,6 +65,16 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-redis</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>io.lettuce</groupId>
+                    <artifactId>lettuce-core</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>redis.clients</groupId>
+            <artifactId>jedis</artifactId>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>

common/src/main/java/com/lantone/common/config/SwaggerConfiguration.java

@@ -3,7 +3,6 @@ package com.lantone.common.config;
 import com.lantone.common.domain.SwaggerProperties;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.core.annotation.Order;
 import springfox.documentation.builders.ApiInfoBuilder;
 import springfox.documentation.builders.PathSelectors;
@@ -16,7 +15,6 @@ import springfox.documentation.service.SecurityReference;
 import springfox.documentation.spi.DocumentationType;
 import springfox.documentation.spi.service.contexts.SecurityContext;
 import springfox.documentation.spring.web.plugins.Docket;
-import springfox.documentation.swagger2.annotations.EnableSwagger2;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -26,9 +24,7 @@ import java.util.List;
  * @author: rengb
  * @time: 2021/1/5 18:27
  */
-@Configuration
-@EnableSwagger2
-public class SwaggerConfiguration {
+public class BaseSwaggerConfig {
 
     @Value("${swagger.title}")
     private String swagger_title;

common/src/main/java/com/lantone/common/constant/KeyedNamed.java

@@ -0,0 +1,18 @@
+package com.lantone.common.constant;
+
+/**
+ * @Description: 状态和名字基础接口
+ * @author: gaodm
+ * @time: 2018/9/3 16:13
+ */
+public interface KeyedNamed {
+    /**
+     * 状态值
+     */
+    int getKey();
+
+    /**
+     * 状态描述
+     */
+    String getName();
+}

gateway-service/src/main/resources/bootstrap.yml

@@ -43,7 +43,7 @@ spring:
     host: 192.168.2.236  #Redis服务器地址
     port: 6379 # Redis服务器连接端口(本地环境端口6378，其他环境端口是6379)
     password: lantone # Redis服务器连接密码（默认为空）
-    lettuce:
+    jedis:
       pool:
         max-active: 8 # 连接池最大连接数（使用负值表示没有限制）
         max-idle: 5 # 连接池中的最大空闲连接

security-center/pom.xml

@@ -2,69 +2,21 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
+
     <parent>
         <groupId>com.lantone</groupId>
         <artifactId>emrais</artifactId>
         <version>0.0.1-SNAPSHOT</version>
     </parent>
-    <groupId>com.lantone</groupId>
+
     <artifactId>security-center</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
     <name>security-center</name>
-    <description>Demo project for Spring Boot</description>
-    <properties>
-        <java.version>1.8</java.version>
-        <logstash.version>5.2</logstash.version>
-        <aggregator.version>1.1.0</aggregator.version>
-        <druid.version>1.1.21</druid.version>
-        <easypoi.version>4.2.0</easypoi.version>
-        <spring.starter.config.version>2.2.0.RELEASE</spring.starter.config.version>
-        <netflix.eureka.client.version>2.2.0.RELEASE</netflix.eureka.client.version>
-        <spring-cloud-starter-openfeign.version>2.2.0.RELEASE</spring-cloud-starter-openfeign.version>
-    </properties>
+    <packaging>jar</packaging>
+
     <dependencies>
-        <dependency>
-            <groupId>com.diagbot</groupId>
-            <artifactId>common</artifactId>
-            <version>0.0.1-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>com.lantone</groupId>
-            <artifactId>common</artifactId>
-            <version>0.0.1-SNAPSHOT</version>
-        </dependency>
         <dependency>
             <groupId>com.lantone</groupId>
             <artifactId>dblayer-mbg</artifactId>
-            <version>0.0.1-SNAPSHOT</version>
-        </dependency>
-        <!-- 开启web-->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.springframework.boot</groupId>
-                    <artifactId>spring-boot-starter-tomcat</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-undertow</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-config</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
@@ -74,36 +26,23 @@
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-openfeign</artifactId>
         </dependency>
-
-        <!--security-->
         <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-oauth2</artifactId>
-            <version>2.2.0.RELEASE</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <optional>true</optional>
-        </dependency>
-
-        <dependency>
-            <groupId>net.logstash.logback</groupId>
-            <artifactId>logstash-logback-encoder</artifactId>
-            <version>${logstash.version}</version>
-        </dependency>
-
-        <!--redis设置-->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-redis</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-pool2</artifactId>
+            <groupId>io.github.openfeign</groupId>
+            <artifactId>feign-okhttp</artifactId>
         </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>com.spotify</groupId>
+                <artifactId>docker-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>

security-center/src/main/java/com/lantone/security/config/SwaggerConfig.java

@@ -0,0 +1,16 @@
+package com.lantone.security.config;
+
+import com.lantone.common.config.BaseSwaggerConfig;
+import org.springframework.context.annotation.Configuration;
+import springfox.documentation.swagger2.annotations.EnableSwagger2;
+
+/**
+ * @Description: Swagger相关配置
+ * @author: rengb
+ * @time: 2021/1/5 18:27
+ */
+@Configuration
+@EnableSwagger2
+public class SwaggerConfig extends BaseSwaggerConfig {
+
+}

security-center/src/main/java/com/lantone/security/enums/ConstantEnum.java

@@ -1,6 +1,6 @@
 package com.lantone.security.enums;
 
-import com.diagbot.core.KeyedNamed;
+import com.lantone.common.constant.KeyedNamed;
 import lombok.Setter;
 
 /**
@@ -10,8 +10,8 @@ import lombok.Setter;
  */
 public enum ConstantEnum implements KeyedNamed {
 
-//    INNER_USER(1, "用户-朗通"),
-//    OUTER_USER(0, "用户-客户");
+    //    INNER_USER(1, "用户-朗通"),
+    //    OUTER_USER(0, "用户-客户");
     SUPER_USER(0, "用户-超级管理员");
 
 

security-center/src/main/java/com/lantone/security/enums/IsDeleteEnum.java

@@ -0,0 +1,42 @@
+package com.lantone.security.enums;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description: 是否，例如：是否删除
+ * @author: gaodm
+ * @time: 2018/9/3 16:01
+ */
+public enum IsDeleteEnum {
+
+    Y("Y", "是"),
+    N("N", "否");
+
+    @Getter
+    @Setter
+    private String key;
+
+    @Getter
+    @Setter
+    private String name;
+
+    IsDeleteEnum(String key, String name) {
+        this.key = key;
+        this.name = name;
+    }
+
+    public static IsDeleteEnum getEnum(String key) {
+        for (IsDeleteEnum item : IsDeleteEnum.values()) {
+            if (item.key.equals(key)) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+    public static String getName(String key) {
+        IsDeleteEnum item = getEnum(key);
+        return item != null ? item.name : null;
+    }
+}

security-center/src/main/java/com/lantone/security/enums/MenuTypeEnum.java

@@ -1,6 +1,6 @@
 package com.lantone.security.enums;
 
-import com.diagbot.core.KeyedNamed;
+import com.lantone.common.constant.KeyedNamed;
 import lombok.Setter;
 
 /**

security-center/src/main/java/com/lantone/security/enums/StatusEnum.java

@@ -1,6 +1,6 @@
 package com.lantone.security.enums;
 
-import com.diagbot.core.KeyedNamed;
+import com.lantone.common.constant.KeyedNamed;
 import lombok.Setter;
 
 /**

security-center/src/main/java/com/lantone/security/facade/UserMenuInfoFacade.java

@@ -1,12 +1,12 @@
 package com.lantone.security.facade;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.diagbot.enums.IsDeleteEnum;
 import com.lantone.common.util.ListUtil;
 import com.lantone.dblayermbg.entity.MenuInfo;
 import com.lantone.dblayermbg.service.impl.MenuInfoServiceImpl;
 import com.lantone.security.dto.MenuInfoDTO;
 import com.lantone.security.enums.ConstantEnum;
+import com.lantone.security.enums.IsDeleteEnum;
 import com.lantone.security.enums.StatusEnum;
 import org.springframework.beans.BeanUtils;
 

security-center/src/main/resources/bootstrap.yml

@@ -11,7 +11,7 @@ spring:
     host: 192.168.2.236  #Redis服务器地址
     port: 6379 # Redis服务器连接端口(本地环境端口6378，其他环境端口是6379)
     password: lantone # Redis服务器连接密码（默认为空）
-    lettuce:
+    jedis:
       pool:
         max-active: 8 # 连接池最大连接数（使用负值表示没有限制）
         max-idle: 5 # 连接池中的最大空闲连接

user-auth/src/main/java/com/lantone/userauth/config/SwaggerConfig.java

@@ -0,0 +1,16 @@
+package com.lantone.userauth.config;
+
+import com.lantone.common.config.BaseSwaggerConfig;
+import org.springframework.context.annotation.Configuration;
+import springfox.documentation.swagger2.annotations.EnableSwagger2;
+
+/**
+ * @Description: Swagger相关配置
+ * @author: rengb
+ * @time: 2021/1/5 18:27
+ */
+@Configuration
+@EnableSwagger2
+public class SwaggerConfig extends BaseSwaggerConfig {
+
+}