From 09c68ce0ddbaebde08d0d370b5bb4ab0b1532a73 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期一, 28 十一月 2022 15:03:02 +0800
Subject: [PATCH] Merge branch 'local_20221104' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/LoginApi.java | 32 ++++++++++++++++++++++++++++----
1 files changed, 28 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 255125f..38ab865 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,8 @@
import javax.annotation.Resource;
+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;
@@ -39,6 +41,9 @@
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import me.chanjar.weixin.common.error.WxErrorException;
+
+import java.util.HashMap;
+import java.util.Map;
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
@@ -317,10 +322,22 @@
@GetMapping("uu/getQRCode")
public R uuLogin(@RequestParam("couponId") String couponId) {
try {
- WxMaQrcodeService qrCodeService = wxMaConfiguration.getMaService("wx98d62711dfbd8425").getQrcodeService();
- byte[] bytes = qrCodeService.createWxaCodeUnlimitBytes("couponId=" + couponId,
- "/pages/user/getCoupon/getCoupon", true, "release", 30, true, null, false);
- return R.ok(String.format("data:image/png;base64,%s", Base64.encode(bytes)));
+ //i小懒
+ WxMaQrcodeService wsCodeService = wxMaConfiguration.getMaService("wx98d62711dfbd8425").getQrcodeService();
+ byte[] bytes = wsCodeService.createWxaCodeUnlimitBytes("couponId=" + couponId,
+ "pages/user/getCoupon/getCoupon", true, "release", 30, true, null, false);
+ String res = String.format("data:image/png;base64,%s", Base64.encode(bytes));
+
+ //花城
+ WxMaQrcodeService uuCodeService = wxMaConfiguration.getMaService("wx118de8a734d269f0").getQrcodeService();
+ byte[] hcBytes = uuCodeService.createWxaCodeUnlimitBytes("couponId=" + couponId,
+ "packageD/pages/user/getCoupon/getCoupon", true, "release", 30, true, null, false);
+ String hcRes = String.format("data:image/png;base64,%s", Base64.encode(hcBytes));
+
+ Map<String,String> retMap = new HashMap<>();
+ retMap.put("ixiaolan",res);
+ retMap.put("huacheng",hcRes);
+ return R.ok(retMap);
} catch (Exception e) {
log.error("generate QRCode failed:" + e.getMessage());
return R.fail("generate QRCode failed");
@@ -330,6 +347,13 @@
@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;
--
Gitblit v1.7.1