From 0a4aee700a60c4b28248f3d1a7f4f91376b68492 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期一, 01 八月 2022 14:46:47 +0800
Subject: [PATCH] Merge branch 'haucheng_panzhihua' into shuangzheng2
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/LoginApi.java | 8 ++++----
1 files changed, 4 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 6f36963..3ff296e 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
@@ -90,7 +90,7 @@
unionid = "无";
}
userService.addOrUpdate(openid, sessionKey, unionid);
- return tokenService.loginApplets(openid);
+ return tokenService.loginApplets(openid,this.getAppId());
}
@ApiOperation(value = "H5登录", response = LoginReturnVO.class)
@@ -130,7 +130,7 @@
R r1 = userService.getUserInfoByUnionId(unionId);
if (R.isOk(r1)) {
LoginUserInfoVO loginUserInfoVO = JSONObject.parseObject(JSONObject.toJSONString(r1.getData()), LoginUserInfoVO.class);
- return tokenService.loginApplets(loginUserInfoVO.getOpenid());
+ return tokenService.loginApplets(loginUserInfoVO.getOpenid(),this.getAppId());
}
return r1;
}
@@ -166,7 +166,7 @@
unionid = "无";
}
userService.addOrUpdate(openid, sessionKey, unionid);
- return tokenService.loginApplets(openid);
+ return tokenService.loginApplets(openid,this.getAppId());
}
@ApiOperation(value = "维护用户基本信息（昵称、性别、头像）")
@@ -300,7 +300,7 @@
@GetMapping("useragreement")
public R userAgreement() {
int type = 1;
- return userService.userAgreement(type);
+ return userService.userAgreement(type,this.getAppId());
}
@ApiOperation("uu洗车登录")
@PostMapping("uuLogin")
--
Gitblit v1.7.1