From 4570e5d934867d3e2f5c19ec28e7dbc2af6b0207 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期六, 23 七月 2022 14:38:22 +0800
Subject: [PATCH] Merge branch 'huacheng_test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into huacheng_test
---
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 0ec228b..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
@@ -88,7 +88,7 @@
unionid = "无";
}
userService.addOrUpdate(openid, sessionKey, unionid);
- return tokenService.loginApplets(openid);
+ return tokenService.loginApplets(openid,this.getAppId());
}
@ApiOperation(value = "H5登录", response = LoginReturnVO.class)
@@ -128,7 +128,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;
}
@@ -164,7 +164,7 @@
unionid = "无";
}
userService.addOrUpdate(openid, sessionKey, unionid);
- return tokenService.loginApplets(openid);
+ return tokenService.loginApplets(openid,this.getAppId());
}
@ApiOperation(value = "维护用户基本信息（昵称、性别、头像）")
@@ -298,7 +298,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