Merge remote-tracking branch 'refs/remotes/origin/master' into dev

This commit is contained in:
sjm
2024-07-23 14:21:21 +08:00
65 changed files with 681 additions and 20 deletions

View File

@@ -35,6 +35,16 @@
<artifactId>schisandra-cloud-storage-oss-api</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.schisandra.system</groupId>
<artifactId>schisandra-cloud-storage-system-api</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.schisandra.share</groupId>
<artifactId>schisandra-cloud-storage-share-api</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
</dependencies>
<build>
<plugins>

View File

@@ -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("获取系统短信配置失败");
}
}
}

View File

@@ -18,6 +18,13 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<version>2.4.2</version>
<exclusions>
<!-- 排除自带的logback依赖 -->
<exclusion>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>

View File

@@ -37,5 +37,10 @@
<artifactId>lombok</artifactId>
<version>1.18.24</version>
</dependency>
<dependency>
<groupId>com.schisandra.share</groupId>
<artifactId>schisandra-cloud-storage-share-common</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
</dependencies>
</project>

View File

@@ -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();
}

View File

@@ -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<HttpMessageConverter<?>> 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;
}
}

View File

@@ -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());
}
}

View File

@@ -339,5 +339,16 @@ public class SchisandraShareCommentReplyController {
}
}
@GetMapping("returnAllComment")
public Result returnAllComment() {
List<SchisandraShareCommentReplyBO> listAllComment = schisandraShareCommentReplyDomainService.listAllComment();
List<SchisandraShareCommentReplyDTO> listAllCommentDTO = SchisandraShareCommentReplyDTOConverter.INSTANCE.convertBOToDTOList(listAllComment);
if (listAllCommentDTO != null) {
return Result.ok(schisandraShareCommentReplyDomainService.listAllComment());
}else {
return Result.fail();
}
}
}

View File

@@ -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<List<SchisandraShareDetailDTO>> returnAllDetails(@RequestParam("circleId") Long circleId) {
List<SchisandraShareDetailBO> shareDetailBOList= schisandraShareDetailDomainService.queryAllDetails();
List<SchisandraShareDetailDTO> schisandraShareDetailDTOS=SchisandraShareDetailDTOConverter.INSTANCE.convertBOToDTOList(shareDetailBOList);
return Result.ok(schisandraShareDetailDTOS);
}
}

View File

@@ -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<SchisandraShareDetailTagBO> allDetaileTages = schisandraShareDetailTagDomainService.getAllDetaileTages();
return Result.ok(SchisandraShareDetailTagDTOConverter.INSTANCE.convertBOToDTOList(allDetaileTages));
}
}

View File

@@ -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<SchisandraShareMessageDTO>> list() {
return Result.ok(schisandraShareMessageDomainService.queryAll());
}
}

View File

@@ -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());
}
}

View File

@@ -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());
}
}

View File

@@ -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;
}
}

View File

@@ -43,4 +43,6 @@ public interface SchisandraShareCommentReplyDomainService {
Boolean updateCommentsLikes(String Id, Boolean isLike);
Long returnCount(String detailId);
List<SchisandraShareCommentReplyBO> listAllComment();
}

View File

@@ -42,4 +42,5 @@ public interface SchisandraShareDetailDomainService {
Boolean updateDetailLikes(String id,Boolean isLike);
List<SchisandraShareDetailBO> queryAllDetails();
}

View File

@@ -27,4 +27,7 @@ public interface SchisandraShareDetailTagDomainService {
* 删除 详情/标签映射表 信息
*/
Boolean delete(SchisandraShareDetailTagBO schisandraShareDetailTagBO);
List<SchisandraShareDetailTagBO> getAllDetaileTages();
}

View File

@@ -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<SchisandraShareMessage> queryAll();
}

View File

@@ -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<SchisandraShareTags> queryAll();
}

View File

@@ -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<SchisandraShareUrl> queryAll();
}

View File

@@ -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> schisandraShareCircleBO_list = SchisandraShareCircleBOConverter.INSTANCE.convertEntityToBOList(schisandraShareCircleService.queryAll());
ArrayList<SchisandraShareCircleBO> arrayList = new ArrayList<>();
for (SchisandraShareCircleBO schisandraShareCircleBO : schisandraShareCircleBO_list) {
CompletableFuture<AuthUserInfoEntity> 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;
}
}

View File

@@ -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<SchisandraShareCommentReplyBO> listAllComment() {
List<SchisandraShareCommentReply> schisandraShareComments = schisandraShareCommentReplyService.listAllComment();
if (schisandraShareComments != null) {
List<SchisandraShareCommentReplyBO> schisandraShareCommentReplies = SchisandraShareCommentReplyBOConverter.INSTANCE.convertEntityToBOList(schisandraShareComments);
return schisandraShareCommentReplies;
} else {
return null;
}
}
}

View File

@@ -257,4 +257,11 @@ public class SchisandraShareDetailDomainServiceImpl implements SchisandraShareDe
return schisandraShareDetailService.delDetailLike(id) > 0;
}
}
@Override
public List<SchisandraShareDetailBO> queryAllDetails() {
List<SchisandraShareDetail> schisandraShareDetails = schisandraShareDetailService.queryAllDeatiles();
List<SchisandraShareDetailBO> shareDetailBOList = SchisandraShareDetailBOConverter.INSTANCE.convertEntityToBOList(schisandraShareDetails);
return shareDetailBOList;
}
}

View File

@@ -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<SchisandraShareDetailTagBO> getAllDetaileTages() {
return SchisandraShareDetailTagBOConverter.INSTANCE.convertEntityToBOList(schisandraShareDetailTagService.queryAllDetaileTages());
}
}

View File

@@ -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<SchisandraShareMessage> queryAll() {
return schisandraShareMessageService.queryAll();
}
}

View File

@@ -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<SchisandraShareTags> queryAll() {
return schisandraShareTagsService.queryAll();
}
}

View File

@@ -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<SchisandraShareUrl> queryAll() {
return schisandraShareUrlService.queryAll();
}
}

View File

@@ -61,4 +61,6 @@ public interface SchisandraShareCommentReplyService {
SchisandraShareCommentReply returnLike(String Id);
Long returnCount(String detailId);
List<SchisandraShareCommentReply> listAllComment();
}

View File

@@ -72,5 +72,7 @@ public interface SchisandraShareDetailService {
List<SchisandraShareDetail> queryByuserId(String userId);
List<SchisandraShareDetail> queryAllDeatiles();
List<SchisandraShareDetail> queryByIds(List<String> Ids);
}

View File

@@ -46,4 +46,5 @@ public interface SchisandraShareDetailTagService {
List<SchisandraShareDetailTag> queryTagIdsByDetailId(String detailId);
List<SchisandraShareDetailTag> queryAllDetaileTages();
}

View File

@@ -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<SchisandraShareMessage> queryAll();
}

View File

@@ -48,4 +48,7 @@ public interface SchisandraShareTagsService {
List<SchisandraShareTags> queryByIds(List<String> tagIds);
int insertBatch(List<SchisandraShareTags> schisandraShareTags);
List<SchisandraShareTags> queryAll( );
}

View File

@@ -48,4 +48,6 @@ public interface SchisandraShareUrlService {
List<SchisandraShareUrl> queryByIds(List<String> Ids);
int insertBatch(List<SchisandraShareUrl> schisandraShareUrls);
List<SchisandraShareUrl> queryAll( );
}

View File

@@ -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<SchisandraShareCommentReply> listAllComment() {
return schisandraShareCommentReplyDao.selectAll();
}
}

View File

@@ -141,4 +141,9 @@ public class SchisandraShareDetailServiceImpl implements SchisandraShareDetailSe
public List<SchisandraShareDetail> queryByIds(List<String> ids) {
return this.schisandraShareDetailDao.selectListByIds(ids);
}
@Override
public List<SchisandraShareDetail> queryAllDeatiles() {
return schisandraShareDetailDao.selectAll();
}
}

View File

@@ -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<SchisandraShareDetailTag> queryAllDetaileTages() {
return schisandraShareDetailTagDao.selectAll();
}
}

View File

@@ -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<SchisandraShareMessage> queryAll() {
return schisandraShareMessageDao.selectAll();
}
}

View File

@@ -73,5 +73,10 @@ public class SchisandraShareTagsServiceImpl implements SchisandraShareTagsServic
return this.schisandraShareTagsDao.insertBatch(schisandraShareTags);
}
@Override
public List<SchisandraShareTags> queryAll() {
return schisandraShareTagsDao.selectAll();
}
}

View File

@@ -75,5 +75,10 @@ public class SchisandraShareUrlServiceImpl implements SchisandraShareUrlService
return this.schisandraShareUrlDao.insertBatch(schisandraShareUrls);
}
@Override
public List<SchisandraShareUrl> queryAll() {
return schisandraShareUrlDao.selectAll();
}
}

View File

@@ -5,6 +5,7 @@
<resultMap id="BaseResultMap" type="com.schisandra.share.infra.basic.entity.SchisandraShareUrl">
<id column="id" jdbcType="VARCHAR" property="id"/>
<result column="url" jdbcType="VARCHAR" property="url"/>
<result column="type_name" jdbcType="VARCHAR" property="typeName"/>
<result column="type" jdbcType="VARCHAR" property="type"/>
<result column="password" jdbcType="VARCHAR" property="password"/>
<result column="description" jdbcType="VARCHAR" property="description"/>

View File

@@ -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<SchisandraSmsConfigDTO> 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();
}

View File

@@ -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<HttpMessageConverter<?>> 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;
}
}

View File

@@ -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());
}
}

View File

@@ -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());
}
}

View File

@@ -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<SchisandraSysConfigDTO>> list() {
return Result.ok(schisandraSysConfigDomainService.queryAll());
}
}

View File

@@ -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());
}
}

View File

@@ -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());
}
}

View File

@@ -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;
}
}

View File

@@ -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<SchisandraSmsConfig> queryAll();
}

View File

@@ -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<SchisandraSysConfig> queryAll();
}

View File

@@ -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<SchisandraSysLog> queryAll();
}

View File

@@ -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<SchisandraSysOauth> queryAll();
}

View File

@@ -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<SchisandraSmsConfig> queryAll() {
return schisandraSmsConfigService.queryAll();
}
}

View File

@@ -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<SchisandraSysConfig> queryAll() {
return schisandraSysConfigService.queryAll();
}
}

View File

@@ -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<SchisandraSysLog> queryAll() {
return schisandraSysLogService.queryAll();
}
}

View File

@@ -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<SchisandraSysOauth> queryAll() {
return schisandraSysOauthService.queryAll();
}
}

View File

@@ -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<SchisandraSmsConfig> queryAll();
}

View File

@@ -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<SchisandraSysConfig> queryAll();
}

View File

@@ -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<SchisandraSysLog> queryAll();
}

View File

@@ -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<SchisandraSysOauth> queryAll();
}

View File

@@ -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<SchisandraSmsConfig> queryAll() {
return schisandraSmsConfigDao.selectAll();
}
}

View File

@@ -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<SchisandraSysConfig> queryAll() {
return schisandraSysConfigDao.selectAll();
}
}

View File

@@ -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<SchisandraSysLog> queryAll() {
return schisandraSysLogDao.selectAll();
}
}

View File

@@ -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<SchisandraSysOauth> queryAll() {
return schisandraSysOauthDao.selectAll();
}
}