From 4c80d2017a3b88b9ad55f28c3b87fd96eb67bcb2 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期四, 29 九月 2022 09:40:51 +0800
Subject: [PATCH] Merge branch 'sanshuohuitang_dev' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSanShuoIndustryCenterServiceImpl.java | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSanShuoIndustryCenterServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSanShuoIndustryCenterServiceImpl.java
index 380c06e..f97541c 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSanShuoIndustryCenterServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSanShuoIndustryCenterServiceImpl.java
@@ -68,10 +68,10 @@
AdministratorsUserVO user=new AdministratorsUserVO();
user.setUserId(Snowflake.getId());
user.setAccount(comSanShuoIndustryCenterDTO.getAccount());
- user.setType(11);
user.setName(comSanShuoIndustryCenterDTO.getName());
+ user.setType(12);
try {
- user.setPassword(MyAESUtil.Encrypt(comSanShuoIndustryCenterDTO.getPassword(),"Ryo7M3n8loC5Abcd"));
+ user.setPassword(comSanShuoIndustryCenterDTO.getPassword());
} catch (Exception e) {
e.printStackTrace();
}
@@ -92,8 +92,7 @@
@Override
public R resetPassword(ComSanshuoIndustryCenter center) {
try {
- String pass=MyAESUtil.Encrypt(center.getPassword(), "Ryo7M3n8loC5Abcd");
- return userService.sanShuoResetPassword(center.getAccount(), pass);
+ return userService.sanShuoResetPassword(center.getAccount(), center.getPassword());
} catch (Exception e) {
e.printStackTrace();
}
--
Gitblit v1.7.1