From d6aabd981bf80cd57c09819f42b1c4e79f1904f9 Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期三, 21 九月 2022 10:13:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/sanshuohuitang_dev' into sanshuohuitang_dev
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java | 30 +++++++++++++++++++++---------
1 files changed, 21 insertions(+), 9 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 1504213..bd264da 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
@@ -45,7 +45,7 @@
*/
@PostMapping("/addOrUpdate")
R addOrUpdate(@RequestParam("openid") String openid, @RequestParam("sessionKey") String sessionKey,
- @RequestParam("unionid") String unionid);
+ @RequestParam("unionid") String unionid,@RequestParam("appId")String appId);
/**
* 维护小程序用户基本信息 头像 昵称 性别
@@ -145,7 +145,7 @@
R resetPassword(@RequestParam("userId") Long userId);
@GetMapping("/resetPasswordAccount")
- R resetPasswordAccount(@RequestParam("type")Integer type,@RequestParam("account")String account);
+ R resetPasswordAccount(@RequestParam("type")Integer type,@RequestParam("account")String account,@RequestParam("appId")String appId);
/**
* 批量重置密码用户登录密码默认admin123456
@@ -1234,26 +1234,26 @@
@GetMapping("/indexData/totalData")
R newIndexData(@RequestParam(value = "type",required = false) Integer type,
@RequestParam(value = "type",required = false) Long streetId,
- @RequestParam(value = "areaCode",required = false) Long areaCode);
+ @RequestParam(value = "areaCode",required = false) Long areaCode,@RequestParam("appId")String appId);
@GetMapping("/indexData/userRate")
R userRate(@RequestParam(value = "type",required = false) Integer type,
@RequestParam(value = "streetId",required = false) Long streetId,
@RequestParam(value = "areaCode",required = false) Long areaCode,
- @RequestParam(value = "range",required = false) Integer range);
+ @RequestParam(value = "range",required = false) Integer range,@RequestParam(value = "appId",required = false) String appId);
@GetMapping("/indexData/realUser")
R realUser(@RequestParam(value = "type",required = false) Integer type,
@RequestParam(value = "streetId",required = false) Long streetId,
@RequestParam(value = "areaCode",required = false) Long areaCode,
- @RequestParam(value = "range",required = false) Integer range);
+ @RequestParam(value = "range",required = false) Integer range,@RequestParam(value = "appId",required = false) String appId);
@GetMapping("/indexData/userActivity")
- R userActivity(@RequestParam(value = "type",required = false) Integer type,
- @RequestParam(value = "streetId",required = false) Long streetId,
- @RequestParam(value = "areaCode",required = false) Long areaCode,
- @RequestParam(value = "range",required = false) Integer range);
+ R userActivity(@RequestParam(value = "type", required = false) Integer type,
+ @RequestParam(value = "streetId", required = false) Long streetId,
+ @RequestParam(value = "areaCode", required = false) Long areaCode,
+ @RequestParam(value = "range", required = false) Integer range, @RequestParam(value = "appId",required = false) String appId);
@GetMapping("/indexData/getAreaAndStreet")
R getAreaAndStreet();
@@ -1274,4 +1274,16 @@
@PostMapping("/tfLogin")
R tfLogin(@RequestBody UuLoginVO uuLoginVO);
+
+ /**
+ * 三说会堂添加后台账户
+ * */
+ @PostMapping("/sanshuoAddUser")
+ R sanShuoAddUser(@RequestBody AdministratorsUserVO administratorsUserVO);
+
+ /**
+ * 三说会堂重置密码
+ * */
+ @GetMapping("/sanshuoResetPassword")
+ R sanShuoResetPassword(@RequestParam("account") String account,@RequestParam("pass")String password);
}
--
Gitblit v1.7.1