From c65e9b72a75afa3df4733ae2f29c38dc3adf4d8e Mon Sep 17 00:00:00 2001
From: orgin <feixingyuanup@gmail.com>
Date: Fri, 12 May 2023 15:43:51 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E6=96=B0=E5=A2=9EdefaultPassword?=
=?UTF-8?q?=E9=85=8D=E7=BD=AE=E9=A1=B9=EF=BC=8C=E5=88=9B=E5=BB=BA=E7=94=A8?=
=?UTF-8?q?=E6=88=B7=E6=8E=A5=E5=8F=A3=E6=94=B9=E4=B8=BA=E9=BB=98=E8=AE=A4?=
=?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=AF=86=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../system/controller/SysUserController.java | 27 ++++++++++---------
.../src/main/resources/application-dev.yml | 3 +++
2 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java
index 15780082..3eb224f0 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java
@@ -89,6 +89,9 @@ public class SysUserController {
@Value("${jeecg.path.upload}")
private String upLoadPath;
+ @Value("${system.auth.defaultPassword}")
+ private String defaultPassword;
+
@Autowired
private BaseCommonService baseCommonService;
@@ -159,7 +162,7 @@ public class SysUserController {
user.setCreateTime(new Date());//设置创建时间
String salt = oConvertUtils.randomGen(8);
user.setSalt(salt);
- String passwordEncode = PasswordUtil.encrypt(user.getUsername(), user.getPassword(), salt);
+ String passwordEncode = PasswordUtil.encrypt(user.getUsername(), defaultPassword, salt);
user.setPassword(passwordEncode);
user.setStatus(1);
user.setDelFlag(CommonConstant.DEL_FLAG_0);
@@ -908,7 +911,7 @@ public class SysUserController {
}
return result;
}
-
+
/**
* 查询当前用户的所有部门/当前部门编码
* @return
@@ -931,12 +934,12 @@ public class SysUserController {
return result;
}
-
+
/**
* 用户注册接口
- *
+ *
* @param jsonObject
* @param user
* @return
@@ -999,7 +1002,7 @@ public class SysUserController {
if(oConvertUtils.isEmpty(realname)){
realname = username;
}
-
+
try {
user.setCreateTime(new Date());// 设置创建时间
String salt = oConvertUtils.randomGen(8);
@@ -1094,7 +1097,7 @@ public class SysUserController {
result.setSuccess(true);
return result;
}
-
+
/**
* 用户更改密码
*/
@@ -1144,11 +1147,11 @@ public class SysUserController {
return result;
}
}
-
+
/**
* 根据TOKEN获取用户的部分信息（返回的数据是可供表单设计器使用的数据）
- *
+ *
* @return
*/
@GetMapping("/getUserSectionInfoByToken")
@@ -1159,7 +1162,7 @@ public class SysUserController {
if (oConvertUtils.isEmpty(token)) {
username = JwtUtil.getUserNameByToken(request);
} else {
- username = JwtUtil.getUsername(token);
+ username = JwtUtil.getUsername(token);
}
log.debug(" ------ 通过令牌获取部分用户信息，当前用户： " + username);
@@ -1180,7 +1183,7 @@ public class SysUserController {
return Result.error(500, "查询失败:" + e.getMessage());
}
}
-
+
/**
* 【APP端接口】获取用户列表 根据用户名和真实名 模糊匹配
* @param keyword
@@ -1217,7 +1220,7 @@ public class SysUserController {
log.error(e.getMessage(), e);
return Result.error(500, "查询失败:" + e.getMessage());
}
-
+
}
/**
@@ -1491,7 +1494,7 @@ public class SysUserController {
}
return ls;
}
-
+
/**
* 聊天 创建聊天组件专用 根据用户账号、用户姓名、部门id分页查询
* @param departId 部门id
diff --git a/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml b/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml
index 59678f57..03a03c1d 100644
--- a/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml
+++ b/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml
@@ -292,3 +292,6 @@ third-app:
# appSecret
client-secret: ??
agent-id: ??
+system:
+ auth:
+ defaultPassword: 123456