From 6ceafc5b1f3d24dfa75b6b726a44c8a88acbe678 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 16 一月 2025 10:46:48 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java
index 91516e9..5199504 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java
@@ -175,7 +175,7 @@
user.setObjectId(shopId);
user.setAppUserId(appUser.getId());
String s = MD5Generator.generateMD5(phone.substring(5));
- user.setPassword(SecurityUtils.encryptPassword(s));
+ user.setPassword(s);
user.setCreateTime(new Date());
Long userId = sysUserClient.saveShopUser(user).getData();
@@ -503,7 +503,8 @@
userShop.setRoleType(1);
List<UserShop> data = userShopClient.getUserShop(userShop).getData();
SysUser userData = sysUserClient.getSysUser(data.get(0).getUserId()).getData();
- userData.setPassword(userData.getPhonenumber().substring(5));
+ String s = MD5Generator.generateMD5(userData.getPhonenumber().substring(5));
+ userData.setPassword(SecurityUtils.encryptPassword(s));
sysUserClient.resetPassword(userData);
}
return R.ok();
--
Gitblit v1.7.1