diff --git a/schisandra-cloud-storage-admin/schisandra-cloud-storage-admin-application/schisandra-cloud-storage-admin-application-controller/pom.xml b/schisandra-cloud-storage-admin/schisandra-cloud-storage-admin-application/schisandra-cloud-storage-admin-application-controller/pom.xml index a3d999c..4f310fa 100644 --- a/schisandra-cloud-storage-admin/schisandra-cloud-storage-admin-application/schisandra-cloud-storage-admin-application-controller/pom.xml +++ b/schisandra-cloud-storage-admin/schisandra-cloud-storage-admin-application/schisandra-cloud-storage-admin-application-controller/pom.xml @@ -35,6 +35,16 @@ schisandra-cloud-storage-oss-api 1.0-SNAPSHOT + + com.schisandra.system + schisandra-cloud-storage-system-api + 1.0-SNAPSHOT + + + com.schisandra.share + schisandra-cloud-storage-share-api + 1.0-SNAPSHOT + diff --git a/schisandra-cloud-storage-admin/schisandra-cloud-storage-admin-application/schisandra-cloud-storage-admin-application-controller/src/main/java/com/schisandra/admin/application/controller/SchisandraAdminController.java b/schisandra-cloud-storage-admin/schisandra-cloud-storage-admin-application/schisandra-cloud-storage-admin-application-controller/src/main/java/com/schisandra/admin/application/controller/SchisandraAdminController.java index 074011c..95a8795 100644 --- a/schisandra-cloud-storage-admin/schisandra-cloud-storage-admin-application/schisandra-cloud-storage-admin-application-controller/src/main/java/com/schisandra/admin/application/controller/SchisandraAdminController.java +++ b/schisandra-cloud-storage-admin/schisandra-cloud-storage-admin-application/schisandra-cloud-storage-admin-application-controller/src/main/java/com/schisandra/admin/application/controller/SchisandraAdminController.java @@ -3,6 +3,8 @@ package com.schisandra.admin.application.controller; import com.schisandra.auth.api.SchisandraAuthFeignService; import com.schisandra.auth.entity.Result; import com.schisandra.oss.api.SchisandraOssFeignService; +import com.schisandra.share.api.SchisandraShareFeignService; +import com.schisandra.system.api.SchisandraSystemFeignService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; import org.springframework.stereotype.Controller; @@ -21,6 +23,11 @@ public class SchisandraAdminController { @Resource SchisandraOssFeignService schisandraOssFeignService; + + @Resource + SchisandraShareFeignService schisandraShareFeignService; + @Resource + SchisandraSystemFeignService schisandraSystemFeignService; /** * @description: 获取用户信息 * @param: [] @@ -143,5 +150,94 @@ public class SchisandraAdminController { } } + @GetMapping("selectShareCircle") + public Result selectShareCircle(){ + try { + return Result.ok(schisandraShareFeignService.getShareCircleList()); + }catch (Exception e){ + return Result.fail("获取分享圈失败"); + } + } + @GetMapping("selectShareDetail") + public Result selectShareCircleDetail(){ + try { + return Result.ok(schisandraShareFeignService.getShareDetailList()); + }catch (Exception e){ + return Result.fail("获取分享失败"); + } + } + @GetMapping("selectShareTags") + public Result selectShareTags(){ + try { + return Result.ok(schisandraShareFeignService.getShareTagsList()); + }catch (Exception e){ + return Result.fail("获取分享标签失败"); + } + } + @GetMapping("selectShareComment") + public Result selectShareComment(){ + try { + return Result.ok(schisandraShareFeignService.getShareCommentList()); + }catch (Exception e){ + return Result.fail("获取评论失败"); + } + } + @GetMapping("selectShareMessage") + public Result selectShareMessage(){ + try { + return Result.ok(schisandraShareFeignService.getShareMessageList()); + }catch (Exception e){ + return Result.fail("获取消息失败"); + } + } + @GetMapping("selectShareUrl") + public Result selectShareUrl(){ + try { + return Result.ok(schisandraShareFeignService.getShareUrlList()); + }catch (Exception e){ + return Result.fail("获取分享链接失败"); + } + } + @GetMapping("selectDetaileTags") + public Result selectDetaileTags(){ + try { + return Result.ok(schisandraShareFeignService.getAllDetaileTags()); + }catch (Exception e){ + return Result.fail("获取分享标签失败"); + } + } + + @GetMapping("selectSysConfig") + public Result selectSysConfig(){ + try { + return Result.ok(schisandraSystemFeignService.listSysConfig()); + }catch (Exception e){ + return Result.fail("获取系统配置失败"); + } + } + @GetMapping("selectSysLog") + public Result selectSysLog(){ + try { + return Result.ok(schisandraSystemFeignService.listSysLog()); + }catch (Exception e){ + return Result.fail("获取系统日志失败"); + } + } + @GetMapping("selectSysOauth") + public Result selectSysOauth(){ + try { + return Result.ok(schisandraSystemFeignService.listSysOauth()); + }catch (Exception e){ + return Result.fail("获取系统第三方登录失败"); + } + } + @GetMapping("selectSysSms") + public Result selectSysSms(){ + try { + return Result.ok(schisandraSystemFeignService.listSysSms()); + }catch (Exception e){ + return Result.fail("获取系统短信配置失败"); + } + } } diff --git a/schisandra-cloud-storage-admin/schisandra-cloud-storage-admin-starter/pom.xml b/schisandra-cloud-storage-admin/schisandra-cloud-storage-admin-starter/pom.xml index 5493fd6..a52694a 100644 --- a/schisandra-cloud-storage-admin/schisandra-cloud-storage-admin-starter/pom.xml +++ b/schisandra-cloud-storage-admin/schisandra-cloud-storage-admin-starter/pom.xml @@ -18,6 +18,13 @@ org.springframework.boot spring-boot-starter-web 2.4.2 + + + + org.springframework.boot + spring-boot-starter-logging + + diff --git a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-api/pom.xml b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-api/pom.xml index bbc79de..492db6a 100644 --- a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-api/pom.xml +++ b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-api/pom.xml @@ -37,5 +37,10 @@ lombok 1.18.24 + + com.schisandra.share + schisandra-cloud-storage-share-common + 1.0-SNAPSHOT + diff --git a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-api/src/main/java/com/schisandra/share/api/SchisandraShareFeignService.java b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-api/src/main/java/com/schisandra/share/api/SchisandraShareFeignService.java new file mode 100644 index 0000000..9756136 --- /dev/null +++ b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-api/src/main/java/com/schisandra/share/api/SchisandraShareFeignService.java @@ -0,0 +1,29 @@ +package com.schisandra.share.api; + +import com.schisandra.share.common.entity.Result; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; + +@FeignClient("schisandra-cloud-storage-share") +public interface SchisandraShareFeignService { + @GetMapping("/share/circle/sharelist") + public Result getShareCircleList(); + + @GetMapping("/share/comment/reply/returnAllComment") + public Result getShareCommentList(); + + @GetMapping("/share/detail/returnAllDetails") + public Result getShareDetailList(); + + @GetMapping("/share/detail/tag/getAllDetaileTags") + public Result getAllDetaileTags(); + + @GetMapping("/share/message/list") + public Result getShareMessageList(); + + @GetMapping("/share/tags/list") + public Result getShareTagsList(); + + @GetMapping("/share/url/list") + public Result getShareUrlList(); +} diff --git a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-application/schisandra-cloud-storage-share-application-controller/src/main/java/com/schisandra/share/application/config/GlobalConfig.java b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-application/schisandra-cloud-storage-share-application-controller/src/main/java/com/schisandra/share/application/config/GlobalConfig.java new file mode 100644 index 0000000..3e844eb --- /dev/null +++ b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-application/schisandra-cloud-storage-share-application-controller/src/main/java/com/schisandra/share/application/config/GlobalConfig.java @@ -0,0 +1,38 @@ +package com.schisandra.share.application.config; + +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.SerializationFeature; +import org.springframework.context.annotation.Configuration; +import org.springframework.http.converter.HttpMessageConverter; +import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport; + +import java.util.List; + +/** + * @Classname GlobalConfig + * @BelongsProject: schisandra-cloud-storage + * @BelongsPackage: com.schisandra.auth.application.common + * @Author: schisandra + * @CreateTime: 2024-02-16 15:57 + * @Description: MVC全局处理 + * @Version: 1.0 + */ +@Configuration +public class GlobalConfig extends WebMvcConfigurationSupport { + + @Override + protected void configureMessageConverters(List> converters) { + super.configureMessageConverters(converters); + converters.add(mappingJackson2HttpMessageConverter()); + } + + private MappingJackson2HttpMessageConverter mappingJackson2HttpMessageConverter() { + ObjectMapper objectMapper = new ObjectMapper(); + objectMapper.configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false); + objectMapper.setSerializationInclusion(JsonInclude.Include.NON_NULL); + MappingJackson2HttpMessageConverter converter = new MappingJackson2HttpMessageConverter(objectMapper); + return converter; + } +} diff --git a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-application/schisandra-cloud-storage-share-application-controller/src/main/java/com/schisandra/share/application/config/ThreadPoolConfig.java b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-application/schisandra-cloud-storage-share-application-controller/src/main/java/com/schisandra/share/application/config/ThreadPoolConfig.java new file mode 100644 index 0000000..71cd44f --- /dev/null +++ b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-application/schisandra-cloud-storage-share-application-controller/src/main/java/com/schisandra/share/application/config/ThreadPoolConfig.java @@ -0,0 +1,28 @@ +package com.schisandra.share.application.config; + + +import com.schisandra.share.application.factory.CustomNameThreadFactory; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +import java.util.concurrent.LinkedBlockingDeque; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.concurrent.TimeUnit; + +/** + * 线程池的config管理 + * + * @author: landaiqing + * @date: 2024/2/18 + */ +@Configuration +public class ThreadPoolConfig { + + @Bean(name = "rotateCaptchaThreadPool") + public ThreadPoolExecutor getLabelThreadPool() { + return new ThreadPoolExecutor(20, 100, 5, + TimeUnit.SECONDS, new LinkedBlockingDeque<>(40), + new CustomNameThreadFactory("rotateCaptcha"), + new ThreadPoolExecutor.CallerRunsPolicy()); + } +} diff --git a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-application/schisandra-cloud-storage-share-application-controller/src/main/java/com/schisandra/share/application/controller/SchisandraShareCircleController.java b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-application/schisandra-cloud-storage-share-application-controller/src/main/java/com/schisandra/share/application/controller/SchisandraShareCircleController.java index b331407..86e3124 100644 --- a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-application/schisandra-cloud-storage-share-application-controller/src/main/java/com/schisandra/share/application/controller/SchisandraShareCircleController.java +++ b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-application/schisandra-cloud-storage-share-application-controller/src/main/java/com/schisandra/share/application/controller/SchisandraShareCircleController.java @@ -150,4 +150,6 @@ public class SchisandraShareCircleController { } + + } diff --git a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-application/schisandra-cloud-storage-share-application-controller/src/main/java/com/schisandra/share/application/controller/SchisandraShareCommentReplyController.java b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-application/schisandra-cloud-storage-share-application-controller/src/main/java/com/schisandra/share/application/controller/SchisandraShareCommentReplyController.java index 656b847..c5db61f 100644 --- a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-application/schisandra-cloud-storage-share-application-controller/src/main/java/com/schisandra/share/application/controller/SchisandraShareCommentReplyController.java +++ b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-application/schisandra-cloud-storage-share-application-controller/src/main/java/com/schisandra/share/application/controller/SchisandraShareCommentReplyController.java @@ -339,5 +339,16 @@ public class SchisandraShareCommentReplyController { } } + @GetMapping("returnAllComment") + public Result returnAllComment() { + List listAllComment = schisandraShareCommentReplyDomainService.listAllComment(); + List listAllCommentDTO = SchisandraShareCommentReplyDTOConverter.INSTANCE.convertBOToDTOList(listAllComment); + if (listAllCommentDTO != null) { + return Result.ok(schisandraShareCommentReplyDomainService.listAllComment()); + }else { + return Result.fail(); + } + + } } diff --git a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-application/schisandra-cloud-storage-share-application-controller/src/main/java/com/schisandra/share/application/controller/SchisandraShareDetailController.java b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-application/schisandra-cloud-storage-share-application-controller/src/main/java/com/schisandra/share/application/controller/SchisandraShareDetailController.java index c5c910e..222623c 100644 --- a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-application/schisandra-cloud-storage-share-application-controller/src/main/java/com/schisandra/share/application/controller/SchisandraShareDetailController.java +++ b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-application/schisandra-cloud-storage-share-application-controller/src/main/java/com/schisandra/share/application/controller/SchisandraShareDetailController.java @@ -13,6 +13,7 @@ import com.schisandra.share.common.utils.CaffeineUtil; import com.schisandra.share.domain.bo.SchisandraShareDetailBO; import com.schisandra.share.domain.bo.SchisandraUserLikesDetailBO; import com.schisandra.share.domain.service.SchisandraShareDetailDomainService; +import feign.form.FormData; import lombok.extern.slf4j.Slf4j; import org.apache.rocketmq.client.producer.SendCallback; import org.apache.rocketmq.client.producer.SendResult; @@ -350,4 +351,11 @@ public class SchisandraShareDetailController { } + @GetMapping("returnAllDetails") + public Result> returnAllDetails(@RequestParam("circleId") Long circleId) { + List shareDetailBOList= schisandraShareDetailDomainService.queryAllDetails(); + List schisandraShareDetailDTOS=SchisandraShareDetailDTOConverter.INSTANCE.convertBOToDTOList(shareDetailBOList); + return Result.ok(schisandraShareDetailDTOS); + } + } diff --git a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-application/schisandra-cloud-storage-share-application-controller/src/main/java/com/schisandra/share/application/controller/SchisandraShareDetailTagController.java b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-application/schisandra-cloud-storage-share-application-controller/src/main/java/com/schisandra/share/application/controller/SchisandraShareDetailTagController.java index 142f934..76c016c 100644 --- a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-application/schisandra-cloud-storage-share-application-controller/src/main/java/com/schisandra/share/application/controller/SchisandraShareDetailTagController.java +++ b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-application/schisandra-cloud-storage-share-application-controller/src/main/java/com/schisandra/share/application/controller/SchisandraShareDetailTagController.java @@ -8,11 +8,13 @@ import com.schisandra.share.common.entity.Result; import com.schisandra.share.domain.bo.SchisandraShareDetailTagBO; import com.schisandra.share.domain.service.SchisandraShareDetailTagDomainService; import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; +import java.util.List; /** * 详情/标签映射表 controller @@ -21,7 +23,7 @@ import javax.annotation.Resource; * @since 2024-07-15 09:12:51 */ @RestController -@RequestMapping("/share/detail/tag//") +@RequestMapping("/share/detail/tag/") @Slf4j public class SchisandraShareDetailTagController { @@ -97,4 +99,10 @@ public class SchisandraShareDetailTagController { } + @GetMapping("getAllDetaileTags") + public Result getAllDetaileTags(){ + List allDetaileTages = schisandraShareDetailTagDomainService.getAllDetaileTages(); + return Result.ok(SchisandraShareDetailTagDTOConverter.INSTANCE.convertBOToDTOList(allDetaileTages)); + } + } diff --git a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-application/schisandra-cloud-storage-share-application-controller/src/main/java/com/schisandra/share/application/controller/SchisandraShareMessageController.java b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-application/schisandra-cloud-storage-share-application-controller/src/main/java/com/schisandra/share/application/controller/SchisandraShareMessageController.java index f2045dc..c2c49c5 100644 --- a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-application/schisandra-cloud-storage-share-application-controller/src/main/java/com/schisandra/share/application/controller/SchisandraShareMessageController.java +++ b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-application/schisandra-cloud-storage-share-application-controller/src/main/java/com/schisandra/share/application/controller/SchisandraShareMessageController.java @@ -8,11 +8,13 @@ import com.schisandra.share.common.entity.Result; import com.schisandra.share.domain.bo.SchisandraShareMessageBO; import com.schisandra.share.domain.service.SchisandraShareMessageDomainService; import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; +import java.util.List; /** * 消息表 controller @@ -21,7 +23,7 @@ import javax.annotation.Resource; * @since 2024-07-15 09:27:27 */ @RestController -@RequestMapping("/share/message//") +@RequestMapping("/share/message/") @Slf4j public class SchisandraShareMessageController { @@ -118,4 +120,9 @@ public class SchisandraShareMessageController { } + @GetMapping("list") + public Result> list() { + return Result.ok(schisandraShareMessageDomainService.queryAll()); + } + } diff --git a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-application/schisandra-cloud-storage-share-application-controller/src/main/java/com/schisandra/share/application/controller/SchisandraShareTagsController.java b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-application/schisandra-cloud-storage-share-application-controller/src/main/java/com/schisandra/share/application/controller/SchisandraShareTagsController.java index 3cc01d5..d6042dc 100644 --- a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-application/schisandra-cloud-storage-share-application-controller/src/main/java/com/schisandra/share/application/controller/SchisandraShareTagsController.java +++ b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-application/schisandra-cloud-storage-share-application-controller/src/main/java/com/schisandra/share/application/controller/SchisandraShareTagsController.java @@ -8,11 +8,13 @@ import com.schisandra.share.common.entity.Result; import com.schisandra.share.domain.bo.SchisandraShareTagsBO; import com.schisandra.share.domain.service.SchisandraShareTagsDomainService; import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; +import java.util.List; /** * 分享详情标签表 controller @@ -112,4 +114,9 @@ public class SchisandraShareTagsController { } + @GetMapping("list") + public Result list() { + return Result.ok(schisandraShareTagsDomainService.queryAll()); + } + } diff --git a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-application/schisandra-cloud-storage-share-application-controller/src/main/java/com/schisandra/share/application/controller/SchisandraShareUrlController.java b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-application/schisandra-cloud-storage-share-application-controller/src/main/java/com/schisandra/share/application/controller/SchisandraShareUrlController.java index 2513b4d..fdae1f5 100644 --- a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-application/schisandra-cloud-storage-share-application-controller/src/main/java/com/schisandra/share/application/controller/SchisandraShareUrlController.java +++ b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-application/schisandra-cloud-storage-share-application-controller/src/main/java/com/schisandra/share/application/controller/SchisandraShareUrlController.java @@ -8,11 +8,13 @@ import com.schisandra.share.common.entity.Result; import com.schisandra.share.domain.bo.SchisandraShareUrlBO; import com.schisandra.share.domain.service.SchisandraShareUrlDomainService; import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; +import java.util.List; /** * 分享链接 controller @@ -21,7 +23,7 @@ import javax.annotation.Resource; * @since 2024-07-15 09:14:01 */ @RestController -@RequestMapping("/share/url//") +@RequestMapping("/share/url/") @Slf4j public class SchisandraShareUrlController { @@ -121,4 +123,8 @@ public class SchisandraShareUrlController { } -} + @GetMapping("list") + public Result list() { + return Result.ok(schisandraShareUrlDomainService.queryAll()); + } +} \ No newline at end of file diff --git a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-application/schisandra-cloud-storage-share-application-controller/src/main/java/com/schisandra/share/application/factory/CustomNameThreadFactory.java b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-application/schisandra-cloud-storage-share-application-controller/src/main/java/com/schisandra/share/application/factory/CustomNameThreadFactory.java new file mode 100644 index 0000000..8dd8145 --- /dev/null +++ b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-application/schisandra-cloud-storage-share-application-controller/src/main/java/com/schisandra/share/application/factory/CustomNameThreadFactory.java @@ -0,0 +1,49 @@ +package com.schisandra.share.application.factory; + +import org.apache.commons.lang3.StringUtils; + +import java.util.concurrent.ThreadFactory; +import java.util.concurrent.atomic.AtomicInteger; + +/** + * 自定义名称的线程工厂 + * + * @author: landaiqing + * @date: 2024/2/18 + */ +public class CustomNameThreadFactory implements ThreadFactory { + + private static final AtomicInteger poolNumber = new AtomicInteger(1); + private final ThreadGroup group; + private final AtomicInteger threadNumber = new AtomicInteger(1); + private final String namePrefix; + + public CustomNameThreadFactory(String name) { + SecurityManager s = System.getSecurityManager(); + group = (s != null) ? s.getThreadGroup() : + Thread.currentThread().getThreadGroup(); + if (StringUtils.isBlank(name)) { + name = "pool"; + } + namePrefix = name + "-" + + poolNumber.getAndIncrement() + + "-thread-"; + } + + @Override + public Thread newThread(Runnable r) { + Thread t = new Thread(group, r, + namePrefix + threadNumber.getAndIncrement(), + 0); + // 设置线程为非守护线程 + if (t.isDaemon()){ + t.setDaemon(false); + } + // 设置线程优先级为正常优先级 + if (t.getPriority() != Thread.NORM_PRIORITY){ + t.setPriority(Thread.NORM_PRIORITY); + } + return t; + } + +} diff --git a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/service/SchisandraShareCommentReplyDomainService.java b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/service/SchisandraShareCommentReplyDomainService.java index cc48242..1c332bc 100644 --- a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/service/SchisandraShareCommentReplyDomainService.java +++ b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/service/SchisandraShareCommentReplyDomainService.java @@ -43,4 +43,6 @@ public interface SchisandraShareCommentReplyDomainService { Boolean updateCommentsLikes(String Id, Boolean isLike); Long returnCount(String detailId); + + List listAllComment(); } diff --git a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/service/SchisandraShareDetailDomainService.java b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/service/SchisandraShareDetailDomainService.java index 8ce081c..43519f9 100644 --- a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/service/SchisandraShareDetailDomainService.java +++ b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/service/SchisandraShareDetailDomainService.java @@ -42,4 +42,5 @@ public interface SchisandraShareDetailDomainService { Boolean updateDetailLikes(String id,Boolean isLike); + List queryAllDetails(); } diff --git a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/service/SchisandraShareDetailTagDomainService.java b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/service/SchisandraShareDetailTagDomainService.java index 2bc99df..82871d1 100644 --- a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/service/SchisandraShareDetailTagDomainService.java +++ b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/service/SchisandraShareDetailTagDomainService.java @@ -27,4 +27,7 @@ public interface SchisandraShareDetailTagDomainService { * 删除 详情/标签映射表 信息 */ Boolean delete(SchisandraShareDetailTagBO schisandraShareDetailTagBO); + + + List getAllDetaileTages(); } diff --git a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/service/SchisandraShareMessageDomainService.java b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/service/SchisandraShareMessageDomainService.java index b239b19..f6264a3 100644 --- a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/service/SchisandraShareMessageDomainService.java +++ b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/service/SchisandraShareMessageDomainService.java @@ -1,6 +1,9 @@ package com.schisandra.share.domain.service; import com.schisandra.share.domain.bo.SchisandraShareMessageBO; +import com.schisandra.share.infra.basic.entity.SchisandraShareMessage; + +import java.util.List; /** * 消息表 领域service @@ -25,4 +28,6 @@ public interface SchisandraShareMessageDomainService { */ Boolean delete(SchisandraShareMessageBO schisandraShareMessageBO); + List queryAll(); + } diff --git a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/service/SchisandraShareTagsDomainService.java b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/service/SchisandraShareTagsDomainService.java index 3821314..c786de3 100644 --- a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/service/SchisandraShareTagsDomainService.java +++ b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/service/SchisandraShareTagsDomainService.java @@ -1,6 +1,9 @@ package com.schisandra.share.domain.service; import com.schisandra.share.domain.bo.SchisandraShareTagsBO; +import com.schisandra.share.infra.basic.entity.SchisandraShareTags; + +import java.util.List; /** * 分享详情标签表 领域service @@ -25,4 +28,6 @@ public interface SchisandraShareTagsDomainService { */ Boolean delete(SchisandraShareTagsBO schisandraShareTagsBO); + List queryAll(); + } diff --git a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/service/SchisandraShareUrlDomainService.java b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/service/SchisandraShareUrlDomainService.java index 32ffecd..6ba46da 100644 --- a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/service/SchisandraShareUrlDomainService.java +++ b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/service/SchisandraShareUrlDomainService.java @@ -1,6 +1,9 @@ package com.schisandra.share.domain.service; import com.schisandra.share.domain.bo.SchisandraShareUrlBO; +import com.schisandra.share.infra.basic.entity.SchisandraShareUrl; + +import java.util.List; /** * 分享链接 领域service @@ -25,4 +28,6 @@ public interface SchisandraShareUrlDomainService { */ Boolean delete(SchisandraShareUrlBO schisandraShareUrlBO); + List queryAll(); + } diff --git a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/service/impl/SchisandraShareCircleDomainServiceImpl.java b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/service/impl/SchisandraShareCircleDomainServiceImpl.java index 0430e29..a528866 100644 --- a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/service/impl/SchisandraShareCircleDomainServiceImpl.java +++ b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/service/impl/SchisandraShareCircleDomainServiceImpl.java @@ -1,20 +1,20 @@ package com.schisandra.share.domain.service.impl; import com.schisandra.share.common.enums.IsDeletedFlagEnum; -import com.schisandra.share.domain.convert.SchisandraShareCircleBOConverter; import com.schisandra.share.domain.bo.SchisandraShareCircleBO; +import com.schisandra.share.domain.convert.SchisandraShareCircleBOConverter; import com.schisandra.share.domain.service.SchisandraShareCircleDomainService; import com.schisandra.share.infra.basic.entity.SchisandraShareCircle; import com.schisandra.share.infra.basic.service.SchisandraShareCircleService; import com.schisandra.share.infra.entity.AuthUserInfoEntity; import com.schisandra.share.infra.rpc.UserRpc; import lombok.extern.slf4j.Slf4j; -import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Service; import javax.annotation.Resource; -import java.util.List; import java.util.ArrayList; +import java.util.List; +import java.util.concurrent.CompletableFuture; /** * 分享圈 领域service实现了 @@ -63,8 +63,12 @@ public class SchisandraShareCircleDomainServiceImpl implements SchisandraShareCi List schisandraShareCircleBO_list = SchisandraShareCircleBOConverter.INSTANCE.convertEntityToBOList(schisandraShareCircleService.queryAll()); ArrayList arrayList = new ArrayList<>(); for (SchisandraShareCircleBO schisandraShareCircleBO : schisandraShareCircleBO_list) { + CompletableFuture futurePrice = CompletableFuture.supplyAsync(() -> { + AuthUserInfoEntity info = userRpc.getUserInfo(schisandraShareCircleBO.getUserId()); + return info; + }); + AuthUserInfoEntity userInfo = futurePrice.join(); SchisandraShareCircleBO shareCircleBO = new SchisandraShareCircleBO(); - AuthUserInfoEntity info = userRpc.getUserInfo(schisandraShareCircleBO.getUserId()); shareCircleBO.setUserId(schisandraShareCircleBO.getUserId()); shareCircleBO.setParentId(schisandraShareCircleBO.getParentId()); shareCircleBO.setId(schisandraShareCircleBO.getId()); @@ -73,8 +77,8 @@ public class SchisandraShareCircleDomainServiceImpl implements SchisandraShareCi shareCircleBO.setViews(schisandraShareCircleBO.getViews()); shareCircleBO.setCount(schisandraShareCircleBO.getCount()); shareCircleBO.setName(schisandraShareCircleBO.getName()); - shareCircleBO.setAvatar(info.getAvatar()); - shareCircleBO.setNickName(info.getNickName()); + shareCircleBO.setAvatar(userInfo.getAvatar()); + shareCircleBO.setNickName(userInfo.getNickName()); arrayList.add(shareCircleBO); } return arrayList; @@ -83,18 +87,18 @@ public class SchisandraShareCircleDomainServiceImpl implements SchisandraShareCi @Override public Boolean updateCircleViews(String Id, Boolean isView) { if (isView) { - return schisandraShareCircleService.addView(Id)>0; - }else { - return schisandraShareCircleService.delView(Id)>0; + return schisandraShareCircleService.addView(Id) > 0; + } else { + return schisandraShareCircleService.delView(Id) > 0; } } @Override public Boolean updateCircleCounts(String Id, Boolean isCount) { if (isCount) { - return schisandraShareCircleService.addCount(Id)>0; - }else { - return schisandraShareCircleService.delCount(Id)>0; + return schisandraShareCircleService.addCount(Id) > 0; + } else { + return schisandraShareCircleService.delCount(Id) > 0; } } diff --git a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/service/impl/SchisandraShareCommentReplyDomainServiceImpl.java b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/service/impl/SchisandraShareCommentReplyDomainServiceImpl.java index ced68f8..0abdb3b 100644 --- a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/service/impl/SchisandraShareCommentReplyDomainServiceImpl.java +++ b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/service/impl/SchisandraShareCommentReplyDomainServiceImpl.java @@ -1,8 +1,11 @@ package com.schisandra.share.domain.service.impl; +import com.jd.platform.async.executor.Async; +import com.jd.platform.async.worker.WorkResult; +import com.jd.platform.async.wrapper.WorkerWrapper; import com.schisandra.share.common.enums.IsDeletedFlagEnum; -import com.schisandra.share.domain.convert.SchisandraShareCommentReplyBOConverter; import com.schisandra.share.domain.bo.SchisandraShareCommentReplyBO; +import com.schisandra.share.domain.convert.SchisandraShareCommentReplyBOConverter; import com.schisandra.share.domain.service.SchisandraShareCommentReplyDomainService; import com.schisandra.share.infra.basic.entity.SchisandraShareCommentReply; import com.schisandra.share.infra.basic.entity.SchisandraUserLikesComment; @@ -17,6 +20,7 @@ import org.springframework.stereotype.Service; import org.springframework.util.Assert; import javax.annotation.Resource; +import java.util.ArrayList; import java.util.List; @@ -186,4 +190,15 @@ public class SchisandraShareCommentReplyDomainServiceImpl implements SchisandraS public Long returnCount(String detailId) { return schisandraShareCommentReplyService.returnCount(detailId); } + + @Override + public List listAllComment() { + List schisandraShareComments = schisandraShareCommentReplyService.listAllComment(); + if (schisandraShareComments != null) { + List schisandraShareCommentReplies = SchisandraShareCommentReplyBOConverter.INSTANCE.convertEntityToBOList(schisandraShareComments); + return schisandraShareCommentReplies; + } else { + return null; + } + } } diff --git a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/service/impl/SchisandraShareDetailDomainServiceImpl.java b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/service/impl/SchisandraShareDetailDomainServiceImpl.java index 53c1d6f..a7cec08 100644 --- a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/service/impl/SchisandraShareDetailDomainServiceImpl.java +++ b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/service/impl/SchisandraShareDetailDomainServiceImpl.java @@ -257,4 +257,11 @@ public class SchisandraShareDetailDomainServiceImpl implements SchisandraShareDe return schisandraShareDetailService.delDetailLike(id) > 0; } } + + @Override + public List queryAllDetails() { + List schisandraShareDetails = schisandraShareDetailService.queryAllDeatiles(); + List shareDetailBOList = SchisandraShareDetailBOConverter.INSTANCE.convertEntityToBOList(schisandraShareDetails); + return shareDetailBOList; + } } diff --git a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/service/impl/SchisandraShareDetailTagDomainServiceImpl.java b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/service/impl/SchisandraShareDetailTagDomainServiceImpl.java index 19cba85..d0a9c20 100644 --- a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/service/impl/SchisandraShareDetailTagDomainServiceImpl.java +++ b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/service/impl/SchisandraShareDetailTagDomainServiceImpl.java @@ -2,6 +2,7 @@ package com.schisandra.share.domain.service.impl; import com.schisandra.share.common.enums.IsDeletedFlagEnum; import com.schisandra.share.domain.bo.SchisandraShareDetailTagBO; +import com.schisandra.share.domain.convert.SchisandraShareDetailBOConverter; import com.schisandra.share.domain.convert.SchisandraShareDetailTagBOConverter; import com.schisandra.share.domain.service.SchisandraShareDetailTagDomainService; import com.schisandra.share.infra.basic.entity.SchisandraShareDetailTag; @@ -45,4 +46,9 @@ public class SchisandraShareDetailTagDomainServiceImpl implements SchisandraShar schisandraShareDetailTag.setIsDeleted(IsDeletedFlagEnum.DELETED.getCode()); return schisandraShareDetailTagService.update(schisandraShareDetailTag) > 0; } + + @Override + public List getAllDetaileTages() { + return SchisandraShareDetailTagBOConverter.INSTANCE.convertEntityToBOList(schisandraShareDetailTagService.queryAllDetaileTages()); + } } diff --git a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/service/impl/SchisandraShareMessageDomainServiceImpl.java b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/service/impl/SchisandraShareMessageDomainServiceImpl.java index 65db55e..8804526 100644 --- a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/service/impl/SchisandraShareMessageDomainServiceImpl.java +++ b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/service/impl/SchisandraShareMessageDomainServiceImpl.java @@ -10,6 +10,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.List; /** * 消息表 领域service实现了 @@ -45,4 +46,9 @@ public class SchisandraShareMessageDomainServiceImpl implements SchisandraShareM return schisandraShareMessageService.update(schisandraShareMessage) > 0; } + @Override + public List queryAll() { + return schisandraShareMessageService.queryAll(); + } + } diff --git a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/service/impl/SchisandraShareTagsDomainServiceImpl.java b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/service/impl/SchisandraShareTagsDomainServiceImpl.java index 77acc5d..87c3d37 100644 --- a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/service/impl/SchisandraShareTagsDomainServiceImpl.java +++ b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/service/impl/SchisandraShareTagsDomainServiceImpl.java @@ -10,6 +10,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.List; /** * 分享详情标签表 领域service实现了 @@ -45,4 +46,9 @@ public class SchisandraShareTagsDomainServiceImpl implements SchisandraShareTags return schisandraShareTagsService.update(schisandraShareTags) > 0; } + @Override + public List queryAll() { + return schisandraShareTagsService.queryAll(); + } + } diff --git a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/service/impl/SchisandraShareUrlDomainServiceImpl.java b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/service/impl/SchisandraShareUrlDomainServiceImpl.java index f87cc7c..f4064bb 100644 --- a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/service/impl/SchisandraShareUrlDomainServiceImpl.java +++ b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/service/impl/SchisandraShareUrlDomainServiceImpl.java @@ -10,6 +10,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.List; /** * 分享链接 领域service实现了 @@ -45,4 +46,9 @@ public class SchisandraShareUrlDomainServiceImpl implements SchisandraShareUrlDo return schisandraShareUrlService.update(schisandraShareUrl) > 0; } + @Override + public List queryAll() { + return schisandraShareUrlService.queryAll(); + } + } diff --git a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/service/SchisandraShareCommentReplyService.java b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/service/SchisandraShareCommentReplyService.java index 691f6f0..5b59556 100644 --- a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/service/SchisandraShareCommentReplyService.java +++ b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/service/SchisandraShareCommentReplyService.java @@ -61,4 +61,6 @@ public interface SchisandraShareCommentReplyService { SchisandraShareCommentReply returnLike(String Id); Long returnCount(String detailId); + + List listAllComment(); } diff --git a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/service/SchisandraShareDetailService.java b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/service/SchisandraShareDetailService.java index 615fe95..2556f5d 100644 --- a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/service/SchisandraShareDetailService.java +++ b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/service/SchisandraShareDetailService.java @@ -72,5 +72,7 @@ public interface SchisandraShareDetailService { List queryByuserId(String userId); + List queryAllDeatiles(); + List queryByIds(List Ids); } diff --git a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/service/SchisandraShareDetailTagService.java b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/service/SchisandraShareDetailTagService.java index c73a675..f13071f 100644 --- a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/service/SchisandraShareDetailTagService.java +++ b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/service/SchisandraShareDetailTagService.java @@ -46,4 +46,5 @@ public interface SchisandraShareDetailTagService { List queryTagIdsByDetailId(String detailId); + List queryAllDetaileTages(); } diff --git a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/service/SchisandraShareMessageService.java b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/service/SchisandraShareMessageService.java index c44ae42..928de06 100644 --- a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/service/SchisandraShareMessageService.java +++ b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/service/SchisandraShareMessageService.java @@ -2,6 +2,8 @@ package com.schisandra.share.infra.basic.service; import com.schisandra.share.infra.basic.entity.SchisandraShareMessage; +import java.util.List; + /** * 消息表 表服务接口 * @@ -41,6 +43,7 @@ public interface SchisandraShareMessageService { * @return 是否成功 */ boolean deleteById(String id); + List queryAll(); } diff --git a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/service/SchisandraShareTagsService.java b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/service/SchisandraShareTagsService.java index cb88fc6..883d0f8 100644 --- a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/service/SchisandraShareTagsService.java +++ b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/service/SchisandraShareTagsService.java @@ -48,4 +48,7 @@ public interface SchisandraShareTagsService { List queryByIds(List tagIds); int insertBatch(List schisandraShareTags); + + + List queryAll( ); } diff --git a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/service/SchisandraShareUrlService.java b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/service/SchisandraShareUrlService.java index 6b3726a..1ac9313 100644 --- a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/service/SchisandraShareUrlService.java +++ b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/service/SchisandraShareUrlService.java @@ -48,4 +48,6 @@ public interface SchisandraShareUrlService { List queryByIds(List Ids); int insertBatch(List schisandraShareUrls); + + List queryAll( ); } diff --git a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/service/impl/SchisandraShareCommentReplyServiceImpl.java b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/service/impl/SchisandraShareCommentReplyServiceImpl.java index e52c98d..1ccc411 100644 --- a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/service/impl/SchisandraShareCommentReplyServiceImpl.java +++ b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/service/impl/SchisandraShareCommentReplyServiceImpl.java @@ -162,4 +162,9 @@ public class SchisandraShareCommentReplyServiceImpl implements SchisandraShareCo .where(SchisandraShareCommentReplyTableDef.SCHISANDRA_SHARE_COMMENT_REPLY.DETAIL_ID.eq(detailId)); return this.schisandraShareCommentReplyDao.selectCountByQuery(wrapper); } + + @Override + public List listAllComment() { + return schisandraShareCommentReplyDao.selectAll(); + } } diff --git a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/service/impl/SchisandraShareDetailServiceImpl.java b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/service/impl/SchisandraShareDetailServiceImpl.java index e99e1d3..3abdf99 100644 --- a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/service/impl/SchisandraShareDetailServiceImpl.java +++ b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/service/impl/SchisandraShareDetailServiceImpl.java @@ -141,4 +141,9 @@ public class SchisandraShareDetailServiceImpl implements SchisandraShareDetailSe public List queryByIds(List ids) { return this.schisandraShareDetailDao.selectListByIds(ids); } + + @Override + public List queryAllDeatiles() { + return schisandraShareDetailDao.selectAll(); + } } diff --git a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/service/impl/SchisandraShareDetailTagServiceImpl.java b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/service/impl/SchisandraShareDetailTagServiceImpl.java index 8dc3a5f..f5167ac 100644 --- a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/service/impl/SchisandraShareDetailTagServiceImpl.java +++ b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/service/impl/SchisandraShareDetailTagServiceImpl.java @@ -70,5 +70,10 @@ public class SchisandraShareDetailTagServiceImpl implements SchisandraShareDetai return this.schisandraShareDetailTagDao.selectListByCondition(SchisandraShareDetailTagTableDef.SCHISANDRA_SHARE_DETAIL_TAG.DETAIL_ID.eq(detailId)); } + @Override + public List queryAllDetaileTages() { + return schisandraShareDetailTagDao.selectAll(); + } + } diff --git a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/service/impl/SchisandraShareMessageServiceImpl.java b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/service/impl/SchisandraShareMessageServiceImpl.java index 23e2f43..419eae9 100644 --- a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/service/impl/SchisandraShareMessageServiceImpl.java +++ b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/service/impl/SchisandraShareMessageServiceImpl.java @@ -6,6 +6,7 @@ import com.schisandra.share.infra.basic.service.SchisandraShareMessageService; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.List; /** * 消息表 表服务实现类 @@ -63,5 +64,10 @@ public class SchisandraShareMessageServiceImpl implements SchisandraShareMessage return this.schisandraShareMessageDao.deleteById(id) > 0; } + @Override + public List queryAll() { + return schisandraShareMessageDao.selectAll(); + } + } diff --git a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/service/impl/SchisandraShareTagsServiceImpl.java b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/service/impl/SchisandraShareTagsServiceImpl.java index 0721afa..293c80e 100644 --- a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/service/impl/SchisandraShareTagsServiceImpl.java +++ b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/service/impl/SchisandraShareTagsServiceImpl.java @@ -73,5 +73,10 @@ public class SchisandraShareTagsServiceImpl implements SchisandraShareTagsServic return this.schisandraShareTagsDao.insertBatch(schisandraShareTags); } + @Override + public List queryAll() { + return schisandraShareTagsDao.selectAll(); + } + } diff --git a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/service/impl/SchisandraShareUrlServiceImpl.java b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/service/impl/SchisandraShareUrlServiceImpl.java index 016e76e..3e8e138 100644 --- a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/service/impl/SchisandraShareUrlServiceImpl.java +++ b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/service/impl/SchisandraShareUrlServiceImpl.java @@ -75,5 +75,10 @@ public class SchisandraShareUrlServiceImpl implements SchisandraShareUrlService return this.schisandraShareUrlDao.insertBatch(schisandraShareUrls); } + @Override + public List queryAll() { + return schisandraShareUrlDao.selectAll(); + } + } diff --git a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/resources/mapper/SchisandraShareUrlDao.xml b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/resources/mapper/SchisandraShareUrlDao.xml index 40ee3b9..bb19cf2 100644 --- a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/resources/mapper/SchisandraShareUrlDao.xml +++ b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/resources/mapper/SchisandraShareUrlDao.xml @@ -5,6 +5,7 @@ + diff --git a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-api/src/main/java/com/schisandra/system/api/SchisandraSystemFeignService.java b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-api/src/main/java/com/schisandra/system/api/SchisandraSystemFeignService.java index 02ab5c9..902ba0e 100644 --- a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-api/src/main/java/com/schisandra/system/api/SchisandraSystemFeignService.java +++ b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-api/src/main/java/com/schisandra/system/api/SchisandraSystemFeignService.java @@ -5,6 +5,7 @@ import com.schisandra.system.entity.SchisandraSmsConfigDTO; import com.schisandra.system.entity.SchisandraSysConfigDTO; import com.schisandra.system.entity.SchisandraSysOauthDTO; import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -18,4 +19,17 @@ public interface SchisandraSystemFeignService { @PostMapping("/system/sms/querySmsByConfigId") Result querySmsByConfigId(@RequestParam(value = "configId") String configId); + + @GetMapping("/system/sms/list") + Result listSysSms(); + + @GetMapping("/system/list") + Result listSysConfig(); + + @GetMapping("/system/log/list") + Result listSysLog(); + + @GetMapping("/system/oauth/list") + Result listSysOauth(); + } diff --git a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-application/schisandra-cloud-storage-system-application-controller/src/main/java/com/schisandra/system/application/config/GlobalConfig.java b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-application/schisandra-cloud-storage-system-application-controller/src/main/java/com/schisandra/system/application/config/GlobalConfig.java new file mode 100644 index 0000000..03de07e --- /dev/null +++ b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-application/schisandra-cloud-storage-system-application-controller/src/main/java/com/schisandra/system/application/config/GlobalConfig.java @@ -0,0 +1,38 @@ +package com.schisandra.system.application.config; + +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.SerializationFeature; +import org.springframework.context.annotation.Configuration; +import org.springframework.http.converter.HttpMessageConverter; +import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport; + +import java.util.List; + +/** + * @Classname GlobalConfig + * @BelongsProject: schisandra-cloud-storage + * @BelongsPackage: com.schisandra.auth.application.common + * @Author: schisandra + * @CreateTime: 2024-02-16 15:57 + * @Description: MVC全局处理 + * @Version: 1.0 + */ +@Configuration +public class GlobalConfig extends WebMvcConfigurationSupport { + + @Override + protected void configureMessageConverters(List> converters) { + super.configureMessageConverters(converters); + converters.add(mappingJackson2HttpMessageConverter()); + } + + private MappingJackson2HttpMessageConverter mappingJackson2HttpMessageConverter() { + ObjectMapper objectMapper = new ObjectMapper(); + objectMapper.configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false); + objectMapper.setSerializationInclusion(JsonInclude.Include.NON_NULL); + MappingJackson2HttpMessageConverter converter = new MappingJackson2HttpMessageConverter(objectMapper); + return converter; + } +} diff --git a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-application/schisandra-cloud-storage-system-application-controller/src/main/java/com/schisandra/system/application/config/ThreadPoolConfig.java b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-application/schisandra-cloud-storage-system-application-controller/src/main/java/com/schisandra/system/application/config/ThreadPoolConfig.java new file mode 100644 index 0000000..a355b95 --- /dev/null +++ b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-application/schisandra-cloud-storage-system-application-controller/src/main/java/com/schisandra/system/application/config/ThreadPoolConfig.java @@ -0,0 +1,29 @@ +package com.schisandra.system.application.config; + + + +import com.schisandra.system.application.factory.CustomNameThreadFactory; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +import java.util.concurrent.LinkedBlockingDeque; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.concurrent.TimeUnit; + +/** + * 线程池的config管理 + * + * @author: landaiqing + * @date: 2024/2/18 + */ +@Configuration +public class ThreadPoolConfig { + + @Bean(name = "rotateCaptchaThreadPool") + public ThreadPoolExecutor getLabelThreadPool() { + return new ThreadPoolExecutor(20, 100, 5, + TimeUnit.SECONDS, new LinkedBlockingDeque<>(40), + new CustomNameThreadFactory("rotateCaptcha"), + new ThreadPoolExecutor.CallerRunsPolicy()); + } +} diff --git a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-application/schisandra-cloud-storage-system-application-controller/src/main/java/com/schisandra/system/application/controller/SchisandraSmsConfigController.java b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-application/schisandra-cloud-storage-system-application-controller/src/main/java/com/schisandra/system/application/controller/SchisandraSmsConfigController.java index 4692c2f..f4b7b02 100644 --- a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-application/schisandra-cloud-storage-system-application-controller/src/main/java/com/schisandra/system/application/controller/SchisandraSmsConfigController.java +++ b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-application/schisandra-cloud-storage-system-application-controller/src/main/java/com/schisandra/system/application/controller/SchisandraSmsConfigController.java @@ -12,6 +12,7 @@ import org.apache.commons.lang3.ObjectUtils; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import java.util.List; /** * 短信配置信息表 controller @@ -232,4 +233,9 @@ public class SchisandraSmsConfigController { return Result.ok(schisandraSmsConfigDTO); } + @GetMapping("list") + public Result list() { + return Result.ok(schisandraSmsConfigDomainService.queryAll()); + } + } diff --git a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-application/schisandra-cloud-storage-system-application-controller/src/main/java/com/schisandra/system/application/controller/SchisandraSysConfigController.java b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-application/schisandra-cloud-storage-system-application-controller/src/main/java/com/schisandra/system/application/controller/SchisandraSysConfigController.java index 068020a..7797b35 100644 --- a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-application/schisandra-cloud-storage-system-application-controller/src/main/java/com/schisandra/system/application/controller/SchisandraSysConfigController.java +++ b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-application/schisandra-cloud-storage-system-application-controller/src/main/java/com/schisandra/system/application/controller/SchisandraSysConfigController.java @@ -11,6 +11,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import java.util.List; /** * controller @@ -128,4 +129,10 @@ public class SchisandraSysConfigController { } } -} + @GetMapping("list") + public Result> list() { + return Result.ok(schisandraSysConfigDomainService.queryAll()); + } + + + } diff --git a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-application/schisandra-cloud-storage-system-application-controller/src/main/java/com/schisandra/system/application/controller/SchisandraSysLogController.java b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-application/schisandra-cloud-storage-system-application-controller/src/main/java/com/schisandra/system/application/controller/SchisandraSysLogController.java index cf33e79..dd8f8ac 100644 --- a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-application/schisandra-cloud-storage-system-application-controller/src/main/java/com/schisandra/system/application/controller/SchisandraSysLogController.java +++ b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-application/schisandra-cloud-storage-system-application-controller/src/main/java/com/schisandra/system/application/controller/SchisandraSysLogController.java @@ -2,21 +2,22 @@ package com.schisandra.system.application.controller; import com.alibaba.fastjson.JSON; import com.google.common.base.Preconditions; - import com.schisandra.system.application.convert.SchisandraSysLogDTOConverter; import com.schisandra.system.application.dto.SchisandraSysLogDTO; import com.schisandra.system.common.entity.Result; import com.schisandra.system.domain.bo.SchisandraSysLogBO; import com.schisandra.system.domain.service.SchisandraSysLogDomainService; import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; +import java.util.List; /** - * controller + * controller * * @author landaiqing * @since 2024-05-12 14:21:42 @@ -146,4 +147,9 @@ public class SchisandraSysLogController { } + @GetMapping("list") + public Result list() { + return Result.ok(schisandraSysLogDomainService.queryAll()); + } + } diff --git a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-application/schisandra-cloud-storage-system-application-controller/src/main/java/com/schisandra/system/application/controller/SchisandraSysOauthController.java b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-application/schisandra-cloud-storage-system-application-controller/src/main/java/com/schisandra/system/application/controller/SchisandraSysOauthController.java index 2592b8a..29c786b 100644 --- a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-application/schisandra-cloud-storage-system-application-controller/src/main/java/com/schisandra/system/application/controller/SchisandraSysOauthController.java +++ b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-application/schisandra-cloud-storage-system-application-controller/src/main/java/com/schisandra/system/application/controller/SchisandraSysOauthController.java @@ -11,6 +11,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import java.util.List; /** * controller @@ -141,4 +142,9 @@ public class SchisandraSysOauthController { return Result.ok(schisandraSysOauthDTO); } + @GetMapping("list") + public Result list() { + return Result.ok(schisandraSysOauthDomainService.queryAll()); + } + } diff --git a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-application/schisandra-cloud-storage-system-application-controller/src/main/java/com/schisandra/system/application/factory/CustomNameThreadFactory.java b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-application/schisandra-cloud-storage-system-application-controller/src/main/java/com/schisandra/system/application/factory/CustomNameThreadFactory.java new file mode 100644 index 0000000..85ba64c --- /dev/null +++ b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-application/schisandra-cloud-storage-system-application-controller/src/main/java/com/schisandra/system/application/factory/CustomNameThreadFactory.java @@ -0,0 +1,49 @@ +package com.schisandra.system.application.factory; + +import org.apache.commons.lang3.StringUtils; + +import java.util.concurrent.ThreadFactory; +import java.util.concurrent.atomic.AtomicInteger; + +/** + * 自定义名称的线程工厂 + * + * @author: landaiqing + * @date: 2024/2/18 + */ +public class CustomNameThreadFactory implements ThreadFactory { + + private static final AtomicInteger poolNumber = new AtomicInteger(1); + private final ThreadGroup group; + private final AtomicInteger threadNumber = new AtomicInteger(1); + private final String namePrefix; + + public CustomNameThreadFactory(String name) { + SecurityManager s = System.getSecurityManager(); + group = (s != null) ? s.getThreadGroup() : + Thread.currentThread().getThreadGroup(); + if (StringUtils.isBlank(name)) { + name = "pool"; + } + namePrefix = name + "-" + + poolNumber.getAndIncrement() + + "-thread-"; + } + + @Override + public Thread newThread(Runnable r) { + Thread t = new Thread(group, r, + namePrefix + threadNumber.getAndIncrement(), + 0); + // 设置线程为非守护线程 + if (t.isDaemon()){ + t.setDaemon(false); + } + // 设置线程优先级为正常优先级 + if (t.getPriority() != Thread.NORM_PRIORITY){ + t.setPriority(Thread.NORM_PRIORITY); + } + return t; + } + +} diff --git a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-domain/src/main/java/com/schisandra/system/domain/service/SchisandraSmsConfigDomainService.java b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-domain/src/main/java/com/schisandra/system/domain/service/SchisandraSmsConfigDomainService.java index 2bb966f..6c58107 100644 --- a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-domain/src/main/java/com/schisandra/system/domain/service/SchisandraSmsConfigDomainService.java +++ b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-domain/src/main/java/com/schisandra/system/domain/service/SchisandraSmsConfigDomainService.java @@ -1,6 +1,9 @@ package com.schisandra.system.domain.service; import com.schisandra.system.domain.bo.SchisandraSmsConfigBO; +import com.schisandra.system.infra.basic.entity.SchisandraSmsConfig; + +import java.util.List; /** * 短信配置信息表 领域service @@ -27,5 +30,7 @@ public interface SchisandraSmsConfigDomainService { SchisandraSmsConfigBO queryByConfigId(String configId); + List queryAll(); + } diff --git a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-domain/src/main/java/com/schisandra/system/domain/service/SchisandraSysConfigDomainService.java b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-domain/src/main/java/com/schisandra/system/domain/service/SchisandraSysConfigDomainService.java index 9f8b89d..834ab69 100644 --- a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-domain/src/main/java/com/schisandra/system/domain/service/SchisandraSysConfigDomainService.java +++ b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-domain/src/main/java/com/schisandra/system/domain/service/SchisandraSysConfigDomainService.java @@ -1,6 +1,9 @@ package com.schisandra.system.domain.service; import com.schisandra.system.domain.bo.SchisandraSysConfigBO; +import com.schisandra.system.infra.basic.entity.SchisandraSysConfig; + +import java.util.List; /** * 领域service @@ -26,4 +29,5 @@ public interface SchisandraSysConfigDomainService { Boolean delete(SchisandraSysConfigBO schisandraSysConfigBO); Object getConfigByKey(String key); + List queryAll(); } diff --git a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-domain/src/main/java/com/schisandra/system/domain/service/SchisandraSysLogDomainService.java b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-domain/src/main/java/com/schisandra/system/domain/service/SchisandraSysLogDomainService.java index a883f50..4088033 100644 --- a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-domain/src/main/java/com/schisandra/system/domain/service/SchisandraSysLogDomainService.java +++ b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-domain/src/main/java/com/schisandra/system/domain/service/SchisandraSysLogDomainService.java @@ -1,6 +1,9 @@ package com.schisandra.system.domain.service; import com.schisandra.system.domain.bo.SchisandraSysLogBO; +import com.schisandra.system.infra.basic.entity.SchisandraSysLog; + +import java.util.List; /** * 领域service @@ -25,4 +28,6 @@ public interface SchisandraSysLogDomainService { */ Boolean delete(SchisandraSysLogBO schisandraSysLogBO); + List queryAll(); + } diff --git a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-domain/src/main/java/com/schisandra/system/domain/service/SchisandraSysOauthDomainService.java b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-domain/src/main/java/com/schisandra/system/domain/service/SchisandraSysOauthDomainService.java index fba92a7..aba3843 100644 --- a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-domain/src/main/java/com/schisandra/system/domain/service/SchisandraSysOauthDomainService.java +++ b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-domain/src/main/java/com/schisandra/system/domain/service/SchisandraSysOauthDomainService.java @@ -1,7 +1,9 @@ package com.schisandra.system.domain.service; import com.schisandra.system.domain.bo.SchisandraSysOauthBO; +import com.schisandra.system.infra.basic.entity.SchisandraSysOauth; +import java.util.List; /** @@ -28,4 +30,6 @@ public interface SchisandraSysOauthDomainService { Boolean delete(SchisandraSysOauthBO schisandraSysOauthBO); SchisandraSysOauthBO getOauthConfigByType(String type); + + List queryAll(); } diff --git a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-domain/src/main/java/com/schisandra/system/domain/service/impl/SchisandraSmsConfigDomainServiceImpl.java b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-domain/src/main/java/com/schisandra/system/domain/service/impl/SchisandraSmsConfigDomainServiceImpl.java index dc6cb17..3a72f5b 100644 --- a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-domain/src/main/java/com/schisandra/system/domain/service/impl/SchisandraSmsConfigDomainServiceImpl.java +++ b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-domain/src/main/java/com/schisandra/system/domain/service/impl/SchisandraSmsConfigDomainServiceImpl.java @@ -10,6 +10,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.List; /** * 短信配置信息表 领域service实现了 @@ -52,4 +53,9 @@ public class SchisandraSmsConfigDomainServiceImpl implements SchisandraSmsConfig return SchisandraSmsConfigBOConverter.INSTANCE.convertEntityToBO(schisandraSmsConfig); } + @Override + public List queryAll() { + return schisandraSmsConfigService.queryAll(); + } + } diff --git a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-domain/src/main/java/com/schisandra/system/domain/service/impl/SchisandraSysConfigDomainServiceImpl.java b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-domain/src/main/java/com/schisandra/system/domain/service/impl/SchisandraSysConfigDomainServiceImpl.java index e3e933e..5fb178e 100644 --- a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-domain/src/main/java/com/schisandra/system/domain/service/impl/SchisandraSysConfigDomainServiceImpl.java +++ b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-domain/src/main/java/com/schisandra/system/domain/service/impl/SchisandraSysConfigDomainServiceImpl.java @@ -11,6 +11,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.List; /** * 领域service实现了 @@ -56,4 +57,9 @@ public class SchisandraSysConfigDomainServiceImpl implements SchisandraSysConfig return schisandraSysConfigBO; } + @Override + public List queryAll() { + return schisandraSysConfigService.queryAll(); + } + } diff --git a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-domain/src/main/java/com/schisandra/system/domain/service/impl/SchisandraSysLogDomainServiceImpl.java b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-domain/src/main/java/com/schisandra/system/domain/service/impl/SchisandraSysLogDomainServiceImpl.java index f8d2e1d..1d855ef 100644 --- a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-domain/src/main/java/com/schisandra/system/domain/service/impl/SchisandraSysLogDomainServiceImpl.java +++ b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-domain/src/main/java/com/schisandra/system/domain/service/impl/SchisandraSysLogDomainServiceImpl.java @@ -10,6 +10,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.List; /** * 领域service实现了 @@ -43,4 +44,9 @@ public class SchisandraSysLogDomainServiceImpl implements SchisandraSysLogDomain return schisandraSysLogService.update(schisandraSysLog) > 0; } + @Override + public List queryAll() { + return schisandraSysLogService.queryAll(); + } + } diff --git a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-domain/src/main/java/com/schisandra/system/domain/service/impl/SchisandraSysOauthDomainServiceImpl.java b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-domain/src/main/java/com/schisandra/system/domain/service/impl/SchisandraSysOauthDomainServiceImpl.java index b56ac25..07c4c35 100644 --- a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-domain/src/main/java/com/schisandra/system/domain/service/impl/SchisandraSysOauthDomainServiceImpl.java +++ b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-domain/src/main/java/com/schisandra/system/domain/service/impl/SchisandraSysOauthDomainServiceImpl.java @@ -11,6 +11,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.List; /** * 领域service实现了 @@ -52,4 +53,9 @@ public class SchisandraSysOauthDomainServiceImpl implements SchisandraSysOauthDo return SchisandraSysOauthBOConverter.INSTANCE.convertEntityToBO(schisandraSysOauth); } + @Override + public List queryAll() { + return schisandraSysOauthService.queryAll(); + } + } diff --git a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-infra/src/main/java/com/schisandra/system/infra/basic/service/SchisandraSmsConfigService.java b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-infra/src/main/java/com/schisandra/system/infra/basic/service/SchisandraSmsConfigService.java index ca4f78e..cd1893a 100644 --- a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-infra/src/main/java/com/schisandra/system/infra/basic/service/SchisandraSmsConfigService.java +++ b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-infra/src/main/java/com/schisandra/system/infra/basic/service/SchisandraSmsConfigService.java @@ -2,6 +2,8 @@ package com.schisandra.system.infra.basic.service; import com.schisandra.system.infra.basic.entity.SchisandraSmsConfig; +import java.util.List; + /** * 短信配置信息表 表服务接口 * @@ -43,5 +45,6 @@ public interface SchisandraSmsConfigService { boolean deleteById(Long id); SchisandraSmsConfig queryByConfigId(String configId); + List queryAll(); } diff --git a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-infra/src/main/java/com/schisandra/system/infra/basic/service/SchisandraSysConfigService.java b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-infra/src/main/java/com/schisandra/system/infra/basic/service/SchisandraSysConfigService.java index fdcf4f3..f6a73fe 100644 --- a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-infra/src/main/java/com/schisandra/system/infra/basic/service/SchisandraSysConfigService.java +++ b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-infra/src/main/java/com/schisandra/system/infra/basic/service/SchisandraSysConfigService.java @@ -2,6 +2,8 @@ package com.schisandra.system.infra.basic.service; import com.schisandra.system.infra.basic.entity.SchisandraSysConfig; +import java.util.List; + /** * 表服务接口 @@ -45,4 +47,5 @@ public interface SchisandraSysConfigService { SchisandraSysConfig getConfigByKey(String key); + List queryAll(); } diff --git a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-infra/src/main/java/com/schisandra/system/infra/basic/service/SchisandraSysLogService.java b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-infra/src/main/java/com/schisandra/system/infra/basic/service/SchisandraSysLogService.java index c184a10..d1cd8c3 100644 --- a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-infra/src/main/java/com/schisandra/system/infra/basic/service/SchisandraSysLogService.java +++ b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-infra/src/main/java/com/schisandra/system/infra/basic/service/SchisandraSysLogService.java @@ -2,6 +2,8 @@ package com.schisandra.system.infra.basic.service; import com.schisandra.system.infra.basic.entity.SchisandraSysLog; +import java.util.List; + /** * 表服务接口 * @@ -42,5 +44,7 @@ public interface SchisandraSysLogService { */ boolean deleteById(Long id); + List queryAll(); + } diff --git a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-infra/src/main/java/com/schisandra/system/infra/basic/service/SchisandraSysOauthService.java b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-infra/src/main/java/com/schisandra/system/infra/basic/service/SchisandraSysOauthService.java index 1413891..fafce81 100644 --- a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-infra/src/main/java/com/schisandra/system/infra/basic/service/SchisandraSysOauthService.java +++ b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-infra/src/main/java/com/schisandra/system/infra/basic/service/SchisandraSysOauthService.java @@ -2,6 +2,8 @@ package com.schisandra.system.infra.basic.service; import com.schisandra.system.infra.basic.entity.SchisandraSysOauth; +import java.util.List; + /** * 表服务接口 * @@ -44,4 +46,5 @@ public interface SchisandraSysOauthService { SchisandraSysOauth getOauthConfigByType(String type); + List queryAll(); } diff --git a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-infra/src/main/java/com/schisandra/system/infra/basic/service/impl/SchisandraSmsConfigServiceImpl.java b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-infra/src/main/java/com/schisandra/system/infra/basic/service/impl/SchisandraSmsConfigServiceImpl.java index ee73cf6..3390744 100644 --- a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-infra/src/main/java/com/schisandra/system/infra/basic/service/impl/SchisandraSmsConfigServiceImpl.java +++ b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-infra/src/main/java/com/schisandra/system/infra/basic/service/impl/SchisandraSmsConfigServiceImpl.java @@ -7,6 +7,7 @@ import com.schisandra.system.infra.basic.service.SchisandraSmsConfigService; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.List; /** * 短信配置信息表 表服务实现类 @@ -69,4 +70,9 @@ public class SchisandraSmsConfigServiceImpl implements SchisandraSmsConfigServic return schisandraSmsConfigDao.selectOneByCondition(SchisandraSmsConfigTableDef.SCHISANDRA_SMS_CONFIG.CONFIG_ID.eq(configId)); } + @Override + public List queryAll() { + return schisandraSmsConfigDao.selectAll(); + } + } diff --git a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-infra/src/main/java/com/schisandra/system/infra/basic/service/impl/SchisandraSysConfigServiceImpl.java b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-infra/src/main/java/com/schisandra/system/infra/basic/service/impl/SchisandraSysConfigServiceImpl.java index 775d740..e1e8309 100644 --- a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-infra/src/main/java/com/schisandra/system/infra/basic/service/impl/SchisandraSysConfigServiceImpl.java +++ b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-infra/src/main/java/com/schisandra/system/infra/basic/service/impl/SchisandraSysConfigServiceImpl.java @@ -8,6 +8,7 @@ import com.schisandra.system.infra.basic.service.SchisandraSysConfigService; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.List; /** * 表服务实现类 @@ -76,4 +77,9 @@ public class SchisandraSysConfigServiceImpl implements SchisandraSysConfigServic return schisandraSysConfigDao.selectOneByCondition(SchisandraSysConfigTableDef.SCHISANDRA_SYS_CONFIG.CONFIG_KEY.eq(key)); } + @Override + public List queryAll() { + return schisandraSysConfigDao.selectAll(); + } + } diff --git a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-infra/src/main/java/com/schisandra/system/infra/basic/service/impl/SchisandraSysLogServiceImpl.java b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-infra/src/main/java/com/schisandra/system/infra/basic/service/impl/SchisandraSysLogServiceImpl.java index 1e299ef..e307b67 100644 --- a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-infra/src/main/java/com/schisandra/system/infra/basic/service/impl/SchisandraSysLogServiceImpl.java +++ b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-infra/src/main/java/com/schisandra/system/infra/basic/service/impl/SchisandraSysLogServiceImpl.java @@ -7,6 +7,7 @@ import com.schisandra.system.infra.basic.service.SchisandraSysLogService; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.List; /** * 表服务实现类 @@ -64,5 +65,10 @@ public class SchisandraSysLogServiceImpl implements SchisandraSysLogService { return this.schisandraSysLogDao.deleteById(id) > 0; } + @Override + public List queryAll() { + return schisandraSysLogDao.selectAll(); + } + } diff --git a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-infra/src/main/java/com/schisandra/system/infra/basic/service/impl/SchisandraSysOauthServiceImpl.java b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-infra/src/main/java/com/schisandra/system/infra/basic/service/impl/SchisandraSysOauthServiceImpl.java index 57bd57e..135c594 100644 --- a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-infra/src/main/java/com/schisandra/system/infra/basic/service/impl/SchisandraSysOauthServiceImpl.java +++ b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-infra/src/main/java/com/schisandra/system/infra/basic/service/impl/SchisandraSysOauthServiceImpl.java @@ -7,6 +7,7 @@ import com.schisandra.system.infra.basic.service.SchisandraSysOauthService; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.List; /** * 表服务实现类 @@ -75,4 +76,9 @@ public class SchisandraSysOauthServiceImpl implements SchisandraSysOauthService return schisandraSysOauthDao.selectOneByCondition(SchisandraSysOauthTableDef.SCHISANDRA_SYS_OAUTH.CLIENT_TYPE.eq(type)); } + @Override + public List queryAll() { + return schisandraSysOauthDao.selectAll(); + } + }