From d36ff64151ebfca633b777f9ca5327df17f2f750 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期六, 23 七月 2022 10:07:29 +0800
Subject: [PATCH] bug修改
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/LoginApi.java | 101 +++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 95 insertions(+), 6 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/LoginApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/LoginApi.java
index 67f8aa2..c6bfe78 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/LoginApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/LoginApi.java
@@ -2,9 +2,16 @@
import javax.annotation.Resource;
+import com.panzhihua.common.model.vos.user.UuLoginVO;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.util.ObjectUtils;
import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
import com.alibaba.fastjson.JSONObject;
import com.panzhihua.applets.config.WxMaConfiguration;
@@ -58,7 +65,7 @@
return R.fail("缺少登录参数");
}
log.info(code);
- WxMaService maService = wxMaConfiguration.getMaService();
+ WxMaService maService = wxMaConfiguration.getMaService(loginRequest.getAppid());
WxMaJscode2SessionResult sessionInfo = null;
try {
sessionInfo = maService.getUserService().getSessionInfo(code);
@@ -73,6 +80,7 @@
}
}
log.info("微信登录成功【{}】", JSONObject.toJSONString(sessionInfo));
+ log.info("loginRequest参数【{}】", JSONObject.toJSONString(loginRequest));
String openid = sessionInfo.getOpenid();
String sessionKey = sessionInfo.getSessionKey();
String unionid = sessionInfo.getUnionid();
@@ -80,7 +88,83 @@
unionid = "无";
}
userService.addOrUpdate(openid, sessionKey, unionid);
- return tokenService.loginApplets(openid);
+ return tokenService.loginApplets(openid,this.getAppId());
+ }
+
+ @ApiOperation(value = "H5登录", response = LoginReturnVO.class)
+ @PostMapping("loginH5")
+ public R loginH5(@RequestBody LoginRequest loginRequest) {
+ String code = loginRequest.getCode();
+ if (ObjectUtils.isEmpty(code)) {
+ return R.fail("缺少登录参数");
+ }
+ log.info(code);
+ WxMaService maService = wxMaConfiguration.getMaH5Service();
+ WxMaJscode2SessionResult sessionInfo = null;
+ try {
+ sessionInfo = maService.getUserService().getSessionInfo(code);
+ } catch (Exception e) {
+ log.error("微信登录失败【{}】", e.getMessage());
+ if (code.equals("22")) {
+ sessionInfo = new WxMaJscode2SessionResult();
+ sessionInfo.setOpenid("88888888");
+ sessionInfo.setSessionKey("9999999");
+ } else {
+ return R.fail("微信登录失败");
+ }
+ }
+ log.info("微信登录成功【{}】", JSONObject.toJSONString(sessionInfo));
+ log.info("loginRequest参数【{}】", JSONObject.toJSONString(loginRequest));
+ // 解密用户信息
+// WxMaUserInfo wxUserInfo = maService.getUserService().getUserInfo(sessionInfo.getSessionKey(),
+// loginRequest.getEncryptedData(), loginRequest.getIv());
+// log.info("wxUserInfo信息【{}】", JSONObject.toJSONString(wxUserInfo));
+// if (null == wxUserInfo) {
+// return R.fail("获取用户信息失败");
+// }
+// String unionId = wxUserInfo.getUnionId();
+ String unionId = sessionInfo.getUnionid();
+ //通过unionId去匹配user
+ R r1 = userService.getUserInfoByUnionId(unionId);
+ if (R.isOk(r1)) {
+ LoginUserInfoVO loginUserInfoVO = JSONObject.parseObject(JSONObject.toJSONString(r1.getData()), LoginUserInfoVO.class);
+ return tokenService.loginApplets(loginUserInfoVO.getOpenid(),this.getAppId());
+ }
+ return r1;
+ }
+
+ @ApiOperation(value = "仁和区登录", response = LoginReturnVO.class)
+ @PostMapping("/renHe/login")
+ public R renHeLogin(@RequestBody LoginRequest loginRequest) {
+ String code = loginRequest.getCode();
+ if (ObjectUtils.isEmpty(code)) {
+ return R.fail("缺少登录参数");
+ }
+ log.info(code);
+ WxMaService maService = wxMaConfiguration.getMaRhService();
+ WxMaJscode2SessionResult sessionInfo = null;
+ try {
+ sessionInfo = maService.getUserService().getSessionInfo(code);
+ } catch (Exception e) {
+ log.error("微信登录失败【{}】", e.getMessage());
+ if (code.equals("22")) {
+ sessionInfo = new WxMaJscode2SessionResult();
+ sessionInfo.setOpenid("88888888");
+ sessionInfo.setSessionKey("9999999");
+ } else {
+ return R.fail("微信登录失败");
+ }
+ }
+ log.info("微信登录成功【{}】", JSONObject.toJSONString(sessionInfo));
+ log.info("loginRequest参数【{}】", JSONObject.toJSONString(loginRequest));
+ String openid = sessionInfo.getOpenid();
+ String sessionKey = sessionInfo.getSessionKey();
+ String unionid = sessionInfo.getUnionid();
+ if (ObjectUtils.isEmpty(unionid)) {
+ unionid = "无";
+ }
+ userService.addOrUpdate(openid, sessionKey, unionid);
+ return tokenService.loginApplets(openid,this.getAppId());
}
@ApiOperation(value = "维护用户基本信息（昵称、性别、头像）")
@@ -114,7 +198,7 @@
if (empty || empty1) {
return R.fail("微信用户参数不全");
}
- WxMaService maService = wxMaConfiguration.getMaService();
+ WxMaService maService = wxMaConfiguration.getMaService(this.getAppId());
Long userId = this.getUserId();
R<LoginUserInfoVO> r = userService.getUserInfoByUserId(userId + "");
LoginUserInfoVO loginUserInfoVO = r.getData();
@@ -135,7 +219,7 @@
return R.fail("缺少登录参数");
}
log.info(code);
- WxMaService maService = wxMaConfiguration.getMaService();
+ WxMaService maService = wxMaConfiguration.getMaService(this.getAppId());
WxMaJscode2SessionResult sessionInfo = null;
try {
sessionInfo = maService.getUserService().getSessionInfo(code);
@@ -214,6 +298,11 @@
@GetMapping("useragreement")
public R userAgreement() {
int type = 1;
- return userService.userAgreement(type);
+ return userService.userAgreement(type,this.getAppId());
+ }
+ @ApiOperation("uu洗车登录")
+ @PostMapping("uuLogin")
+ public R uuLogin(@RequestBody UuLoginVO uuLoginVO){
+ return userService.uuLogin(uuLoginVO);
}
}
--
Gitblit v1.7.1