From 0d9b8104e1db95d46456645b19f3912097d28122 Mon Sep 17 00:00:00 2001
From: xiaocp2009 <39615122+xiaocp2009@users.noreply.github.com>
Date: Fri, 29 Aug 2025 14:32:59 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=88=E6=9C=AC=E8=A7=84=E6=95=B4V3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cds-fontend-2025.V1/.env.prod                 |  3 ++-
 .../layouts/modules/theme-drawer/index.vue    |  4 +--
 .../theme-drawer/modules/config-operation.vue | 17 +++++++++---
 cds-fontend-2025.V1/src/theme/settings.ts     |  4 ++-
 cds-platform-2025.V1/ruoyi-admin/pom.xml      |  4 +--
 .../java/org/dromara/util/JasyptUtil.java     |  4 +--
 .../src/main/resources/application-dev.yml    | 18 +++++++++++--
 .../src/main/resources/application-prod.yml   | 27 +++++++++++++------
 .../src/main/resources/application.yml        | 17 ++----------
 .../ruoyi-modules/ruoyi-generator/pom.xml     |  5 ++--
 .../dromara/system/domain/SysOssConfig.java   |  3 +++
 .../org/dromara/system/domain/SysTenant.java  |  3 +++
 12 files changed, 71 insertions(+), 38 deletions(-)

diff --git a/cds-fontend-2025.V1/.env.prod b/cds-fontend-2025.V1/.env.prod
index e7c508a..006e387 100644
--- a/cds-fontend-2025.V1/.env.prod
+++ b/cds-fontend-2025.V1/.env.prod
@@ -3,7 +3,8 @@ VITE_APP_BASE_API=/prod-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/src/layouts/modules/theme-drawer/index.vue b/cds-fontend-2025.V1/src/layouts/modules/theme-drawer/index.vue
index 3186d1c..8e84718 100644
--- a/cds-fontend-2025.V1/src/layouts/modules/theme-drawer/index.vue
+++ b/cds-fontend-2025.V1/src/layouts/modules/theme-drawer/index.vue
@@ -34,9 +34,9 @@ const appStore = useAppStore();
 <!--      <TableProps />-->
 
       <!--复制及重置-->
-<!--      <template #footer>
+      <template #footer>
         <ConfigOperation />
-      </template>-->
+      </template>
     </NDrawerContent>
   </NDrawer>
 </template>
diff --git a/cds-fontend-2025.V1/src/layouts/modules/theme-drawer/modules/config-operation.vue b/cds-fontend-2025.V1/src/layouts/modules/theme-drawer/modules/config-operation.vue
index f2df602..827c020 100644
--- a/cds-fontend-2025.V1/src/layouts/modules/theme-drawer/modules/config-operation.vue
+++ b/cds-fontend-2025.V1/src/layouts/modules/theme-drawer/modules/config-operation.vue
@@ -31,6 +31,17 @@ function getClipboardText() {
 }
 
 function handleReset() {
+  localStorage.removeItem('themeScheme');
+  localStorage.removeItem('grayscale');
+  localStorage.removeItem('colourWeakness');
+  localStorage.removeItem('primary');
+  localStorage.removeItem('info');
+  localStorage.removeItem('success');
+  localStorage.removeItem('warning');
+  localStorage.removeItem('error');
+  localStorage.removeItem('layout-mode');
+  localStorage.removeItem('inverted');
+
   themeStore.resetStore();
 
   setTimeout(() => {
@@ -48,10 +59,10 @@ onMounted(() => {
 <template>
   <div class="w-full flex justify-between">
     <textarea id="themeConfigCopyTarget" v-model="dataClipboardText" class="absolute opacity-0 -z-1" />
-    <NButton type="error" ghost @click="handleReset">{{ $t('theme.configOperation.resetConfig') }}</NButton>
-    <div ref="domRef" data-clipboard-target="#themeConfigCopyTarget">
+    <NButton  style="display: block; margin: 0 auto;" type="error" ghost @click="handleReset">{{ $t('theme.configOperation.resetConfig') }}</NButton>
+<!--    <div ref="domRef" data-clipboard-target="#themeConfigCopyTarget">
       <NButton type="primary">{{ $t('theme.configOperation.copyConfig') }}</NButton>
-    </div>
+    </div>-->
   </div>
 </template>
 
diff --git a/cds-fontend-2025.V1/src/theme/settings.ts b/cds-fontend-2025.V1/src/theme/settings.ts
index 22aa44e..c338803 100644
--- a/cds-fontend-2025.V1/src/theme/settings.ts
+++ b/cds-fontend-2025.V1/src/theme/settings.ts
@@ -32,7 +32,9 @@ export const themeSettings: App.Theme.ThemeSetting = {
   layout: {
     /*mode: 'vertical',*/
     /*mode: 'horizontal',*/
-    mode: localStorage.getItem('layout-mode') ? localStorage.getItem('layout-mode') : 'vertical',
+    /*mode: localStorage.getItem('layout-mode') ? localStorage.getItem('layout-mode') : 'vertical',*/
+    /*考虑到录入菜单项太多,为便于用户查找,最大化可视角度,默认采用左侧菜单混合模式*/
+    mode: localStorage.getItem('layout-mode') ? localStorage.getItem('layout-mode') : 'vertical-mix',
     scrollMode: 'content',
     reverseHorizontalMix: false
   },
diff --git a/cds-platform-2025.V1/ruoyi-admin/pom.xml b/cds-platform-2025.V1/ruoyi-admin/pom.xml
index 2797b3a..bef6b41 100644
--- a/cds-platform-2025.V1/ruoyi-admin/pom.xml
+++ b/cds-platform-2025.V1/ruoyi-admin/pom.xml
@@ -24,11 +24,11 @@
         </dependency>
 
         <!-- 达梦驱动包 -->
-        <!--<dependency>
+        <dependency>
             <groupId>com.dameng</groupId>
             <artifactId>DmJdbcDriver18</artifactId>
             <version>8.1.2.79</version>
-        </dependency>-->
+        </dependency>
 
 <!--        &lt;!&ndash; mp支持的数据库均支持 只需要增加对应的jdbc依赖即可 &ndash;&gt;-->
 <!--        &lt;!&ndash; Oracle &ndash;&gt;-->
diff --git a/cds-platform-2025.V1/ruoyi-admin/src/main/java/org/dromara/util/JasyptUtil.java b/cds-platform-2025.V1/ruoyi-admin/src/main/java/org/dromara/util/JasyptUtil.java
index 93a5456..942dedc 100644
--- a/cds-platform-2025.V1/ruoyi-admin/src/main/java/org/dromara/util/JasyptUtil.java
+++ b/cds-platform-2025.V1/ruoyi-admin/src/main/java/org/dromara/util/JasyptUtil.java
@@ -13,7 +13,7 @@ public class JasyptUtil {
         PooledPBEStringEncryptor encryptor = new PooledPBEStringEncryptor();
         SimpleStringPBEConfig config = new SimpleStringPBEConfig();
 
-        // 设置加密密钥（与配置中使用的密钥一致）
+        //TODO 加密密钥,注意与tongweb启动参数设置保持一致
         config.setPassword("66668888"); // 替换为你的密钥
         // 设置算法
         config.setAlgorithm("PBEWithHMACSHA512AndAES_256");
@@ -25,7 +25,7 @@ public class JasyptUtil {
         config.setStringOutputType("base64");
         encryptor.setConfig(config);
 
-        String plainText = "123456"; // 替换为你的数据库明文密码
+        String plainText = "GTsoft+123."; // 替换为你的数据库明文密码
         String encryptedText = encryptor.encrypt(plainText);
         System.out.println("Encrypted password: ENC(" + encryptedText + ")");
 
diff --git a/cds-platform-2025.V1/ruoyi-admin/src/main/resources/application-dev.yml b/cds-platform-2025.V1/ruoyi-admin/src/main/resources/application-dev.yml
index f7c9f8f..57e9365 100644
--- a/cds-platform-2025.V1/ruoyi-admin/src/main/resources/application-dev.yml
+++ b/cds-platform-2025.V1/ruoyi-admin/src/main/resources/application-dev.yml
@@ -60,8 +60,8 @@ spring:
           #达梦没有rewriteBatchedStatements属性
           #driver-class-name: dm.jdbc.driver.DmDriver # 达梦驱动类
           #url: jdbc:dm://101.42.2.210:5236??schema=cdsdb&compatibleMode=mysql&characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
-          #username: SYSDBA
-          #password: GTsoft+123.
+          #username: CDSDB
+          #password: ENC(xglMxOJ6z9YyQWL9B7xyC+GCki0GU8lNs+jn4rLHJnWbD7gAlKsu52WkHmy3y119)
 
       #        # 从库数据源
       #        slave:
@@ -285,3 +285,17 @@ justauth:
 mapstruct-plus :
   processor :
     trim-string : true
+
+jasypt:
+  encryptor:
+    # 加密算法，3.0.x版本推荐使用更安全的算法
+    algorithm: PBEWithHMACSHA512AndAES_256
+    # 初始化向量生成器，使用 AES 等算法时需要
+    iv-generator-classname: org.jasypt.iv.RandomIvGenerator
+    # 盐生成器
+    salt-generator-classname: org.jasypt.salt.RandomSaltGenerator
+    # 输出类型
+    string-output-type: base64
+
+    #开发测试使用,上线部署时务必删除
+    password: 66668888
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 4b2a8a8..16bee4b 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
@@ -51,20 +51,20 @@ spring:
           type: ${spring.datasource.type}
 
           ############mysql###############
-          driverClassName: com.mysql.cj.jdbc.Driver
+          #!driverClassName: com.mysql.cj.jdbc.Driver
           # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562
           # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题)
-          url: jdbc:mysql://101.42.2.210:3306/cdsdb?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
-          username: root
+          #!url: jdbc:mysql://101.42.2.210:3306/cdsdb?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
+          #!username: root
           #password: c12321456
-          password: ENC(s/jC75JXj3bcSLJe3+9ML0JhKPEN6iz1U57Q0n4zei0fi/DCNagIX41osRheliDD)
+          #!password: ENC(s/jC75JXj3bcSLJe3+9ML0JhKPEN6iz1U57Q0n4zei0fi/DCNagIX41osRheliDD)
 
           ############dameng###############
           #达梦没有rewriteBatchedStatements属性
-          #driver-class-name: dm.jdbc.driver.DmDriver # 达梦驱动类
-          #url: jdbc:dm://101.42.2.210:5236??schema=cdsdb&compatibleMode=mysql&characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
-          #username: SYSDBA
-          #password: GTsoft+123.
+          driver-class-name: dm.jdbc.driver.DmDriver # 达梦驱动类
+          url: jdbc:dm://101.42.2.210:5236??schema=cdsdb&compatibleMode=mysql&characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+          username: CDSDB
+          password: ENC(xglMxOJ6z9YyQWL9B7xyC+GCki0GU8lNs+jn4rLHJnWbD7gAlKsu52WkHmy3y119)
 
 #        # 从库数据源
 #        slave:
@@ -288,3 +288,14 @@ justauth:
 mapstruct-plus :
   processor :
     trim-string : true
+
+jasypt:
+  encryptor:
+    # 加密算法，3.0.x版本推荐使用更安全的算法
+    algorithm: PBEWithHMACSHA512AndAES_256
+    # 初始化向量生成器，使用 AES 等算法时需要
+    iv-generator-classname: org.jasypt.iv.RandomIvGenerator
+    # 盐生成器
+    salt-generator-classname: org.jasypt.salt.RandomSaltGenerator
+    # 输出类型
+    string-output-type: base64
diff --git a/cds-platform-2025.V1/ruoyi-admin/src/main/resources/application.yml b/cds-platform-2025.V1/ruoyi-admin/src/main/resources/application.yml
index 0ea5a66..c6b8524 100644
--- a/cds-platform-2025.V1/ruoyi-admin/src/main/resources/application.yml
+++ b/cds-platform-2025.V1/ruoyi-admin/src/main/resources/application.yml
@@ -265,7 +265,8 @@ management:
 
 --- # 默认/推荐使用sse推送
 sse:
-  enabled: true
+  #enabled: true
+  enabled: false
   path: /resource/sse
 
 --- # websocket
@@ -293,17 +294,3 @@ warm-flow:
     - 255,205,23
     ## 已办理
     - 157,255,0
-
-jasypt:
-  encryptor:
-    # 加密算法，3.0.x版本推荐使用更安全的算法
-    algorithm: PBEWithHMACSHA512AndAES_256
-    # 初始化向量生成器，使用 AES 等算法时需要
-    iv-generator-classname: org.jasypt.iv.RandomIvGenerator
-    # 盐生成器
-    salt-generator-classname: org.jasypt.salt.RandomSaltGenerator
-    # 输出类型
-    string-output-type: base64
-
-    #开发测试使用,上线部署时务必删除
-    password: 66668888
diff --git a/cds-platform-2025.V1/ruoyi-modules/ruoyi-generator/pom.xml b/cds-platform-2025.V1/ruoyi-modules/ruoyi-generator/pom.xml
index ce1202f..c89492e 100644
--- a/cds-platform-2025.V1/ruoyi-modules/ruoyi-generator/pom.xml
+++ b/cds-platform-2025.V1/ruoyi-modules/ruoyi-generator/pom.xml
@@ -54,6 +54,7 @@
             <version>${anyline.version}</version>
         </dependency>
 
+        <!--mysql-->
         <dependency>
             <groupId>org.anyline</groupId>
             <artifactId>anyline-data-jdbc-mysql</artifactId>
@@ -61,11 +62,11 @@
         </dependency>
 
         <!--达梦-->
-        <!--<dependency>
+        <dependency>
             <groupId>org.anyline</groupId>
             <artifactId>anyline-data-jdbc-dm</artifactId>
             <version>${anyline.version}</version>
-        </dependency>-->
+        </dependency>
 
         <!-- anyline支持100+种类型数据库 添加对应的jdbc依赖与anyline对应数据库依赖包即可 -->
 <!--        <dependency>-->
diff --git a/cds-platform-2025.V1/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysOssConfig.java b/cds-platform-2025.V1/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysOssConfig.java
index 4b67d63..bdc6b63 100644
--- a/cds-platform-2025.V1/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysOssConfig.java
+++ b/cds-platform-2025.V1/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysOssConfig.java
@@ -1,5 +1,6 @@
 package org.dromara.system.domain;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
@@ -55,6 +56,8 @@ public class SysOssConfig extends BaseEntity {
     /**
      * 自定义域名
      */
+    //!!!达梦保留字符
+    @TableField("\"domain\"")
     private String domain;
 
     /**
diff --git a/cds-platform-2025.V1/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysTenant.java b/cds-platform-2025.V1/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysTenant.java
index 9800c30..107fcea 100644
--- a/cds-platform-2025.V1/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysTenant.java
+++ b/cds-platform-2025.V1/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysTenant.java
@@ -1,5 +1,6 @@
 package org.dromara.system.domain;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -62,6 +63,8 @@ public class SysTenant extends BaseEntity {
     /**
      * 域名
      */
+    //!!!达梦保留字符
+    @TableField("\"domain\"")
     private String domain;
 
     /**