From fe5975b8fc4592e3925a678c28a26563669574e9 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期一, 10 十月 2022 17:05:36 +0800
Subject: [PATCH] Merge branch 'local_20221010' into haucheng_panzhihua
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/LoginApi.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 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 fc52183..255125f 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
@@ -92,6 +92,10 @@
userService.addOrUpdate(openid, sessionKey, unionid,this.getAppId());
return tokenService.loginApplets(openid,this.getAppId());
}
+ @PostMapping("/loginTest")
+ public R loginTest(@RequestBody LoginRequest loginRequest){
+ return tokenService.loginApplets(loginRequest.getCode(),this.getAppId());
+ }
@ApiOperation(value = "H5登录", response = LoginReturnVO.class)
@PostMapping("loginH5")
@@ -313,9 +317,9 @@
@GetMapping("uu/getQRCode")
public R uuLogin(@RequestParam("couponId") String couponId) {
try {
- WxMaQrcodeService qrCodeService = wxMaConfiguration.getMaService("wx118de8a734d269f0").getQrcodeService();
+ WxMaQrcodeService qrCodeService = wxMaConfiguration.getMaService("wx98d62711dfbd8425").getQrcodeService();
byte[] bytes = qrCodeService.createWxaCodeUnlimitBytes("couponId=" + couponId,
- "packageD/pages/user/getCoupon/getCoupon", true, "release", 30, true, null, false);
+ "/pages/user/getCoupon/getCoupon", true, "release", 30, true, null, false);
return R.ok(String.format("data:image/png;base64,%s", Base64.encode(bytes)));
} catch (Exception e) {
log.error("generate QRCode failed:" + e.getMessage());
@@ -330,4 +334,9 @@
R r=tokenService.tfLogin(uuLoginVO.getMobile(),"Huacheng@123","wx118de8a734d269f0");
return r;
}
+ @ApiOperation("用户授权")
+ @GetMapping("/accept")
+ public R accept(){
+ return userService.accept(this.getUserId());
+ }
}
--
Gitblit v1.7.1