From 9662fd717536ddcb284e34236deb670ea0c4a23d Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期二, 11 十月 2022 14:37:18 +0800
Subject: [PATCH] Merge branch '20221008' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/LoginApi.java | 23 +++++++++++++++++++----
1 files changed, 19 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 2b1de12..23fa9db 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
@@ -42,6 +42,9 @@
import lombok.extern.slf4j.Slf4j;
import me.chanjar.weixin.common.error.WxErrorException;
+import java.util.HashMap;
+import java.util.Map;
+
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
* @description: 登录
@@ -319,10 +322,22 @@
@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)));
+ //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");
--
Gitblit v1.7.1