diff --git a/bnyer-common/bnyer-common-swagger/src/main/java/com/bnyer/common/swagger/config/SwaggerAutoConfiguration.java b/bnyer-common/bnyer-common-swagger/src/main/java/com/bnyer/common/swagger/config/SwaggerAutoConfiguration.java index c2c6d23..097fca4 100644 --- a/bnyer-common/bnyer-common-swagger/src/main/java/com/bnyer/common/swagger/config/SwaggerAutoConfiguration.java +++ b/bnyer-common/bnyer-common-swagger/src/main/java/com/bnyer/common/swagger/config/SwaggerAutoConfiguration.java @@ -66,6 +66,7 @@ public class SwaggerAutoConfiguration swaggerProperties.getExcludePath().forEach(path -> excludePath.add(PathSelectors.ant(path))); ApiSelectorBuilder builder = new Docket(DocumentationType.SWAGGER_2).host(swaggerProperties.getHost()) + .enable(swaggerProperties.getEnabled()) .apiInfo(apiInfo(swaggerProperties)).select() .apis(RequestHandlerSelectors.basePackage(swaggerProperties.getBasePackage())); diff --git a/bnyer-common/bnyer-common-swagger/src/main/java/com/bnyer/common/swagger/config/SwaggerProperties.java b/bnyer-common/bnyer-common-swagger/src/main/java/com/bnyer/common/swagger/config/SwaggerProperties.java index 6044dac..8e20106 100644 --- a/bnyer-common/bnyer-common-swagger/src/main/java/com/bnyer/common/swagger/config/SwaggerProperties.java +++ b/bnyer-common/bnyer-common-swagger/src/main/java/com/bnyer/common/swagger/config/SwaggerProperties.java @@ -2,17 +2,20 @@ package com.bnyer.common.swagger.config; import java.util.ArrayList; import java.util.List; + import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.cloud.context.config.annotation.RefreshScope; import org.springframework.stereotype.Component; @Component +@RefreshScope @ConfigurationProperties("swagger") public class SwaggerProperties { /** * 是否开启swagger */ - private Boolean enabled; + private Boolean enabled = Boolean.FALSE; /** * swagger会解析的包路径 @@ -342,4 +345,4 @@ public class SwaggerProperties this.description = description; } } -} \ No newline at end of file +} diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/FeedBackServiceImpl.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/FeedBackServiceImpl.java index e1f2929..a2cd2d8 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/FeedBackServiceImpl.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/FeedBackServiceImpl.java @@ -10,6 +10,7 @@ import com.bnyer.img.service.FeedBackService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.Date; import java.util.List; @@ -22,6 +23,7 @@ public class FeedBackServiceImpl implements FeedBackService { private FeedbackMapper feedbackMapper; @Override + @Transactional(rollbackFor = Exception.class) public int insert(Feedback feedback) { feedback.setCreateTime(new Date()); feedback.setUpdateTime(new Date()); @@ -29,12 +31,14 @@ public class FeedBackServiceImpl implements FeedBackService { } @Override + @Transactional(rollbackFor = Exception.class) public int update(Feedback feedback) { feedback.setUpdateTime(new Date()); return feedbackMapper.updateById(feedback); } @Override + @Transactional(rollbackFor = Exception.class) public int delete(List ids) { return feedbackMapper.deleteBatchIds(ids); } @@ -53,6 +57,7 @@ public class FeedBackServiceImpl implements FeedBackService { } @Override + @Transactional(rollbackFor = Exception.class) public int changeStatus(Long id, String status) { LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper<>(); wrapper.eq(Feedback::getId, id); diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/TiktokCollectionServiceImpl.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/TiktokCollectionServiceImpl.java index baf3eb5..ae9803b 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/TiktokCollectionServiceImpl.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/TiktokCollectionServiceImpl.java @@ -17,6 +17,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.Cursor; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.Date; import java.util.List; @@ -36,10 +37,6 @@ public class TiktokCollectionServiceImpl implements TiktokCollectionService { @Autowired private RedisService redisService; - private String getHashKey(Long userId, Long imgId){ - return userId+":"+imgId; - } - @Override public void insertNum() { log.info("==============redis同步图片收藏数量到db数据开始!==============="); @@ -77,6 +74,7 @@ public class TiktokCollectionServiceImpl implements TiktokCollectionService { } @Override + @Transactional(rollbackFor = Exception.class) public void collect(Long userId, Long imgId) { String imgCollectNumKey = RedisKeyConstant.TIKTOK_IMG_COLLECT_NUM_KEY; TiktokCollection tiktokCollection = new TiktokCollection(); @@ -90,6 +88,7 @@ public class TiktokCollectionServiceImpl implements TiktokCollectionService { } @Override + @Transactional(rollbackFor = Exception.class) public void unCollect(Long userId, Long imgId) { String imgCollectNumKey = RedisKeyConstant.TIKTOK_IMG_COLLECT_NUM_KEY; LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/TiktokImgServiceImpl.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/TiktokImgServiceImpl.java index 1ae53ed..d4b54fe 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/TiktokImgServiceImpl.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/TiktokImgServiceImpl.java @@ -20,6 +20,7 @@ import org.checkerframework.checker.units.qual.A; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.Cursor; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.Date; import java.util.List; @@ -42,6 +43,7 @@ public class TiktokImgServiceImpl implements TiktokImgService { private RedisService redisService; @Override + @Transactional(rollbackFor = Exception.class) public int insert(TiktokImg tiktokImg) { tiktokImg.setCreateTime(new Date()); tiktokImg.setUpdateTime(new Date()); @@ -49,12 +51,14 @@ public class TiktokImgServiceImpl implements TiktokImgService { } @Override + @Transactional(rollbackFor = Exception.class) public int update(TiktokImg tiktokImg) { tiktokImg.setUpdateTime(new Date()); return tiktokImgMapper.updateById(tiktokImg); } @Override + @Transactional(rollbackFor = Exception.class) public int delete(List ids) { int delete = tiktokImgMapper.deleteBatchIds(ids); LambdaQueryWrapper likeWrapper = new LambdaQueryWrapper<>(); @@ -103,6 +107,7 @@ public class TiktokImgServiceImpl implements TiktokImgService { } @Override + @Transactional(rollbackFor = Exception.class) public int changeStatus(Long id, String status) { LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper<>(); wrapper.eq(TiktokImg::getId, id); @@ -112,6 +117,7 @@ public class TiktokImgServiceImpl implements TiktokImgService { } @Override + @Transactional(rollbackFor = Exception.class) public int changeJudge(Long id, String status) { LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper<>(); wrapper.eq(TiktokImg::getId, id); @@ -121,6 +127,7 @@ public class TiktokImgServiceImpl implements TiktokImgService { } @Override + @Transactional(rollbackFor = Exception.class) public int changeHot(Long id, String status) { LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper<>(); wrapper.eq(TiktokImg::getId, id); diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/TiktokLikeServiceImpl.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/TiktokLikeServiceImpl.java index 3570126..77b0cb8 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/TiktokLikeServiceImpl.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/TiktokLikeServiceImpl.java @@ -12,6 +12,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.Cursor; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.Date; import java.util.List; @@ -35,6 +36,7 @@ public class TiktokLikeServiceImpl implements TiktokLikeService { } @Override + @Transactional(rollbackFor = Exception.class) public void insertRecord() { log.info("==============redis同步点赞记录到db数据开始!==============="); long startTime = System.currentTimeMillis(); @@ -63,6 +65,7 @@ public class TiktokLikeServiceImpl implements TiktokLikeService { } @Override + @Transactional(rollbackFor = Exception.class) public void insertNum() { log.info("==============redis同步图片点赞数量到db数据开始!==============="); long startTime = System.currentTimeMillis(); @@ -85,11 +88,13 @@ public class TiktokLikeServiceImpl implements TiktokLikeService { } @Override + @Transactional(rollbackFor = Exception.class) public int delete(List ids) { return tiktokLikeMapper.deleteBatchIds(ids); } @Override + @Transactional(rollbackFor = Exception.class) public void like(Long userId, Long imgId) { String hashKey = getHashKey(userId,imgId); String redisKey = RedisKeyConstant.TIKTOK_USER_LIKE_KEY; @@ -101,6 +106,7 @@ public class TiktokLikeServiceImpl implements TiktokLikeService { } @Override + @Transactional(rollbackFor = Exception.class) public void unLike(Long userId, Long imgId) { String hashKey = getHashKey(userId,imgId); String redisKey = RedisKeyConstant.TIKTOK_USER_LIKE_KEY; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/TiktokUserServiceImpl.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/TiktokUserServiceImpl.java index 8131a0d..86d61a0 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/TiktokUserServiceImpl.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/TiktokUserServiceImpl.java @@ -26,6 +26,7 @@ import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import org.springframework.web.client.RestTemplate; import javax.annotation.Resource; @@ -87,6 +88,7 @@ public class TiktokUserServiceImpl implements TiktokUserService { } @Override + @Transactional(rollbackFor = Exception.class) public int insertCreator(TiktokCreaterDto dto) { //检查手机号是否存在 boolean b1 = checkPhone(Sm4Util.sm4Encryption(dto.getPhone())); @@ -112,6 +114,7 @@ public class TiktokUserServiceImpl implements TiktokUserService { } @Override + @Transactional(rollbackFor = Exception.class) public int update(TiktokUser tiktokUser) { tiktokUser.setUpdateTime(new Date()); if(StringUtils.isNotBlank(tiktokUser.getPhone())){ @@ -124,6 +127,7 @@ public class TiktokUserServiceImpl implements TiktokUserService { } @Override + @Transactional(rollbackFor = Exception.class) public int delete(List ids) { int delete = tiktokUserMapper.deleteBatchIds(ids); //删除对应用户图片 @@ -285,6 +289,7 @@ public class TiktokUserServiceImpl implements TiktokUserService { } @Override + @Transactional(rollbackFor = Exception.class) public int changeStatus(Long id, String status) { LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper<>(); wrapper.eq(TiktokUser::getId, id); @@ -294,6 +299,7 @@ public class TiktokUserServiceImpl implements TiktokUserService { } @Override + @Transactional(rollbackFor = Exception.class) public int miniUpdate(TiktokUserMiniDto dto) { if(StringUtils.isNotBlank(dto.getPhone())){ dto.setPhone(Sm4Util.sm4Encryption(dto.getPhone()));