From d4c0f477bd0b494414c40bc03170b94e47dfd97f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E8=89=AF=28004796=29?= Date: Tue, 30 Jan 2024 21:11:28 +0800 Subject: [PATCH] 123 --- .../main/java/com/ruoyi}/job/Clear2HoursJob.java | 2 +- .../main/java/com/ruoyi}/job/ClearDaysJob.java | 4 +--- .../src/main/java/com/ruoyi}/job/ForbidJob.java | 2 +- .../java/com/ruoyi}/job/HomeRecommendJob.java | 2 +- .../java/com/ruoyi}/job/IncomeStatisticsJob.java | 2 +- .../src/main/java/com/ruoyi}/job/RankJob.java | 2 +- .../{ => admin}/SysPushController.java | 2 +- .../{ => admin}/SysPushLogController.java | 2 +- .../cai/controller/app/IndexController.java | 16 ++++++++++++++++ .../cai/dto/app/vo/setting/AppHomeConfig.java | 10 ++++++++++ 10 files changed, 34 insertions(+), 10 deletions(-) rename {ruoyi-cai/src/main/java/com/ruoyi/cai => ruoyi-admin/src/main/java/com/ruoyi}/job/Clear2HoursJob.java (97%) rename {ruoyi-cai/src/main/java/com/ruoyi/cai => ruoyi-admin/src/main/java/com/ruoyi}/job/ClearDaysJob.java (85%) rename {ruoyi-cai/src/main/java/com/ruoyi/cai => ruoyi-admin/src/main/java/com/ruoyi}/job/ForbidJob.java (97%) rename {ruoyi-cai/src/main/java/com/ruoyi/cai => ruoyi-admin/src/main/java/com/ruoyi}/job/HomeRecommendJob.java (97%) rename {ruoyi-cai/src/main/java/com/ruoyi/cai => ruoyi-admin/src/main/java/com/ruoyi}/job/IncomeStatisticsJob.java (96%) rename {ruoyi-cai/src/main/java/com/ruoyi/cai => ruoyi-admin/src/main/java/com/ruoyi}/job/RankJob.java (98%) rename ruoyi-cai/src/main/java/com/ruoyi/cai/controller/{ => admin}/SysPushController.java (98%) rename ruoyi-cai/src/main/java/com/ruoyi/cai/controller/{ => admin}/SysPushLogController.java (98%) create mode 100644 ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/setting/AppHomeConfig.java diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/job/Clear2HoursJob.java b/ruoyi-admin/src/main/java/com/ruoyi/job/Clear2HoursJob.java similarity index 97% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/job/Clear2HoursJob.java rename to ruoyi-admin/src/main/java/com/ruoyi/job/Clear2HoursJob.java index e2da9503..22b3d39e 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/job/Clear2HoursJob.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/job/Clear2HoursJob.java @@ -1,4 +1,4 @@ -package com.ruoyi.cai.job; +package com.ruoyi.job; import com.ruoyi.cai.service.DynamicService; import com.ruoyi.cai.service.UserChatRecordService; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/job/ClearDaysJob.java b/ruoyi-admin/src/main/java/com/ruoyi/job/ClearDaysJob.java similarity index 85% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/job/ClearDaysJob.java rename to ruoyi-admin/src/main/java/com/ruoyi/job/ClearDaysJob.java index 7175a2a3..d1f37f4a 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/job/ClearDaysJob.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/job/ClearDaysJob.java @@ -1,8 +1,6 @@ -package com.ruoyi.cai.job; +package com.ruoyi.job; -import com.ruoyi.cai.service.DynamicService; import com.ruoyi.cai.service.SmsVerifyService; -import com.ruoyi.cai.service.UserChatRecordService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Scheduled; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/job/ForbidJob.java b/ruoyi-admin/src/main/java/com/ruoyi/job/ForbidJob.java similarity index 97% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/job/ForbidJob.java rename to ruoyi-admin/src/main/java/com/ruoyi/job/ForbidJob.java index 7d2a71ad..876fa655 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/job/ForbidJob.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/job/ForbidJob.java @@ -1,4 +1,4 @@ -package com.ruoyi.cai.job; +package com.ruoyi.job; import com.ruoyi.cai.manager.UserForbidManager; import com.ruoyi.cai.service.SysPushService; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/job/HomeRecommendJob.java b/ruoyi-admin/src/main/java/com/ruoyi/job/HomeRecommendJob.java similarity index 97% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/job/HomeRecommendJob.java rename to ruoyi-admin/src/main/java/com/ruoyi/job/HomeRecommendJob.java index 94e30af2..7c7ac303 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/job/HomeRecommendJob.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/job/HomeRecommendJob.java @@ -1,4 +1,4 @@ -package com.ruoyi.cai.job; +package com.ruoyi.job; import com.ruoyi.cai.manager.HomeManager; import lombok.extern.slf4j.Slf4j; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/job/IncomeStatisticsJob.java b/ruoyi-admin/src/main/java/com/ruoyi/job/IncomeStatisticsJob.java similarity index 96% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/job/IncomeStatisticsJob.java rename to ruoyi-admin/src/main/java/com/ruoyi/job/IncomeStatisticsJob.java index e2ce883b..f830c140 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/job/IncomeStatisticsJob.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/job/IncomeStatisticsJob.java @@ -1,4 +1,4 @@ -package com.ruoyi.cai.job; +package com.ruoyi.job; import com.ruoyi.cai.service.DayIncomeStatisticsService; import lombok.extern.slf4j.Slf4j; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/job/RankJob.java b/ruoyi-admin/src/main/java/com/ruoyi/job/RankJob.java similarity index 98% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/job/RankJob.java rename to ruoyi-admin/src/main/java/com/ruoyi/job/RankJob.java index 091b96dc..ad7a6f6d 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/job/RankJob.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/job/RankJob.java @@ -1,4 +1,4 @@ -package com.ruoyi.cai.job; +package com.ruoyi.job; import com.ruoyi.cai.service.DayIncomeStatisticsService; import com.ruoyi.cai.service.RankService; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/SysPushController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/SysPushController.java similarity index 98% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/SysPushController.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/SysPushController.java index d370b1bd..853c6e67 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/SysPushController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/SysPushController.java @@ -1,4 +1,4 @@ -package com.ruoyi.cai.controller; +package com.ruoyi.cai.controller.admin; import cn.dev33.satoken.annotation.SaCheckPermission; import com.baomidou.mybatisplus.core.toolkit.Wrappers; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/SysPushLogController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/SysPushLogController.java similarity index 98% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/SysPushLogController.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/SysPushLogController.java index 366581c7..0d6b52d9 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/SysPushLogController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/SysPushLogController.java @@ -1,4 +1,4 @@ -package com.ruoyi.cai.controller; +package com.ruoyi.cai.controller.admin; import cn.dev33.satoken.annotation.SaCheckPermission; import com.baomidou.mybatisplus.core.toolkit.Wrappers; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/IndexController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/IndexController.java index b0e0d0f3..51b63214 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/IndexController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/IndexController.java @@ -1,5 +1,6 @@ package com.ruoyi.cai.controller.app; +import cn.dev33.satoken.annotation.SaIgnore; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.cai.domain.Banner; import com.ruoyi.cai.dto.app.query.index.AnchorListQuery; @@ -9,9 +10,12 @@ import com.ruoyi.cai.dto.app.vo.AnchorListVo; import com.ruoyi.cai.dto.app.vo.IndexBannerVo; import com.ruoyi.cai.dto.app.vo.index.GuardListPageVo; import com.ruoyi.cai.dto.app.vo.index.UserGiftIndexVo; +import com.ruoyi.cai.dto.app.vo.setting.AppHomeConfig; import com.ruoyi.cai.dto.app.vo.user.UserInfoVo; import com.ruoyi.cai.dto.app.vo.user.UserListVo; +import com.ruoyi.cai.enums.SystemConfigEnum; import com.ruoyi.cai.manager.HomeManager; +import com.ruoyi.cai.manager.SystemConfigManager; import com.ruoyi.cai.service.*; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.domain.PageQuery; @@ -45,6 +49,18 @@ public class IndexController { private UserGiftService userGiftService; @Autowired private HomeManager homeManager; + @Autowired + private SystemConfigManager systemConfigManager; + + @GetMapping("/config") + @Operation(summary = "获取APP系统核心参数(无需鉴权可访问)") + @Log(title = "获取APP系统核心参数", businessType = BusinessType.OTHER, isSaveDb = false) + @SaIgnore + public R config(){ + AppHomeConfig config = new AppHomeConfig(); + config.setOssDomain(systemConfigManager.getSystemConfig(SystemConfigEnum.COS_DOMAIN)); + return R.ok(config); + } @GetMapping("/banner") @Operation(summary = "获取首页banner图") diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/setting/AppHomeConfig.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/setting/AppHomeConfig.java new file mode 100644 index 00000000..ca1fd1e9 --- /dev/null +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/setting/AppHomeConfig.java @@ -0,0 +1,10 @@ +package com.ruoyi.cai.dto.app.vo.setting; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +@Data +public class AppHomeConfig { + @Schema(description = "oss文件服务器域名") + private String ossDomain; +}