From 4d99b3597277e8ddf69718c75968436f1bbed652 Mon Sep 17 00:00:00 2001
From: 15815213711 <a13118667520@163.com>
Date: 星期二, 29 七月 2025 11:12:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into yagwly_fa_master
---
admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java | 3 +++
common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java | 4 ++++
ui/admin-ui3/src/views/system/user/profile/resetPwd.vue | 4 ++--
common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java | 4 ++++
admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java | 6 ++++--
quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java | 4 ++++
quartz/src/main/java/com/ruoyi/quartz/domain/SysJobLog.java | 4 ++++
system/src/main/java/com/ruoyi/system/domain/SysOperLog.java | 4 ++++
system/src/main/java/com/ruoyi/system/domain/SysPost.java | 3 +++
ui/admin-ui3/src/api/system/user.ts | 2 +-
system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java | 4 ++++
common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java | 4 ++++
system/src/main/java/com/ruoyi/system/domain/SysConfig.java | 4 ++++
common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java | 4 ++++
system/src/main/java/com/ruoyi/system/domain/SysSerialNumber.java | 4 +++-
15 files changed, 52 insertions(+), 6 deletions(-)
diff --git a/admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java b/admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java
index 41b7621..715ed62 100644
--- a/admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java
+++ b/admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java
@@ -1,6 +1,8 @@
package com.ruoyi.web.controller.system;
import java.util.Map;
+
+import com.ruoyi.common.utils.Sm4Utils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
@@ -90,8 +92,8 @@
@PutMapping("/updatePwd")
public AjaxResult updatePwd(@RequestBody Map<String, String> params)
{
- String oldPassword = params.get("oldPassword");
- String newPassword = params.get("newPassword");
+ String oldPassword =Sm4Utils.decryptSm4(params.get("oldPassword")) ;
+ String newPassword =Sm4Utils.decryptSm4(params.get("newPassword")) ;
LoginUser loginUser = getLoginUser();
String userName = loginUser.getUsername();
String password = loginUser.getPassword();
diff --git a/admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
index c0b00d0..c4d657b 100644
--- a/admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
+++ b/admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
@@ -3,6 +3,8 @@
import java.util.List;
import java.util.stream.Collectors;
import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.common.utils.Sm4Utils;
import org.apache.commons.lang3.ArrayUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -196,6 +198,7 @@
{
userService.checkUserAllowed(user);
userService.checkUserDataScope(user.getUserId());
+ user.setPassword(Sm4Utils.decryptSm4(user.getPassword())) ;
user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
user.setUpdateBy(getUsername());
return toAjax(userService.resetPwd(user));
diff --git a/common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java b/common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java
index 738f12c..c0a23cb 100644
--- a/common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java
+++ b/common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java
@@ -2,6 +2,9 @@
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
@@ -19,6 +22,7 @@
private static final long serialVersionUID = 1L;
/** 瀛楀吀缂栫爜 */
+ @TableId(value = "dict_code", type = IdType.AUTO)
@Excel(name = "瀛楀吀缂栫爜", cellType = ColumnType.NUMERIC)
private Long dictCode;
diff --git a/common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java b/common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java
index e324fcf..64f8e1f 100644
--- a/common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java
+++ b/common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java
@@ -3,6 +3,9 @@
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Pattern;
import javax.validation.constraints.Size;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
@@ -20,6 +23,7 @@
/** 瀛楀吀涓婚敭 */
@Excel(name = "瀛楀吀涓婚敭", cellType = ColumnType.NUMERIC)
+ @TableId(value = "dict_id", type = IdType.AUTO)
private Long dictId;
/** 瀛楀吀鍚嶇О */
diff --git a/common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java b/common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java
index 488d49c..87c7821 100644
--- a/common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java
+++ b/common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java
@@ -4,6 +4,9 @@
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
@@ -21,6 +24,7 @@
/** 瑙掕壊ID */
@Excel(name = "瑙掕壊搴忓彿", cellType = ColumnType.NUMERIC)
+ @TableId(value = "role_id", type = IdType.AUTO)
private Long roleId;
/** 瑙掕壊鍚嶇О */
diff --git a/common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java b/common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
index d169139..24ba924 100644
--- a/common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
+++ b/common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
@@ -3,6 +3,9 @@
import java.util.Date;
import java.util.List;
import javax.validation.constraints.*;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
@@ -23,6 +26,7 @@
/** 鐢ㄦ埛ID */
@Excel(name = "鐢ㄦ埛搴忓彿", type = Type.EXPORT, cellType = ColumnType.NUMERIC, prompt = "鐢ㄦ埛缂栧彿")
+ @TableId(value = "user_id", type = IdType.AUTO)
private Long userId;
/** 閮ㄩ棬ID */
diff --git a/quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java b/quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java
index 1f49695..e96d709 100644
--- a/quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java
+++ b/quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java
@@ -3,6 +3,9 @@
import java.util.Date;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.fasterxml.jackson.annotation.JsonFormat;
@@ -24,6 +27,7 @@
/** 浠诲姟ID */
@Excel(name = "浠诲姟搴忓彿", cellType = ColumnType.NUMERIC)
+ @TableId(value = "job_id", type = IdType.AUTO)
private Long jobId;
/** 浠诲姟鍚嶇О */
diff --git a/quartz/src/main/java/com/ruoyi/quartz/domain/SysJobLog.java b/quartz/src/main/java/com/ruoyi/quartz/domain/SysJobLog.java
index 121c035..347c5a2 100644
--- a/quartz/src/main/java/com/ruoyi/quartz/domain/SysJobLog.java
+++ b/quartz/src/main/java/com/ruoyi/quartz/domain/SysJobLog.java
@@ -1,6 +1,9 @@
package com.ruoyi.quartz.domain;
import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
@@ -17,6 +20,7 @@
/** ID */
@Excel(name = "鏃ュ織搴忓彿")
+ @TableId(value = "job_log_id", type = IdType.AUTO)
private Long jobLogId;
/** 浠诲姟鍚嶇О */
diff --git a/system/src/main/java/com/ruoyi/system/domain/SysConfig.java b/system/src/main/java/com/ruoyi/system/domain/SysConfig.java
index c54678c..c2cdaef 100644
--- a/system/src/main/java/com/ruoyi/system/domain/SysConfig.java
+++ b/system/src/main/java/com/ruoyi/system/domain/SysConfig.java
@@ -2,6 +2,9 @@
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
@@ -18,6 +21,7 @@
private static final long serialVersionUID = 1L;
/** 鍙傛暟涓婚敭 */
+ @TableId(value = "config_id", type = IdType.AUTO)
@Excel(name = "鍙傛暟涓婚敭", cellType = ColumnType.NUMERIC)
private Long configId;
diff --git a/system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java b/system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java
index 7fdea30..de24af1 100644
--- a/system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java
+++ b/system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java
@@ -1,6 +1,9 @@
package com.ruoyi.system.domain;
import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.annotation.Excel.ColumnType;
@@ -17,6 +20,7 @@
/** ID */
@Excel(name = "搴忓彿", cellType = ColumnType.NUMERIC)
+ @TableId(value = "info_id", type = IdType.AUTO)
private Long infoId;
/** 鐢ㄦ埛璐﹀彿 */
diff --git a/system/src/main/java/com/ruoyi/system/domain/SysOperLog.java b/system/src/main/java/com/ruoyi/system/domain/SysOperLog.java
index f6761df..c8d015b 100644
--- a/system/src/main/java/com/ruoyi/system/domain/SysOperLog.java
+++ b/system/src/main/java/com/ruoyi/system/domain/SysOperLog.java
@@ -1,6 +1,9 @@
package com.ruoyi.system.domain;
import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.annotation.Excel.ColumnType;
@@ -17,6 +20,7 @@
/** 鏃ュ織涓婚敭 */
@Excel(name = "鎿嶄綔搴忓彿", cellType = ColumnType.NUMERIC)
+ @TableId(value = "oper_id", type = IdType.AUTO)
private Long operId;
/** 鎿嶄綔妯″潡 */
diff --git a/system/src/main/java/com/ruoyi/system/domain/SysPost.java b/system/src/main/java/com/ruoyi/system/domain/SysPost.java
index d43be65..e755324 100644
--- a/system/src/main/java/com/ruoyi/system/domain/SysPost.java
+++ b/system/src/main/java/com/ruoyi/system/domain/SysPost.java
@@ -4,7 +4,9 @@
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size;
+import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
@@ -22,6 +24,7 @@
/** 宀椾綅搴忓彿 */
@Excel(name = "宀椾綅搴忓彿", cellType = ColumnType.NUMERIC)
+ @TableId(value = "post_id", type = IdType.AUTO)
private Long postId;
/** 宀椾綅缂栫爜 */
diff --git a/system/src/main/java/com/ruoyi/system/domain/SysSerialNumber.java b/system/src/main/java/com/ruoyi/system/domain/SysSerialNumber.java
index 125743a..b8760c5 100644
--- a/system/src/main/java/com/ruoyi/system/domain/SysSerialNumber.java
+++ b/system/src/main/java/com/ruoyi/system/domain/SysSerialNumber.java
@@ -1,5 +1,7 @@
package com.ruoyi.system.domain;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
import com.ruoyi.common.annotation.Excel;
import com.baomidou.mybatisplus.annotation.TableField;
import java.util.Date;
@@ -15,7 +17,7 @@
/** id */
- @TableField("id")
+ @TableId(value = "id", type = IdType.AUTO)
private Integer id;
diff --git a/ui/admin-ui3/src/api/system/user.ts b/ui/admin-ui3/src/api/system/user.ts
index 283c99a..afa003d 100644
--- a/ui/admin-ui3/src/api/system/user.ts
+++ b/ui/admin-ui3/src/api/system/user.ts
@@ -110,7 +110,7 @@
return request({
url: '/system/user/profile/updatePwd',
method: 'put',
- params: data
+ data: data
})
}
diff --git a/ui/admin-ui3/src/views/system/user/profile/resetPwd.vue b/ui/admin-ui3/src/views/system/user/profile/resetPwd.vue
index 48ced73..01ca3b6 100644
--- a/ui/admin-ui3/src/views/system/user/profile/resetPwd.vue
+++ b/ui/admin-ui3/src/views/system/user/profile/resetPwd.vue
@@ -21,7 +21,7 @@
import useCurrentInstance from "@/utils/useCurrentInstance";
import {reactive, ref} from "vue";
import {ElForm} from "element-plus";
-import { sm3 } from "sm-crypto";
+import {encryptSm4} from "@/utils/Sm4Utils";
const { proxy } = useCurrentInstance();
const pwdRef = ref<InstanceType<typeof ElForm>>();
@@ -48,7 +48,7 @@
function submit() {
pwdRef.value!.validate(valid => {
if (valid) {
- updateUserPwd({oldPassword:sm3(user.oldPassword!) ,newPassword:sm3( user.newPassword!)}).then(response => {
+ updateUserPwd({oldPassword:encryptSm4(user.oldPassword!) ,newPassword:encryptSm4( user.newPassword!)}).then(response => {
proxy.$modal.msgSuccess("淇敼鎴愬姛");
});
}
--
Gitblit v1.8.0