增加短信登录

huimv-employment/fe-api/pom.xml

@@ -34,6 +34,10 @@
             <groupId>com.github.xiaoymin</groupId>
             <artifactId>knife4j-openapi3-spring-boot-starter</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>druid-spring-boot-starter</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>

huimv-employment/fe-api/src/main/java/com/huimv/employment/config/DecryptRedisPasswordEnvironmentPostProcessor.java

@@ -0,0 +1,61 @@
+package com.huimv.employment.config;
+
+import com.alibaba.druid.filter.config.ConfigTools;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.env.EnvironmentPostProcessor;
+import org.springframework.core.Ordered;
+import org.springframework.core.env.ConfigurableEnvironment;
+import org.springframework.core.env.MapPropertySource;
+import org.springframework.util.StringUtils;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 使用 Druid {@link ConfigTools} 与 {@code spring.datasource.druid.public-key} 解密 Redis 密码。
+ * <p>MySQL 密码由 Druid ConfigFilter 在连接池层解密；Redis 需在此提前写入明文到 Environment。</p>
+ */
+public class DecryptRedisPasswordEnvironmentPostProcessor implements EnvironmentPostProcessor, Ordered {
+
+    private static final String PUBLIC_KEY = "spring.datasource.druid.public-key";
+    private static final String PUBLIC_KEY_ALT = "spring.datasource.druid.publickey";
+    private static final String REDIS_PASSWORD = "spring.redis.password";
+
+    @Override
+    public void postProcessEnvironment(ConfigurableEnvironment environment, SpringApplication application) {
+        String publicKey = resolvePublicKey(environment);
+        if (!StringUtils.hasText(publicKey)) {
+            return;
+        }
+
+        Map<String, Object> properties = new HashMap<>(4);
+        properties.put(PUBLIC_KEY, publicKey);
+        properties.put(PUBLIC_KEY_ALT, publicKey);
+
+        String encryptedPassword = environment.getProperty(REDIS_PASSWORD);
+        if (StringUtils.hasText(encryptedPassword)) {
+            try {
+                properties.put(REDIS_PASSWORD, ConfigTools.decrypt(publicKey, encryptedPassword));
+            } catch (Exception ex) {
+                throw new IllegalStateException("Redis 密码解密失败，请检查 public-key 与密文是否匹配", ex);
+            }
+        }
+
+        environment.getPropertySources().addFirst(
+                new MapPropertySource("decryptedDruidAndRedisPassword", properties));
+    }
+
+    private static String resolvePublicKey(ConfigurableEnvironment environment) {
+        String publicKey = environment.getProperty(PUBLIC_KEY);
+        if (StringUtils.hasText(publicKey)) {
+            return publicKey;
+        }
+        return environment.getProperty(PUBLIC_KEY_ALT);
+    }
+
+    @Override
+    public int getOrder() {
+        // 须在 ConfigDataEnvironmentPostProcessor 加载完 application-{profile}.yml 之后再解密
+        return Ordered.LOWEST_PRECEDENCE;
+    }
+}

huimv-employment/fe-api/src/main/java/com/huimv/employment/config/WebMvcConfig.java

@@ -0,0 +1,21 @@
+package com.huimv.employment.config;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+/**
+ * Web MVC 配置。
+ */
+@Configuration
+public class WebMvcConfig implements WebMvcConfigurer {
+
+    /**
+     * 将原生 Swagger UI 重定向到 Knife4j 文档页，避免两个入口并存。
+     */
+    @Override
+    public void addViewControllers(ViewControllerRegistry registry) {
+        registry.addRedirectViewController("/swagger-ui.html", "/doc.html");
+        registry.addRedirectViewController("/swagger-ui/index.html", "/doc.html");
+    }
+}

huimv-employment/fe-api/src/main/resources/META-INF/spring.factories

@@ -0,0 +1,2 @@
+org.springframework.boot.env.EnvironmentPostProcessor=\
+com.huimv.employment.config.DecryptRedisPasswordEnvironmentPostProcessor

huimv-employment/fe-api/src/main/resources/application-dev.yml

@@ -1,4 +1,9 @@
 # 接入 MySQL / Redis 时启用：spring.profiles.active=dev
+#
+# 密码为 Druid ConfigTools RSA 加密密文，启动时需传入公钥解密，例如：
+#   java -jar fe-api.jar --spring.datasource.druid.publickey=你的公钥
+# 或在 IDE 运行配置 VM/Program arguments 中添加上述参数。
+# 生成新密文：fe-dao 模块运行 com.huimv.employment.dao.tools.DruidConfigToolsMain
 
 spring:
   datasource:
@@ -6,12 +11,17 @@ spring:
     driver-class-name: com.mysql.cj.jdbc.Driver
     url: jdbc:mysql://122.112.224.199:3306/fe_employment_db?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true
     username: root
-    password: hm123456
+    password: "XyoGR4b1ODP+h3hjFieKZrO1VoHhpryX+rRbM4qbQChDnn7whnEJdAPjfBPqKBgsbbhfZR136+nG7y89I+H+UQ=="
+    druid:
+      filter:
+        config:
+          enabled: true
+      connection-properties: config.decrypt=true;config.decrypt.key=${spring.datasource.druid.public-key:}
   redis:
     host: 122.112.224.199
     port: 6379
     database: 0
-    password: hm123456
+    password: "XyoGR4b1ODP+h3hjFieKZrO1VoHhpryX+rRbM4qbQChDnn7whnEJdAPjfBPqKBgsbbhfZR136+nG7y89I+H+UQ=="
     timeout: 3000ms
     lettuce:
       pool:

huimv-employment/fe-api/src/main/resources/application.yml

@@ -15,7 +15,9 @@ springdoc:
   api-docs:
     enabled: true
   swagger-ui:
-    enabled: false
+    # Knife4j 依赖 /v3/api-docs/swagger-config，须保持 enabled=true
+    enabled: true
+    path: /swagger-ui.html
 
 knife4j:
   enable: true

huimv-employment/fe-dao/src/test/java/com/huimv/employment/dao/tools/DruidConfigToolsMain.java

@@ -0,0 +1,22 @@
+package com.huimv.employment.dao.tools;
+
+import com.alibaba.druid.filter.config.ConfigTools;
+
+/**
+ * 本地生成 Druid RSA 密钥对及加密密码，运行后用于 application-dev.yml 配置。
+ */
+public class DruidConfigToolsMain {
+
+    public static void main(String[] args) throws Exception {
+        String plainPassword = args.length > 0 ? args[0] : "hm123456";
+        String[] keyPair = ConfigTools.genKeyPair(512);
+        String privateKey = keyPair[0];
+        String publicKey = keyPair[1];
+        String encrypted = ConfigTools.encrypt(privateKey, plainPassword);
+
+        System.out.println("plain=" + plainPassword);
+        System.out.println("publicKey=" + publicKey);
+        System.out.println("encrypted=" + encrypted);
+        System.out.println("verify=" + ConfigTools.decrypt(publicKey, encrypted));
+    }
+}