From 1ac9d6d25f32148354e46d11b814c306f475ee0d Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期六, 08 十月 2022 17:07:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/LoginApi.java | 56 +++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 49 insertions(+), 7 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 f43b425..2b1de12 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,8 +2,8 @@
import javax.annotation.Resource;
-import com.panzhihua.common.model.vos.user.UuLoginVO;
-import org.apache.commons.lang3.StringUtils;
+import com.panzhihua.common.constants.Constants;
+import com.panzhihua.common.utlis.RSAUtils;
import org.springframework.util.ObjectUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
@@ -24,19 +24,23 @@
import com.panzhihua.common.model.vos.community.ComActVO;
import com.panzhihua.common.model.vos.community.ComMngStructAreaVO;
import com.panzhihua.common.model.vos.user.SysUserAgreementVO;
+import com.panzhihua.common.model.vos.user.UuLoginVO;
import com.panzhihua.common.service.auth.TokenService;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.common.validated.PutGroup;
+import cn.binarywang.wx.miniapp.api.WxMaQrcodeService;
import cn.binarywang.wx.miniapp.api.WxMaService;
import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
import cn.binarywang.wx.miniapp.bean.WxMaPhoneNumberInfo;
import cn.binarywang.wx.miniapp.bean.WxMaUserInfo;
+import cn.hutool.core.codec.Base64;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
+import me.chanjar.weixin.common.error.WxErrorException;
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
@@ -87,8 +91,12 @@
if (ObjectUtils.isEmpty(unionid)) {
unionid = "无";
}
- userService.addOrUpdate(openid, sessionKey, unionid);
- return tokenService.loginApplets(openid);
+ 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)
@@ -128,7 +136,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;
}
@@ -163,8 +171,8 @@
if (ObjectUtils.isEmpty(unionid)) {
unionid = "无";
}
- userService.addOrUpdate(openid, sessionKey, unionid);
- return tokenService.loginApplets(openid);
+ userService.addOrUpdate(openid, sessionKey, unionid,this.getAppId());
+ return tokenService.loginApplets(openid,this.getAppId());
}
@ApiOperation(value = "维护用户基本信息（昵称、性别、头像）")
@@ -305,4 +313,38 @@
public R uuLogin(@RequestBody UuLoginVO uuLoginVO){
return userService.uuLogin(uuLoginVO);
}
+
+ @ApiOperation("uu洗车获取小程序码")
+ @ApiImplicitParam(name = "couponId", value = "优惠券id", required = true)
+ @GetMapping("uu/getQRCode")
+ public R uuLogin(@RequestParam("couponId") String couponId) {
+ try {
+ WxMaQrcodeService qrCodeService = wxMaConfiguration.getMaService("wx118de8a734d269f0").getQrcodeService();
+ byte[] bytes = qrCodeService.createWxaCodeUnlimitBytes("couponId=" + couponId,
+ "packageD/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());
+ return R.fail("generate QRCode failed");
+ }
+ }
+
+ @ApiOperation("天府通办登录")
+ @PostMapping("tfLogin")
+ public R tfLogin(@RequestBody UuLoginVO uuLoginVO){
+ try {
+ uuLoginVO.setMobile(RSAUtils.decrypt(uuLoginVO.getMobile(), Constants.PRIVATE_KEY));
+ } catch (Exception e) {
+ e.printStackTrace();
+ return R.fail();
+ }
+ userService.tfLogin(uuLoginVO);
+ 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