From d7d9b601b2e4fdb663375993e2cfbdbd363df421 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 11 七月 2023 22:17:37 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-user/src/main/java/com/java110/user/api/UserLoginApi.java | 60 ++++++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 44 insertions(+), 16 deletions(-)
diff --git a/service-user/src/main/java/com/java110/user/api/UserLoginApi.java b/service-user/src/main/java/com/java110/user/api/UserLoginApi.java
index e41f00e..414ba18 100755
--- a/service-user/src/main/java/com/java110/user/api/UserLoginApi.java
+++ b/service-user/src/main/java/com/java110/user/api/UserLoginApi.java
@@ -2,14 +2,13 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.dto.user.UserDto;
-import com.java110.dto.userLogin.UserLoginDto;
-import com.java110.po.userLogin.UserLoginPo;
+import com.java110.dto.user.UserLoginDto;
+import com.java110.po.user.UserLoginPo;
import com.java110.user.bmo.userLogin.IDeleteUserLoginBMO;
import com.java110.user.bmo.userLogin.IGetUserLoginBMO;
import com.java110.user.bmo.userLogin.ISaveUserLoginBMO;
import com.java110.user.bmo.userLogin.IUpdateUserLoginBMO;
import com.java110.utils.cache.CommonCache;
-import com.java110.utils.cache.MappingCache;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.vo.ResultVo;
@@ -124,21 +123,50 @@
@RequestMapping(value = "/getUserInfoByHcCode", method = RequestMethod.GET)
public ResponseEntity<String> getUserInfoByHcCode(@RequestParam(value = "hcCode") String hcCode) {
UserDto userDto = null;
- String env = MappingCache.getValue("HC_ENV");
- if ("DEV".equals(env) || "TEST".equals(env)) {
- userDto = new UserDto();
- userDto.setUserId("1000000020021010001");
- userDto.setUserName("鍚村鏂�");
- userDto.setAddress("闈掓捣鐪佽タ瀹佸競鍩庝腑鍖虹敵瀹佽矾");
- userDto.setAge(30);
- userDto.setEmail("928255095@qq.com");
- userDto.setName("鍚村鏂�");
- userDto.setSex("1");
- userDto.setTel("18909711443");
- return ResultVo.createResponseEntity(userDto);
- }
+// String env = MappingCache.getValue("HC_ENV");
+// if ("DEV".equals(env) || "TEST".equals(env)) {
+// userDto = new UserDto();
+// userDto.setUserId("1000000020021010001");
+// userDto.setUserName("鍚村鏂�");
+// userDto.setAddress("闈掓捣鐪佽タ瀹佸競鍩庝腑鍖虹敵瀹佽矾");
+// userDto.setAge(30);
+// userDto.setEmail("928255095@qq.com");
+// userDto.setName("鍚村鏂�");
+// userDto.setSex("1");
+// userDto.setTel("18909711443");
+// return ResultVo.createResponseEntity(userDto);
+// }
String userInfoStr = CommonCache.getAndRemoveValue(hcCode);
userDto = JSONObject.parseObject(userInfoStr, UserDto.class);
return ResultVo.createResponseEntity(userDto);
}
+
+ /**
+ * 鐢熸垚code
+ *
+ * @param userId
+ * @serviceCode /userLogin/generatorHcCode
+ * @return
+ */
+ @RequestMapping(value = "/generatorHcCode", method = RequestMethod.GET)
+ public ResponseEntity<String> generatorHcCode(@RequestHeader(value = "user-id") String userId) {
+ UserDto userDto = new UserDto();
+ userDto.setUserId(userId);
+ return getUserLoginBMOImpl.generatorHcCode(userDto);
+
+ }
+ /**
+ * 鐢熸垚code
+ *
+ * @param userId
+ * @serviceCode /userLogin/deleteOpenId
+ * @return
+ */
+ @RequestMapping(value = "/deleteOpenId", method = RequestMethod.POST)
+ public ResponseEntity<String> deleteOpenId(@RequestParam(value = "userId", required = false) String userId) {
+ UserDto userDto = new UserDto();
+ userDto.setUserId(userId);
+ return deleteUserLoginBMOImpl.deleteOpenId(userDto);
+
+ }
}
--
Gitblit v1.8.0