From f10a7c29f1a3748b28d2809335625c7888473b26 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 22 九月 2025 22:21:19 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang into 2.0
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/miniapp/AppIntegralController.java | 4 ++--
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java | 3 ++-
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/util/OBSUploadUtils.java | 3 +--
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppLotteryEventController.java | 2 +-
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/util/kuaishou/KSClientTokenUtil.java | 28 +++++++++++-----------------
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/utils/XiaoeUtils.java | 2 +-
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/miniapp/AppMemberController.java | 2 +-
7 files changed, 19 insertions(+), 25 deletions(-)
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppLotteryEventController.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppLotteryEventController.java
index b2a3931..62e1ea7 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppLotteryEventController.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppLotteryEventController.java
@@ -131,7 +131,7 @@
Long userId = SecurityUtils.getUserId();
TLotteryEvent lotteryEvent = lotteryEventService.getById(id);
LotteryEventInfoVo vo = new LotteryEventInfoVo();
- vo.setId(lotteryEvent.getId());
+ vo.setId(lotteryEvent.getId().toString());
vo.setName(lotteryEvent.getName());
vo.setActivityProfile(lotteryEvent.getActivityProfile());
vo.setStartTime(lotteryEvent.getStartTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/utils/XiaoeUtils.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/utils/XiaoeUtils.java
index ea90ecc..b86d682 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/utils/XiaoeUtils.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/utils/XiaoeUtils.java
@@ -144,7 +144,7 @@
xiaoeLiveVOPage.setRecords(xiaoeLiveVos);
xiaoeLiveVOPage.setCurrent(dto.getPage());
xiaoeLiveVOPage.setPages(data.getLong("page_count"));
- }
+ }
}
}
return xiaoeLiveVOPage;
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/miniapp/AppIntegralController.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/miniapp/AppIntegralController.java
index df8d06e..8b05d81 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/miniapp/AppIntegralController.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/miniapp/AppIntegralController.java
@@ -104,13 +104,13 @@
Map<String, Object> map = new HashMap<>();
if(data.size() > 0){
TLotteryEvent tLotteryEvent = data.get(0);
- map.put("lotteryEventId", tLotteryEvent.getId());
+ map.put("lotteryEventId", tLotteryEvent.getId().toString());
map.put("name", tLotteryEvent.getActivityProfile());
map.put("image", tLotteryEvent.getCoverImage());
//将数据添加到普通抽奖列表中
TLotteryEventUser lotteryEventUser = new TLotteryEventUser();
lotteryEventUser.setId(IdUtils.simpleUUID());
- lotteryEventUser.setLotteryEventId(tLotteryEvent.getId());
+ lotteryEventUser.setLotteryEventId(tLotteryEvent.getId().toString());
lotteryEventUser.setUser_id(SecurityUtils.getUserId());
lotteryEventClient.addLotteryEventUser(lotteryEventUser);
}
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/miniapp/AppMemberController.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/miniapp/AppMemberController.java
index 3cd6687..229c30d 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/miniapp/AppMemberController.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/miniapp/AppMemberController.java
@@ -76,7 +76,7 @@
List<TLotteryEvent> data = lotteryEventClient.getLotteryEventList(getLotteryEventList).getData();
if(data.size() > 0){
TLotteryEvent tLotteryEvent = data.get(0);
- appUserInfoVo.setLotteryEventId(tLotteryEvent.getId());
+ appUserInfoVo.setLotteryEventId(tLotteryEvent.getId().toString());
appUserInfoVo.setShareName(tLotteryEvent.getActivityProfile());
appUserInfoVo.setShareImage(tLotteryEvent.getCoverImage());
}
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java
index cb86e67..12f1569 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java
@@ -52,6 +52,7 @@
import org.apache.http.HttpResponse;
import org.apache.http.util.EntityUtils;
import org.springframework.stereotype.Service;
+import org.springframework.util.Base64Utils;
import org.springframework.util.FileCopyUtils;
import org.springframework.web.multipart.MultipartFile;
@@ -2356,7 +2357,7 @@
@Override
public String getWeiXinQrCode(String scene, String path) {
try {
- File file = wxMaService.getQrcodeService().createWxaCodeUnlimit(scene, path);
+ File file = wxMaService.getQrcodeService().createQrcode(path + "?" + scene);
String url = OBSUploadUtils.uploadLocalFile(file);
return url;
} catch (Exception e) {
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/util/OBSUploadUtils.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/util/OBSUploadUtils.java
index ba70bee..48b44f2 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/util/OBSUploadUtils.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/util/OBSUploadUtils.java
@@ -178,8 +178,7 @@
// 创建PutObject请求。
result = ossClient.putObject(bucketName,objectName,file);
// 如果上传成功，则返回200。
- System.out.println(fileName + "上传返回" + result.getResponse().getStatusCode());
- return result.getResponse().getUri();
+ return "https://hongruitang.oss-cn-beijing.aliyuncs.com/" + objectName;
} catch (OSSException oe) {
System.out.println("Caught an OSSException, which means your request made it to OSS, "
+ "but was rejected with an error response for some reason.");
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/util/kuaishou/KSClientTokenUtil.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/util/kuaishou/KSClientTokenUtil.java
index 0b88211..081d024 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/util/kuaishou/KSClientTokenUtil.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/util/kuaishou/KSClientTokenUtil.java
@@ -50,24 +50,18 @@
* 刷新client_token
*/
public static void refreshToken(RedisService redisService) {
+ Object ks_refresh_token = redisService.getCacheObject("ks_refresh_token");
+ OAuthAccessTokenKsClient client = new OAuthAccessTokenKsClient(KuaiShouConfig.appKey, KuaiShouConfig.appSecret);
try {
- Object ks_refresh_token = redisService.getCacheObject("ks_refresh_token");
- OAuthAccessTokenKsClient client = new OAuthAccessTokenKsClient(KuaiShouConfig.appKey, KuaiShouConfig.appSecret);
- try {
- KsAccessTokenPreviousVersionResponse response = client.refreshAccessToken(ks_refresh_token.toString());
- String token = response.getAccessToken();
- Long expiration_time = response.getExpiresIn();
- String refreshToken = response.getRefreshToken();
- Long refreshTokenExpiresIn = response.getRefreshTokenExpiresIn();
- redisService.setCacheObject("ks_access_token", token, expiration_time, TimeUnit.SECONDS);
- redisService.setCacheObject("ks_refresh_token", refreshToken, refreshTokenExpiresIn, TimeUnit.SECONDS);
- } catch (KsLocalLifeApiException e) {
- throw new RuntimeException(e);
- }
- } catch (TeaException e) {
- System.out.println(e.getMessage());
- } catch (Exception e) {
- System.out.println(e.getMessage());
+ KsAccessTokenPreviousVersionResponse response = client.refreshAccessToken(ks_refresh_token.toString());
+ String token = response.getAccessToken();
+ Long expiration_time = response.getExpiresIn();
+ String refreshToken = response.getRefreshToken();
+ Long refreshTokenExpiresIn = response.getRefreshTokenExpiresIn();
+ redisService.setCacheObject("ks_access_token", token, expiration_time, TimeUnit.SECONDS);
+ redisService.setCacheObject("ks_refresh_token", refreshToken, refreshTokenExpiresIn, TimeUnit.SECONDS);
+ } catch (KsLocalLifeApiException e) {
+ e.printStackTrace();
}
}
}
--
Gitblit v1.7.1