From 9d53292f41f54a6d740680195723c3e19f2ed62d Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期二, 09 八月 2022 15:28:25 +0800
Subject: [PATCH] Merge branch 'haucheng_panzhihua' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java | 28 ++++++++++++++++++++--------
1 files changed, 20 insertions(+), 8 deletions(-)
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 c48b46b..de65175 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
@@ -104,10 +104,13 @@
*/
@PostMapping("/getUserInfo")
public R<LoginUserInfoVO> getUserInfo(@RequestParam("userName") String userName) {
- int index = userName.lastIndexOf("_");
- String type = userName.substring(index + 1);
- String name = userName.substring(0, index);
- return userService.getUserInfo(name, Integer.parseInt(type));
+ int index2 = userName.lastIndexOf("_");
+ String appid=userName.substring(index2+1);
+ String username=userName.substring(0,index2);
+ int index = username.lastIndexOf("_");
+ String type = username.substring(index + 1);
+ String name = username.substring(0, index);
+ return userService.getUserInfo(name, Integer.parseInt(type),appid);
}
/**
@@ -565,8 +568,8 @@
* @return 协议内容
*/
@PostMapping("useragreement")
- public R userAgreement(@RequestParam("type") int type) {
- return userService.userAgreement(type);
+ public R userAgreement(@RequestParam("type") int type,@RequestParam("appid")String appId) {
+ return userService.userAgreement(type,appId);
}
/**
@@ -722,8 +725,8 @@
* @return 协议内容
*/
@PostMapping("agreement")
- public R agreement(@RequestParam("type") Integer type) {
- return userService.agreement(type);
+ public R agreement(@RequestParam("type") Integer type,@RequestParam("appId")String appId) {
+ return userService.agreement(type,appId);
}
/**
@@ -1437,4 +1440,13 @@
return userService.getCommunityList(name,id);
}
+ @GetMapping("/resetPasswordAccount")
+ public R resetPasswordAccount(@RequestParam("type")Integer type,@RequestParam("account")String account){
+ return userService.resetPassword(type,account);
+ }
+
+ @PostMapping("/tfLogin")
+ public R tfLogin(@RequestBody UuLoginVO uuLoginVO){
+ return userService.tfLogin(uuLoginVO);
+ }
}
--
Gitblit v1.7.1