From d6578ec702eb4fcff690d71ea3237a885f46b85c Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期三, 06 七月 2022 15:37:49 +0800
Subject: [PATCH] Merge branch 'huacheng' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java | 8 ++++++++
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java | 8 ++++++++
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java | 7 +++++++
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/LoginApi.java | 22 ++++++++++++++++++++++
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java | 9 +++++++++
5 files changed, 54 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java
index c16c15d..2573159 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java
@@ -1221,4 +1221,11 @@
*/
@PostMapping("/update/user/party/status")
R updateUserPartyStatus(@RequestParam("userId") Long userId);
+
+
+ /**
+ *导出验证密码
+ */
+ @GetMapping("/checkExport")
+ R checkExport(@RequestParam("account")String account,@RequestParam("password")String password,@RequestParam("oldPassword")String oldPassword);
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/LoginApi.java b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/LoginApi.java
index 7c57c18..04c1b10 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/LoginApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/LoginApi.java
@@ -3,6 +3,8 @@
import javax.annotation.Resource;
import com.panzhihua.common.model.vos.LoginReturnsVO;
+import com.panzhihua.common.service.user.UserService;
+import com.panzhihua.community_backstage.util.MyAESUtil;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.*;
@@ -28,6 +30,8 @@
public class LoginApi extends BaseController {
@Resource
private TokenService tokenService;
+ @Resource
+ private UserService userService;
@ApiOperation(value = "社区平台登录", response = LoginReturnVO.class)
@PostMapping("login")
@@ -42,6 +46,24 @@
R r = tokenService.loginCommunityBackage(account, password);
return r;
}
+ @ApiOperation(value = "社区平台验证密码", response = LoginReturnVO.class)
+ @PostMapping("checkExport")
+ public R checkExport(@RequestBody LoginBody loginBody) {
+ String account = this.getLoginUserInfo().getAccount();
+ String password = loginBody.getPassword();
+ boolean empty = ObjectUtils.isEmpty(account);
+ boolean empty1 = ObjectUtils.isEmpty(password);
+ if (empty || empty1) {
+ return R.fail("账户密码不能为空");
+ }
+ try {
+ password=MyAESUtil.Decrypt(password,"Ryo7M3n8loC5Abcd");
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ R r =userService.checkExport(account,password,this.getLoginUserInfo().getPassword());
+ return r;
+ }
@ApiOperation(value = "刷新token", response = LoginReturnVO.class)
@GetMapping("refreshToken")
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java
index c4e9efe..c1d90b0 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java
@@ -1355,4 +1355,12 @@
public R uuLogin(@RequestBody UuLoginVO uuLoginVO){
return userService.uuLogin(uuLoginVO);
}
+
+ /**
+ *导出验证密码
+ */
+ @GetMapping("/checkExport")
+ public R checkExport(@RequestParam("account")String account,@RequestParam("password")String password,@RequestParam("oldPassword")String oldPassword){
+ return userService.checkExport(account,password,oldPassword);
+ }
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java
index 88842ea..c8d98ae 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java
@@ -18,6 +18,7 @@
import com.panzhihua.common.model.vos.*;
import com.panzhihua.common.model.vos.shop.ShopStoreVO;
import com.panzhihua.common.model.vos.user.*;
+import org.springframework.web.bind.annotation.RequestParam;
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
@@ -844,4 +845,12 @@
* @return
*/
R uuLogin(UuLoginVO uuLoginVO);
+
+ /**
+ * 导出验证密码
+ * @param account
+ * @param password
+ * @return
+ */
+ R checkExport(@RequestParam("account")String account, @RequestParam("password")String password,@RequestParam("oldPassword")String oldPassword);
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
index 3a126c5..bec9222 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
@@ -3292,4 +3292,12 @@
}
return R.fail("信息错误");
}
+
+ @Override
+ public R checkExport(String account, String password,String oldPassword) {
+ if(new BCryptPasswordEncoder().matches(password, oldPassword)){
+ return R.ok();
+ }
+ return R.fail();
+ }
}
--
Gitblit v1.7.1