From 1e586a8778838c24cd2cfdfdcf18ab0132b6b09f Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期四, 21 七月 2022 14:33:22 +0800
Subject: [PATCH] bug修改
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/LoginApi.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 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 fec75f3..f43b425 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,6 +2,7 @@
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;
@@ -64,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);
@@ -197,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();
@@ -218,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);
@@ -297,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