Pre Merge pull request !405 from 柳翼/master

bin/clean.bat

@@ -1,6 +1,6 @@
 @echo off
 echo.
-echo [信息] 清理工程target生成路径。
+echo [信息] 清理工程target生成路径。
 echo.
 
 %~d0

docker/copy.ps1

@@ -0,0 +1,45 @@
+#!/usr/bin/env pwsh
+
+<#
+.SYNOPSIS
+复制项目的文件到对应docker路径，便于一键生成镜像。
+#>
+
+# 复制SQL文件
+Write-Host "begin copy sql"
+Copy-Item -Path "../sql/ry_20250425.sql" -Destination "./mysql/db" -Force
+Copy-Item -Path "../sql/ry_config_20250224.sql" -Destination "./mysql/db" -Force
+
+# 复制HTML文件
+Write-Host "begin copy html"
+if (Test-Path "../ruoyi-ui/dist") {
+    Remove-Item -Path "./nginx/html/dist" -Recurse -Force -ErrorAction SilentlyContinue
+    New-Item -ItemType Directory -Path "./nginx/html/dist" -Force | Out-Null
+    Copy-Item -Path "../ruoyi-ui/dist/*" -Destination "./nginx/html/dist" -Recurse -Force
+} else {
+    Write-Host "Warning: ../ruoyi-ui/dist directory not found"
+}
+
+# 复制JAR文件
+Write-Host "begin copy ruoyi-gateway"
+Copy-Item -Path "../ruoyi-gateway/target/ruoyi-gateway.jar" -Destination "./ruoyi/gateway/jar" -Force
+
+Write-Host "begin copy ruoyi-auth"
+Copy-Item -Path "../ruoyi-auth/target/ruoyi-auth.jar" -Destination "./ruoyi/auth/jar" -Force
+
+Write-Host "begin copy ruoyi-visual"
+Copy-Item -Path "../ruoyi-visual/ruoyi-monitor/target/ruoyi-visual-monitor.jar" -Destination "./ruoyi/visual/monitor/jar" -Force
+
+Write-Host "begin copy ruoyi-modules-system"
+Copy-Item -Path "../ruoyi-modules/ruoyi-system/target/ruoyi-modules-system.jar" -Destination "./ruoyi/modules/system/jar" -Force
+
+Write-Host "begin copy ruoyi-modules-file"
+Copy-Item -Path "../ruoyi-modules/ruoyi-file/target/ruoyi-modules-file.jar" -Destination "./ruoyi/modules/file/jar" -Force
+
+Write-Host "begin copy ruoyi-modules-job"
+Copy-Item -Path "../ruoyi-modules/ruoyi-job/target/ruoyi-modules-job.jar" -Destination "./ruoyi/modules/job/jar" -Force
+
+Write-Host "begin copy ruoyi-modules-gen"
+Copy-Item -Path "../ruoyi-modules/ruoyi-gen/target/ruoyi-modules-gen.jar" -Destination "./ruoyi/modules/gen/jar" -Force
+
+Write-Host "copy completed"

docker/docker-compose.yml

@@ -2,7 +2,6 @@ version : '3.8'
 services:
   ruoyi-nacos:
     container_name: ruoyi-nacos
-    image: nacos/nacos-server
     build:
       context: ./nacos
     environment:
@@ -18,7 +17,6 @@ services:
       - ruoyi-mysql
   ruoyi-mysql:
     container_name: ruoyi-mysql
-    image: mysql:5.7
     build:
       context: ./mysql
     ports:
@@ -40,7 +38,6 @@ services:
       MYSQL_ROOT_PASSWORD: password
   ruoyi-redis:
     container_name: ruoyi-redis
-    image: redis
     build:
       context: ./redis
     ports:

docker/mysql/Dockerfile

@@ -1,7 +1,7 @@
-# 基础镜像
-FROM mysql:5.7
-# author
-MAINTAINER ruoyi
-
-# 执行sql脚本
-ADD ./db/*.sql /docker-entrypoint-initdb.d/
+# 基础镜像
+FROM mysql:5.7
+# author
+MAINTAINER ruoyi
+
+# 执行sql脚本
+ADD ./db/*.sql /docker-entrypoint-initdb.d/

docker/mysql/db/readme.txt

@@ -1 +1 @@
-存放sql目录下的所有脚本，用于docker自动执行。
+存放sql目录下的所有脚本，用于docker自动执行。

docker/nginx/html/dist/readme.txt

@@ -1 +0,0 @@
-存放前端ruoyi-ui构建好的静态文件，用于nginx请求访问。

docker/ruoyi/auth/jar/readme.txt

@@ -1 +1 @@
-存放认证中心打包好的jar文件，用于docker启动应用。
+存放认证中心打包好的jar文件，用于docker启动应用。

docker/ruoyi/gateway/jar/readme.txt

@@ -1 +1 @@
-存放网关模块打包好的jar文件，用于docker启动应用。
+存放网关模块打包好的jar文件，用于docker启动应用。

docker/ruoyi/visual/monitor/jar/readme.txt

@@ -1 +1 @@
-存放监控中心打包好的jar文件，用于docker启动应用。
+存放监控中心打包好的jar文件，用于docker启动应用。

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java

@@ -76,6 +76,15 @@ public interface SysUserMapper
      */
     public int updateUserAvatar(@Param("userId") Long userId, @Param("avatar") String avatar);
 
+    /**
+     * 修改用户状态
+     * 
+     * @param userId 用户ID
+     * @param status 状态
+     * @return 结果
+     */
+    public int updateUserStatus(@Param("userId") Long userId, @Param("status") String status);
+
     /**
      * 更新用户登录信息（IP和登录时间）
      * 

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

@@ -326,7 +326,7 @@ public class SysUserServiceImpl implements ISysUserService
     @Override
     public int updateUserStatus(SysUser user)
     {
-        return userMapper.updateUser(user);
+        return userMapper.updateUserStatus(user.getUserId(), user.getStatus());
     }
 
     /**
@@ -374,7 +374,7 @@ public class SysUserServiceImpl implements ISysUserService
     @Override
     public int resetPwd(SysUser user)
     {
-        return userMapper.updateUser(user);
+        return userMapper.resetUserPwd(user.getUserId(), user.getPassword());
     }
 
     /**
@@ -528,6 +528,7 @@ public class SysUserServiceImpl implements ISysUserService
                     checkUserDataScope(u.getUserId());
                     deptService.checkDeptDataScope(user.getDeptId());
                     user.setUserId(u.getUserId());
+                    user.setDeptId(u.getDeptId());
                     user.setUpdateBy(operName);
                     userMapper.updateUser(user);
                     successNum++;

ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -198,11 +198,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</update>
 	
 	<update id="updateUserStatus" parameterType="SysUser">
- 		update sys_user set status = #{status} where user_id = #{userId}
+ 		update sys_user set status = #{status}, update_time = sysdate() where user_id = #{userId}
 	</update>
 	
 	<update id="updateUserAvatar" parameterType="SysUser">
- 		update sys_user set avatar = #{avatar} where user_id = #{userId}
+ 		update sys_user set avatar = #{avatar}, update_time = sysdate() where user_id = #{userId}
 	</update>
 	
   	<update id="updateLoginInfo" parameterType="SysUser">
@@ -210,7 +210,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</update>
 	
 	<update id="resetUserPwd" parameterType="SysUser">
- 		update sys_user set pwd_update_date = sysdate(), password = #{password} where user_id = #{userId}
+ 		update sys_user set pwd_update_date = sysdate(), password = #{password}, update_time = sysdate() where user_id = #{userId}
 	</update>
 	
 	<delete id="deleteUserById" parameterType="Long">