From 59aba525f8be2102f7e4bcd382aa44047775af1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=AD=E5=87=AF=E5=87=AF?= Date: Mon, 13 Jan 2025 13:58:38 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=9D=A1=E6=AC=BE=E3=80=81=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E5=8D=8F=E8=AE=AE=E3=80=81=E9=9A=90=E7=A7=81=E6=94=BF?= =?UTF-8?q?=E7=AD=96=20=E8=BF=99=E4=BA=9B=E9=95=BFtext=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=EF=BC=8C=E4=B8=BA=E5=87=8F=E7=BC=93=E5=AE=BD=E5=B8=A6=E6=B6=88?= =?UTF-8?q?=E8=80=97=EF=BC=8C=E6=94=BE=E5=88=B0oss=E4=B8=AD=E5=8A=A0?= =?UTF-8?q?=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/app/AppCommonController.java | 7 +++ .../common/service/CommonInfoService.java | 2 + .../service/impl/CommonInfoServiceImpl.java | 54 ++++++++++++++++++- 3 files changed, 62 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/sqx/modules/common/controller/app/AppCommonController.java b/src/main/java/com/sqx/modules/common/controller/app/AppCommonController.java index ec8932ce..607e6e58 100644 --- a/src/main/java/com/sqx/modules/common/controller/app/AppCommonController.java +++ b/src/main/java/com/sqx/modules/common/controller/app/AppCommonController.java @@ -78,4 +78,11 @@ public class AppCommonController { return Result.success(); } + //@PutMapping("putAppUseKvToOss") + //@ResponseBody + public Result putAppUseKvToOss() { + String data = commonService.putOss(); + return Result.success().put("data", data); + } + } diff --git a/src/main/java/com/sqx/modules/common/service/CommonInfoService.java b/src/main/java/com/sqx/modules/common/service/CommonInfoService.java index 1ca3dabc..13b31d7f 100644 --- a/src/main/java/com/sqx/modules/common/service/CommonInfoService.java +++ b/src/main/java/com/sqx/modules/common/service/CommonInfoService.java @@ -45,4 +45,6 @@ public interface CommonInfoService { Map findAppKv(); void cleanAppKv(); + + String putOss(); } \ No newline at end of file diff --git a/src/main/java/com/sqx/modules/common/service/impl/CommonInfoServiceImpl.java b/src/main/java/com/sqx/modules/common/service/impl/CommonInfoServiceImpl.java index 1e0fb0b7..0c9fc7ce 100644 --- a/src/main/java/com/sqx/modules/common/service/impl/CommonInfoServiceImpl.java +++ b/src/main/java/com/sqx/modules/common/service/impl/CommonInfoServiceImpl.java @@ -1,13 +1,20 @@ package com.sqx.modules.common.service.impl; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.io.FileUtil; +import cn.hutool.core.util.StrUtil; +import cn.hutool.json.JSONUtil; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.sqx.common.utils.RedisUtils; import com.sqx.common.utils.Result; import com.sqx.modules.common.dao.CommonInfoDao; import com.sqx.modules.common.entity.CommonInfo; import com.sqx.modules.common.service.CommonInfoService; import com.sqx.modules.course.service.CourseService; +import com.sqx.modules.oss.cloud.OSSFactory; +import com.sqx.modules.oss.entity.SysOssEntity; +import com.sqx.modules.oss.service.SysOssService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cache.CacheManager; import org.springframework.cache.annotation.CacheConfig; @@ -15,6 +22,7 @@ import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; +import java.io.File; import java.text.SimpleDateFormat; import java.util.Date; import java.util.HashMap; @@ -37,6 +45,10 @@ public class CommonInfoServiceImpl extends ServiceImpl findAppKv() { - List list = commonInfoDao.selectList(Wrappers.lambdaQuery().eq(CommonInfo::getIsAppUse, 1).orderByAsc(CommonInfo::getType).orderByAsc(CommonInfo::getId)); + List list = commonInfoDao.selectList(Wrappers.lambdaQuery() + .eq(CommonInfo::getIsAppUse, 1) + .orderByAsc(CommonInfo::getType) + .orderByAsc(CommonInfo::getId)); if (CollUtil.isEmpty(list)) { return new HashMap<>(0); } Map data = list.stream().collect(Collectors.toMap(CommonInfo::getType, CommonInfo::getValue)); + String url = putOss(); + // 移除 条款、服务协议、隐私政策 这些长text字段，为减缓宽带消耗，放到oss中加载 + data.put(154, url); + data.put(155, url); + data.put(246, url); return data; } @Override public void cleanAppKv() { cacheManager.getCache("commonInfoAppKv").clear(); + redisUtils.delete(SYS_OSS_CONFIG_JSON_URL_KEY); + } + + private static final String SYS_OSS_CONFIG_JSON_URL_KEY = "SYS_OSS_CONFIG_JSON_URL"; + + @Override + public String putOss() { + String url = redisUtils.get(SYS_OSS_CONFIG_JSON_URL_KEY); + if (StrUtil.isNotBlank(url)) { + return url; + } + List list = commonInfoDao.selectList(Wrappers.lambdaQuery() + .eq(CommonInfo::getIsAppUse, 1) + .in(CommonInfo::getType, 154, 155, 246)); + if (CollUtil.isEmpty(list)) { + return ""; + } + Map data = list.stream().collect(Collectors.toMap(CommonInfo::getType, CommonInfo::getValue)); + String jsonStr = JSONUtil.toJsonStr(data); + File file = FileUtil.createTempFile("hutool", ".json", null, true); + FileUtil.writeUtf8String(jsonStr, file); + //上传文件 + String suffix = FileUtil.extName(file); + url = OSSFactory.build().uploadSuffix(FileUtil.readBytes(file), "." + suffix); + file.delete(); + //保存文件信息 + SysOssEntity ossEntity = new SysOssEntity(); + ossEntity.setUrl(url); + ossEntity.setCreateDate(new Date()); + sysOssService.save(ossEntity); + redisUtils.set(SYS_OSS_CONFIG_JSON_URL_KEY, url); + return url; } } \ No newline at end of file From d7d659c30990184f1bf0848f2dadf00afc2657a2 Mon Sep 17 00:00:00 2001 From: GYJ <1157756119@qq.com> Date: Mon, 13 Jan 2025 14:05:43 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E8=BD=AC=E7=9B=98=E5=A5=96=E9=A1=B9?= =?UTF-8?q?=E9=A2=86=E5=8F=96=20=20=E6=8B=89=E9=BB=91=E5=8F=96=E6=B6=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/discSpinning/controller/DiscSpinningController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/sqx/modules/discSpinning/controller/DiscSpinningController.java b/src/main/java/com/sqx/modules/discSpinning/controller/DiscSpinningController.java index cbf4ad90..cbdd5fdd 100644 --- a/src/main/java/com/sqx/modules/discSpinning/controller/DiscSpinningController.java +++ b/src/main/java/com/sqx/modules/discSpinning/controller/DiscSpinningController.java @@ -246,7 +246,7 @@ public class DiscSpinningController { @RequestMapping("/app/discSpinning/receive") @Login public Result receive(@RequestAttribute("userId") Long userId) { - userService.addBlackUser(userId, "转盘奖项领取"); +// userService.addBlackUser(userId, "转盘奖项领取"); return Result.success().put("data", 1); } From 4f21e0af7b9810ce44b7ccf4305807532d85fc2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=AD=E5=87=AF=E5=87=AF?= Date: Mon, 13 Jan 2025 14:18:11 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=9A=82=E6=97=B6=E5=85=B3=E9=97=AD?= =?UTF-8?q?=E5=85=91=E6=8D=A2=E5=A5=96=E5=93=81=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/controller/AppUserPrizeExchangeController.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/sqx/modules/app/controller/AppUserPrizeExchangeController.java b/src/main/java/com/sqx/modules/app/controller/AppUserPrizeExchangeController.java index 82ff4e6a..4b44a3fb 100644 --- a/src/main/java/com/sqx/modules/app/controller/AppUserPrizeExchangeController.java +++ b/src/main/java/com/sqx/modules/app/controller/AppUserPrizeExchangeController.java @@ -44,8 +44,9 @@ public class AppUserPrizeExchangeController { @PostMapping("/exchange") @ApiOperation("兑换") public Result exchange(@RequestAttribute("userId") Long userId, @RequestBody UserPrizeExchange entity) { - userPrizeExchangeService.exchange(userId, entity); - return Result.success(); + //userPrizeExchangeService.exchange(userId, entity); + //return Result.success(); + return Result.error("奖品正在路上，请耐心等待"); } @Login From 1dcf56ed0e9484fbd7f78c7ca0037f359c136892 Mon Sep 17 00:00:00 2001 From: GYJ <1157756119@qq.com> Date: Mon, 13 Jan 2025 14:24:14 +0800 Subject: [PATCH 4/4] =?UTF-8?q?selectDiscSpinningAmount=20=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=20=E5=88=86=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DiscSpinningAmountController.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/sqx/modules/discSpinning/controller/DiscSpinningAmountController.java b/src/main/java/com/sqx/modules/discSpinning/controller/DiscSpinningAmountController.java index 8d9708c3..92065e9a 100644 --- a/src/main/java/com/sqx/modules/discSpinning/controller/DiscSpinningAmountController.java +++ b/src/main/java/com/sqx/modules/discSpinning/controller/DiscSpinningAmountController.java @@ -2,6 +2,9 @@ package com.sqx.modules.discSpinning.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.sqx.common.utils.PageUtils; import com.sqx.common.utils.RedisKeys; import com.sqx.common.utils.RedisUtils; import com.sqx.common.utils.Result; @@ -13,6 +16,8 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.List; + @Slf4j @RestController @Api(value = "现金红包 抽奖配置", tags = {"现金红包 抽奖金额配置"}) @@ -59,7 +64,10 @@ public class DiscSpinningAmountController { @GetMapping("/selectDiscSpinningAmount") @ApiOperation("查询现金红包 抽奖配置") public Result selectDiscSpinningAmount(Integer page, Integer limit) { - return Result.success().put("data", discSpinningAmountService.page(new Page<>(page, limit), new QueryWrapper().orderByDesc("status").orderByAsc("num","random","max_amount"))); + PageHelper.startPage(page, limit); + List list = discSpinningAmountService.list(new QueryWrapper().orderByDesc("status").orderByAsc("num", "random", "max_amount")); + PageInfo pageInfo = new PageInfo<>(list); + return Result.success().put("data", PageUtils.page(pageInfo, true)); } }