diff --git a/cds-fontend-2025.V1/.env.dev b/cds-fontend-2025.V1/.env.dev index 558f842..ba14eaa 100644 --- a/cds-fontend-2025.V1/.env.dev +++ b/cds-fontend-2025.V1/.env.dev @@ -6,7 +6,8 @@ VITE_APP_BASE_API=/dev-api # watermark VITE_WATERMARK=Y # 是否开启 SSE 功能 -VITE_APP_SSE=Y +#VITE_APP_SSE=Y +VITE_APP_SSE=N # 是否开启 websocket 功能 VITE_APP_WEBSOCKET=N diff --git a/cds-fontend-2025.V1/public/favicon.png b/cds-fontend-2025.V1/public/favicon.png index 9fff966..b9a6d26 100644 Binary files a/cds-fontend-2025.V1/public/favicon.png and b/cds-fontend-2025.V1/public/favicon.png differ diff --git a/cds-fontend-2025.V1/public/favicon.png.bak.bak b/cds-fontend-2025.V1/public/favicon.png.bak.bak new file mode 100644 index 0000000..9fff966 Binary files /dev/null and b/cds-fontend-2025.V1/public/favicon.png.bak.bak differ diff --git a/cds-fontend-2025.V1/public/logo.png b/cds-fontend-2025.V1/public/logo.png new file mode 100644 index 0000000..b9a6d26 Binary files /dev/null and b/cds-fontend-2025.V1/public/logo.png differ diff --git a/cds-fontend-2025.V1/src/assets/imgs/logo.png b/cds-fontend-2025.V1/src/assets/imgs/logo.png index 629a1e9..b9a6d26 100644 Binary files a/cds-fontend-2025.V1/src/assets/imgs/logo.png and b/cds-fontend-2025.V1/src/assets/imgs/logo.png differ diff --git a/cds-fontend-2025.V1/src/assets/imgs/logo.png.bak b/cds-fontend-2025.V1/src/assets/imgs/logo.png.bak new file mode 100644 index 0000000..629a1e9 Binary files /dev/null and b/cds-fontend-2025.V1/src/assets/imgs/logo.png.bak differ diff --git a/cds-platform-2025.V1/ruoyi-admin/src/main/java/org/dromara/DromaraApplication.java b/cds-platform-2025.V1/ruoyi-admin/src/main/java/org/dromara/DromaraApplication.java index f703fb4..88a7f2c 100644 --- a/cds-platform-2025.V1/ruoyi-admin/src/main/java/org/dromara/DromaraApplication.java +++ b/cds-platform-2025.V1/ruoyi-admin/src/main/java/org/dromara/DromaraApplication.java @@ -1,5 +1,7 @@ package org.dromara; +import org.jasypt.encryption.pbe.PooledPBEStringEncryptor; +import org.jasypt.encryption.pbe.config.SimpleStringPBEConfig; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.context.metrics.buffering.BufferingApplicationStartup; @@ -18,6 +20,32 @@ public class DromaraApplication { application.setApplicationStartup(new BufferingApplicationStartup(2048)); application.run(args); System.out.println("mps started successfully!"); + TEST(); + } + + //方便测试,后续删掉 + public static void TEST() { + PooledPBEStringEncryptor encryptor = new PooledPBEStringEncryptor(); + SimpleStringPBEConfig config = new SimpleStringPBEConfig(); + + // 设置加密密钥(与配置中使用的密钥一致) + config.setPassword("66668888"); // 替换为你的密钥 + // 设置算法 + config.setAlgorithm("PBEWithHMACSHA512AndAES_256"); + config.setKeyObtentionIterations("1000"); + config.setPoolSize("1"); + config.setProviderName("SunJCE"); + config.setSaltGeneratorClassName("org.jasypt.salt.RandomSaltGenerator"); + config.setIvGeneratorClassName("org.jasypt.iv.RandomIvGenerator"); + config.setStringOutputType("base64"); + encryptor.setConfig(config); + + String plainText = "GTsoft+123."; // 替换为你的数据库明文密码 + String encryptedText = encryptor.encrypt(plainText); + System.out.println("Encrypted password: ENC(" + encryptedText + ")"); + + // 如需解密验证,可使用下面一行 + // System.out.println("Decrypted: " + encryptor.decrypt(encryptedText)); } } diff --git a/cds-platform-2025.V1/ruoyi-admin/src/main/resources/application-prod.yml b/cds-platform-2025.V1/ruoyi-admin/src/main/resources/application-prod.yml index 16bee4b..3c1cb1a 100644 --- a/cds-platform-2025.V1/ruoyi-admin/src/main/resources/application-prod.yml +++ b/cds-platform-2025.V1/ruoyi-admin/src/main/resources/application-prod.yml @@ -40,7 +40,8 @@ spring: # 动态数据源文档 https://www.kancloud.cn/tracy5546/dynamic-datasource/content dynamic: # 性能分析插件(有性能损耗 不建议生产环境使用) - p6spy: false + # 投产初期,暂时打开 + p6spy: true # 设置默认的数据源或者数据源组,默认值即为 master primary: master # 严格模式 匹配不到数据源则报错