配置变更

ygtx-admin/src/main/java/com/ygtx/web/controller/system/SysLoginController.java

@@ -1,10 +1,13 @@
 package com.ygtx.web.controller.system;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
+import com.ygtx.common.core.domain.entity.SysRole;
 import com.ygtx.system.domain.SysOperLog;
 import com.ygtx.system.domain.SysPost;
 import com.ygtx.system.service.ISysPostService;
+import org.apache.catalina.Role;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -151,9 +154,12 @@ public class SysLoginController
             tokenService.refreshToken(loginUser);
         }
         int postType = postService.getHomePostType(user.getUserId());
+        String roleNames = user.getRoles().stream().map(SysRole::getRoleName)
+                .collect(Collectors.joining(","));
         AjaxResult ajax = AjaxResult.success();
         ajax.put("user", user);
         ajax.put("roles", roles);
+        ajax.put("roleNames", roleNames);
         ajax.put("postType", postType);
         ajax.put("permissions", permissions);
         ajax.put("isDefaultModifyPwd", initPasswordIsModify(user.getPwdUpdateDate()));

ygtx-admin/src/main/resources/application-gxt.yml

@@ -10,9 +10,9 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://192.168.254.253:9906/ygtx_gxt_demo?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://127.0.0.1:3306/gxt?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: root
-                password: 11rrRRvv90)*9&FuuI}{
+                password: 1qaz@WSX
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭
@@ -22,9 +22,9 @@ spring:
                 password:
             # 源数据库数据源（用于设备同步）
             source:
-                url: jdbc:mysql://192.168.254.253:9906/equipment_source?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-                username: root
-                password: 11rrRRvv90)*9&FuuI}{
+                url: jdbc:mysql://rm-9yxz7k1i8wqhhlj2s.mysql.rds.ops.lysjfw.chnenergy.com.cn:3306/work_order?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                username: admin01
+                password: Clypg!@#45678
                 initialSize: 5
                 minIdle: 5
                 maxActive: 20
@@ -82,7 +82,7 @@ spring:
         # 数据库索引
         database: 0
         # 密码
-        password:
+        password: 1qaz@WSX
         # 连接超时时间
         timeout: 10s
         lettuce:

ygtx-admin/src/main/resources/application-test.yml

@@ -0,0 +1,104 @@
+server:
+    # 服务器的HTTP端口，默认为8080
+    port: 8089
+
+# 数据源配置
+spring:
+    datasource:
+        type: com.alibaba.druid.pool.DruidDataSource
+        driverClassName: com.mysql.cj.jdbc.Driver
+        druid:
+            # 主库数据源
+            master:
+                url: jdbc:mysql://192.168.254.253:9906/ygtx_gxt_demo?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                username: root
+                password: 11rrRRvv90)*9&FuuI}{
+            # 从库数据源
+            slave:
+                # 从数据源开关/默认关闭
+                enabled: false
+                url:
+                username:
+                password:
+            # 源数据库数据源（用于设备同步）
+            source:
+                url: jdbc:mysql://192.168.254.253:9906/equipment_source?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                username: root
+                password: 11rrRRvv90)*9&FuuI}{
+                initialSize: 5
+                minIdle: 5
+                maxActive: 20
+                maxWait: 60000
+            # 初始连接数
+            initialSize: 5
+            # 最小连接池数量
+            minIdle: 10
+            # 最大连接池数量
+            maxActive: 20
+            # 配置获取连接等待超时的时间
+            maxWait: 60000
+            # 配置连接超时时间
+            connectTimeout: 30000
+            # 配置网络超时时间
+            socketTimeout: 60000
+            # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+            timeBetweenEvictionRunsMillis: 60000
+            # 配置一个连接在池中最小生存的时间，单位是毫秒
+            minEvictableIdleTimeMillis: 300000
+            # 配置一个连接在池中最大生存的时间，单位是毫秒
+            maxEvictableIdleTimeMillis: 900000
+            # 配置检测连接是否有效
+            validationQuery: SELECT 1 FROM DUAL
+            testWhileIdle: true
+            testOnBorrow: false
+            testOnReturn: false
+            webStatFilter:
+                enabled: true
+            statViewServlet:
+                enabled: true
+                # 设置白名单，不填则允许所有访问
+                allow:
+                url-pattern: /druid/*
+                # 控制台管理用户名和密码
+                login-username: ruoyi
+                login-password: 123456
+            filter:
+                stat:
+                    enabled: true
+                    # 慢SQL记录
+                    log-slow-sql: true
+                    slow-sql-millis: 1000
+                    merge-sql: true
+                wall:
+                    config:
+                        multi-statement-allow: true
+
+    # redis 配置
+    redis:
+        # 地址
+        host: localhost
+        # 端口，默认为6379
+        port: 6379
+        # 数据库索引
+        database: 0
+        # 密码
+        password:
+        # 连接超时时间
+        timeout: 10s
+        lettuce:
+            pool:
+                # 连接池中的最小空闲连接
+                min-idle: 0
+                # 连接池中的最大空闲连接
+                max-idle: 8
+                # 连接池的最大数据库连接数
+                max-active: 8
+                # #连接池最大阻塞等待时间（使用负值表示没有限制）
+                max-wait: -1ms
+
+minio:
+    #http://175.42.33.78:39105 , minioadmin:minioadmin
+    url: http://175.42.33.78:9000
+    accessKey: RmwV1j9pMm6d9j3gZOHq
+    secretKey: 9d9b93xvmZMFs2Rvlc0NipqD1tHmxkYCtkxQTzcb
+    bucketName: emcs

ygtx-admin/src/main/resources/application.yml

@@ -6,8 +6,7 @@ ygtx:
   version: 3.9.0
   # 版权年份
   copyrightYear: 2025
-  # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
-  profile: D:/ruoyi/uploadPath
+  profile: /home/gxt/uploadPath
   # 获取ip地址开关
   addressEnabled: false
   # 验证码类型 math 数字计算 char 字符验证

ygtx-admin/src/main/resources/logback.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
     <!-- 日志存放路径 -->
-	<property name="log.path" value="/home/ruoyi/logs" />
+	<property name="log.path" value="/home/gxt/logs" />
     <!-- 日志输出格式 -->
 	<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
 
@@ -11,7 +11,7 @@
 			<pattern>${log.pattern}</pattern>
 		</encoder>
 	</appender>
-	
+
 	<!-- 系统日志输出 -->
 	<appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
 	    <file>${log.path}/sys-info.log</file>
@@ -34,7 +34,7 @@
             <onMismatch>DENY</onMismatch>
         </filter>
 	</appender>
-	
+
 	<appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
 	    <file>${log.path}/sys-error.log</file>
         <!-- 循环政策：基于时间创建日志文件 -->
@@ -56,7 +56,7 @@
             <onMismatch>DENY</onMismatch>
         </filter>
     </appender>
-	
+
 	<!-- 用户访问日志输出  -->
     <appender name="sys-user" class="ch.qos.logback.core.rolling.RollingFileAppender">
 		<file>${log.path}/sys-user.log</file>
@@ -70,7 +70,7 @@
             <pattern>${log.pattern}</pattern>
         </encoder>
     </appender>
-	
+
 	<!-- 系统模块日志级别控制  -->
 	<logger name="com.ygtx" level="info" />
 	<!-- Spring日志级别控制  -->
@@ -79,15 +79,15 @@
 	<root level="info">
 		<appender-ref ref="console" />
 	</root>
-	
+
 	<!--系统操作日志-->
     <root level="info">
         <appender-ref ref="file_info" />
         <appender-ref ref="file_error" />
     </root>
-	
+
 	<!--系统用户操作日志-->
     <logger name="sys-user" level="info">
         <appender-ref ref="sys-user"/>
     </logger>
-</configuration> 
+</configuration>

ygtx-gxt/src/main/java/com/ygtx/gxt/controller/GxtFanInspectionScoreController.java

@@ -25,7 +25,7 @@ import com.ygtx.common.core.page.TableDataInfo;
 
 /**
  * 风机类型检查分值Controller
- * 
+ *
  * @author ruoyi
  * @date 2025-11-06
  */
@@ -35,7 +35,7 @@ public class GxtFanInspectionScoreController extends BaseController
 {
     @Autowired
     private IGxtFanInspectionScoreService gxtFanInspectionScoreService;
-    
+
     @Autowired
     private IGxtEquipmentService gxtEquipmentService;
 
@@ -106,7 +106,7 @@ public class GxtFanInspectionScoreController extends BaseController
     {
         return toAjax(gxtFanInspectionScoreService.deleteGxtFanInspectionScoreByIds(ids));
     }
-    
+
     /**
      * 获取所有风机类型列表（去重）
      */
@@ -116,7 +116,7 @@ public class GxtFanInspectionScoreController extends BaseController
         List<String> list = gxtEquipmentService.selectAllModels();
         return AjaxResult.success(list);
     }
-    
+
     /**
      * 根据风机类型查询检查类型列表
      */
@@ -126,4 +126,4 @@ public class GxtFanInspectionScoreController extends BaseController
         List<GxtFanInspectionScore> list = gxtFanInspectionScoreService.selectGxtFanInspectionScoreByFanType(fanType);
         return AjaxResult.success(list);
     }
-}
+}

ygtx-ui/src/views/login.vue

@@ -97,7 +97,7 @@ const loginRules = {
 const codeUrl = ref("")
 const loading = ref(false)
 // 验证码开关
-const captchaEnabled = ref(true)
+const captchaEnabled = ref(false)
 // 注册开关
 const register = ref(false)
 const redirect = ref(undefined)