From 62410d32ea1e1251574dfce92a3be1e3d295e492 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期二, 11 十月 2022 10:59:22 +0800
Subject: [PATCH] #feat 修改获取ip方式
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java | 31 ++++++++++++++++++++++---------
1 files changed, 22 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 8c2cf06..daca29a 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
@@ -8,6 +8,7 @@
import com.panzhihua.common.model.dtos.community.microCommercialStreet.BindUserPhoneDTO;
import com.panzhihua.common.model.dtos.community.microCommercialStreet.LoginWithPhoneDTO;
import com.panzhihua.common.model.dtos.community.microCommercialStreet.McsMerchantDTO;
+import com.panzhihua.common.model.dtos.partybuilding.ComPbCheckUserDTO;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;
@@ -45,7 +46,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 +146,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 +1235,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();
@@ -1270,4 +1271,16 @@
@GetMapping("/communityList")
R communityList(@RequestParam("name") String name, @RequestParam("id") Long id);
+
+
+ @PostMapping("/tfLogin")
+ R tfLogin(@RequestBody UuLoginVO uuLoginVO);
+
+
+ @GetMapping("/accept")
+ R accept(@RequestParam("userId")Long userId);
+
+ @PostMapping("/addComPbCheckUser")
+ R addComPbCheckUser(@RequestBody ComPbCheckUserDTO comPbCheckUserDTO);
+
}
--
Gitblit v1.7.1