puzhibing
昨天 2a873a04ab9c600b8e0836d1f866a66d87c4b64f
修改bug
7个文件已修改
44 ■■■■■ 已修改文件
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppLotteryEventController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/utils/XiaoeUtils.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/miniapp/AppIntegralController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/miniapp/AppMemberController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/util/OBSUploadUtils.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/util/kuaishou/KSClientTokenUtil.java 28 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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")));
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;
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);
        }
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());
        }
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) {
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.");
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/util/kuaishou/KSClientTokenUtil.java
@@ -51,24 +51,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();
        }
    }
}