diff --git a/buyer-api/src/main/resources/redisson.yaml b/buyer-api/src/main/resources/redisson.yaml new file mode 100644 index 00000000..ac8dfc66 --- /dev/null +++ b/buyer-api/src/main/resources/redisson.yaml @@ -0,0 +1,21 @@ +--- +singleServerConfig: + idleConnectionTimeout: 10000 + connectTimeout: 10000 + timeout: 3000 + retryAttempts: 3 + retryInterval: 1500 + password: lilishop + subscriptionsPerConnection: 5 + clientName: null + address: "redis://127.0.0.1:6379" + subscriptionConnectionMinimumIdleSize: 1 + subscriptionConnectionPoolSize: 50 + connectionMinimumIdleSize: 24 + connectionPoolSize: 64 + database: 0 + dnsMonitoringInterval: 5000 +threads: 16 +nettyThreads: 32 +codec: ! {} +transportMode: "NIO" \ No newline at end of file diff --git a/common-api/src/main/resources/redisson.yaml b/common-api/src/main/resources/redisson.yaml new file mode 100644 index 00000000..ac8dfc66 --- /dev/null +++ b/common-api/src/main/resources/redisson.yaml @@ -0,0 +1,21 @@ +--- +singleServerConfig: + idleConnectionTimeout: 10000 + connectTimeout: 10000 + timeout: 3000 + retryAttempts: 3 + retryInterval: 1500 + password: lilishop + subscriptionsPerConnection: 5 + clientName: null + address: "redis://127.0.0.1:6379" + subscriptionConnectionMinimumIdleSize: 1 + subscriptionConnectionPoolSize: 50 + connectionMinimumIdleSize: 24 + connectionPoolSize: 64 + database: 0 + dnsMonitoringInterval: 5000 +threads: 16 +nettyThreads: 32 +codec: ! {} +transportMode: "NIO" \ No newline at end of file diff --git a/consumer/src/main/resources/redisson.yaml b/consumer/src/main/resources/redisson.yaml new file mode 100644 index 00000000..ac8dfc66 --- /dev/null +++ b/consumer/src/main/resources/redisson.yaml @@ -0,0 +1,21 @@ +--- +singleServerConfig: + idleConnectionTimeout: 10000 + connectTimeout: 10000 + timeout: 3000 + retryAttempts: 3 + retryInterval: 1500 + password: lilishop + subscriptionsPerConnection: 5 + clientName: null + address: "redis://127.0.0.1:6379" + subscriptionConnectionMinimumIdleSize: 1 + subscriptionConnectionPoolSize: 50 + connectionMinimumIdleSize: 24 + connectionPoolSize: 64 + database: 0 + dnsMonitoringInterval: 5000 +threads: 16 +nettyThreads: 32 +codec: ! {} +transportMode: "NIO" \ No newline at end of file diff --git a/framework/pom.xml b/framework/pom.xml index 5990b777..d4c011bb 100644 --- a/framework/pom.xml +++ b/framework/pom.xml @@ -35,6 +35,12 @@ org.springframework.boot spring-boot-starter-quartz + + + slf4j-api + org.slf4j + + @@ -72,6 +78,10 @@ HdrHistogram org.hdrhistogram + + slf4j-api + org.slf4j + @@ -81,6 +91,12 @@ org.springframework.integration spring-integration-redis + + + slf4j-api + org.slf4j + + org.apache.commons @@ -96,29 +112,40 @@ com.baomidou mybatis-plus-boot-starter ${mybatis-plus-version} - - - org.mybatis.spring.boot - mybatis-spring-boot-starter-test - 2.2.0 + + + slf4j-api + org.slf4j + + mysql mysql-connector-java - ${mysql-connector-version} org.springframework.boot spring-boot-starter-data-redis - + + + org.redisson + redisson + ${redisson} + com.github.xiaoymin knife4j-spring-boot-starter ${knife4j.version} + + + slf4j-api + org.slf4j + + @@ -143,17 +170,17 @@ jasypt-spring-boot-starter ${jasypt-version} - - - org.redisson - redisson - ${redisson} - com.aliyun aliyun-java-sdk-core ${aliyun-version} + + + slf4j-api + org.slf4j + + @@ -177,6 +204,10 @@ org.jacoco.agent org.jacoco + + bcprov-jdk15on + org.bouncycastle + @@ -194,6 +225,10 @@ fastjson com.alibaba + + slf4j-api + org.slf4j + @@ -218,6 +253,12 @@ org.springframework.boot spring-boot-starter-test + + + slf4j-api + org.slf4j + + @@ -247,6 +288,14 @@ commons-collections4 org.apache.commons + + antlr4-runtime + org.antlr + + + slf4j-api + org.slf4j + @@ -254,6 +303,12 @@ org.apache.shardingsphere sharding-jdbc-spring-namespace ${sharding-jdbc-version} + + + slf4j-api + org.slf4j + + @@ -313,11 +368,6 @@ logstash-logback-encoder ${logstash-logback-encoder} - - - - - de.codecentric spring-boot-admin-starter-client diff --git a/framework/src/main/java/cn/lili/cache/config/redis/RedisConfig.java b/framework/src/main/java/cn/lili/cache/config/redis/RedisConfig.java index f7bf18e5..dbb8ad39 100644 --- a/framework/src/main/java/cn/lili/cache/config/redis/RedisConfig.java +++ b/framework/src/main/java/cn/lili/cache/config/redis/RedisConfig.java @@ -4,6 +4,9 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.parser.ParserConfig; import lombok.extern.slf4j.Slf4j; import org.apache.commons.codec.digest.DigestUtils; +import org.redisson.Redisson; +import org.redisson.api.RedissonClient; +import org.redisson.config.Config; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; @@ -17,6 +20,7 @@ import org.springframework.cache.interceptor.KeyGenerator; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Primary; +import org.springframework.core.io.ClassPathResource; import org.springframework.data.redis.cache.RedisCacheConfiguration; import org.springframework.data.redis.cache.RedisCacheManager; import org.springframework.data.redis.cache.RedisCacheWriter; @@ -27,6 +31,7 @@ import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.serializer.RedisSerializationContext; import org.springframework.data.redis.serializer.StringRedisSerializer; +import java.io.IOException; import java.time.Duration; import java.util.HashMap; import java.util.Map; @@ -99,6 +104,12 @@ public class RedisConfig extends CachingConfigurerSupport { return template; } + @Bean(destroyMethod = "shutdown") + public RedissonClient redisson() throws IOException { + return Redisson.create( + Config.fromYAML(new ClassPathResource("redisson.yaml").getInputStream())); + } + /** * 自定义缓存key生成策略，默认将使用该策略 */ diff --git a/framework/src/main/java/cn/lili/common/security/context/UserContext.java b/framework/src/main/java/cn/lili/common/security/context/UserContext.java index 6ecf8ee6..311c6bcb 100644 --- a/framework/src/main/java/cn/lili/common/security/context/UserContext.java +++ b/framework/src/main/java/cn/lili/common/security/context/UserContext.java @@ -45,8 +45,7 @@ public class UserContext { public static String getUuid() { if (RequestContextHolder.getRequestAttributes() != null) { HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); - String uuid = request.getHeader(SecurityEnum.UUID.getValue()); - return uuid; + return request.getHeader(SecurityEnum.UUID.getValue()); } return null; } diff --git a/framework/src/main/java/cn/lili/modules/member/token/MemberTokenGenerate.java b/framework/src/main/java/cn/lili/modules/member/token/MemberTokenGenerate.java index d903d549..b83ac909 100644 --- a/framework/src/main/java/cn/lili/modules/member/token/MemberTokenGenerate.java +++ b/framework/src/main/java/cn/lili/modules/member/token/MemberTokenGenerate.java @@ -1,15 +1,14 @@ package cn.lili.modules.member.token; +import cn.lili.common.context.ThreadContextHolder; +import cn.lili.common.enums.ClientTypeEnum; import cn.lili.common.properties.RocketmqCustomProperties; import cn.lili.common.security.AuthUser; import cn.lili.common.security.enums.UserEnums; import cn.lili.common.security.token.Token; import cn.lili.common.security.token.TokenUtil; import cn.lili.common.security.token.base.AbstractTokenGenerate; -import cn.lili.common.context.ThreadContextHolder; -import cn.lili.common.enums.ClientTypeEnum; import cn.lili.modules.member.entity.dos.Member; -import cn.lili.modules.member.service.MemberService; import cn.lili.rocketmq.RocketmqSendCallbackBuilder; import cn.lili.rocketmq.tags.MemberTagsEnum; import org.apache.rocketmq.spring.core.RocketMQTemplate; diff --git a/framework/src/main/java/cn/lili/modules/member/token/StoreTokenGenerate.java b/framework/src/main/java/cn/lili/modules/member/token/StoreTokenGenerate.java index 558289df..bb0d70fe 100644 --- a/framework/src/main/java/cn/lili/modules/member/token/StoreTokenGenerate.java +++ b/framework/src/main/java/cn/lili/modules/member/token/StoreTokenGenerate.java @@ -8,7 +8,6 @@ import cn.lili.common.security.token.Token; import cn.lili.common.security.token.TokenUtil; import cn.lili.common.security.token.base.AbstractTokenGenerate; import cn.lili.modules.member.entity.dos.Member; -import cn.lili.modules.member.service.MemberService; import cn.lili.modules.store.entity.dos.Store; import cn.lili.modules.store.service.StoreService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -31,7 +30,7 @@ public class StoreTokenGenerate extends AbstractTokenGenerate { @Override public Token createToken(Member member, Boolean longTerm) { - if (!member.getHaveStore()) { + if (Boolean.FALSE.equals(member.getHaveStore())) { throw new ServiceException(ResultCode.STORE_NOT_OPEN); } LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wallet/WalletPlugin.java b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wallet/WalletPlugin.java index 86c31727..79245326 100644 --- a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wallet/WalletPlugin.java +++ b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wallet/WalletPlugin.java @@ -19,7 +19,6 @@ import cn.lili.modules.wallet.entity.dto.MemberWalletUpdateDTO; import cn.lili.modules.wallet.entity.enums.DepositServiceTypeEnum; import cn.lili.modules.wallet.service.MemberWalletService; import lombok.extern.slf4j.Slf4j; -import org.redisson.Redisson; import org.redisson.api.RLock; import org.redisson.api.RedissonClient; import org.springframework.beans.factory.annotation.Autowired; diff --git a/framework/src/main/java/cn/lili/modules/permission/serviceimpl/SystemLogServiceImpl.java b/framework/src/main/java/cn/lili/modules/permission/serviceimpl/SystemLogServiceImpl.java index c397e9f1..7b519465 100644 --- a/framework/src/main/java/cn/lili/modules/permission/serviceimpl/SystemLogServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/permission/serviceimpl/SystemLogServiceImpl.java @@ -22,7 +22,6 @@ import org.springframework.data.elasticsearch.core.SearchHit; import org.springframework.data.elasticsearch.core.SearchHits; import org.springframework.data.elasticsearch.core.query.NativeSearchQueryBuilder; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; import java.util.List; import java.util.stream.Collectors; @@ -65,9 +64,10 @@ public class SystemLogServiceImpl implements SystemLogService { @Override public IPage queryLog(String storeId, String operatorName, String key, SearchVO searchVo, PageVO pageVO) { + pageVO.setNotConvert(true); IPage iPage = new Page<>(); NativeSearchQueryBuilder nativeSearchQueryBuilder = new NativeSearchQueryBuilder(); - if (pageVO != null) { + if (pageVO.getPageNumber() != null && pageVO.getPageSize() != null) { int pageNumber = pageVO.getPageNumber() - 1; if (pageNumber < 0) { pageNumber = 0; @@ -107,16 +107,15 @@ public class SystemLogServiceImpl implements SystemLogService { nativeSearchQueryBuilder.withFilter(filterBuilder); } - SearchHits searchResult = restTemplate.search(nativeSearchQueryBuilder.build(), SystemLogVO.class); - - iPage.setTotal(searchResult.getTotalHits()); - - if (pageVO != null && CharSequenceUtil.isNotEmpty(pageVO.getOrder()) && CharSequenceUtil.isNotEmpty(pageVO.getSort())) { + if (CharSequenceUtil.isNotEmpty(pageVO.getOrder()) && CharSequenceUtil.isNotEmpty(pageVO.getSort())) { nativeSearchQueryBuilder.withSort(SortBuilders.fieldSort(pageVO.getSort()).order(SortOrder.valueOf(pageVO.getOrder().toUpperCase()))); } else { nativeSearchQueryBuilder.withSort(SortBuilders.fieldSort("createTime").order(SortOrder.DESC)); } + SearchHits searchResult = restTemplate.search(nativeSearchQueryBuilder.build(), SystemLogVO.class); + + iPage.setTotal(searchResult.getTotalHits()); iPage.setRecords(searchResult.getSearchHits().stream().map(SearchHit::getContent).collect(Collectors.toList())); return iPage; diff --git a/manager-api/src/main/java/cn/lili/controller/setting/LogManagerController.java b/manager-api/src/main/java/cn/lili/controller/setting/LogManagerController.java index e8b6fd22..d540bb3f 100644 --- a/manager-api/src/main/java/cn/lili/controller/setting/LogManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/setting/LogManagerController.java @@ -9,7 +9,6 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -32,12 +31,12 @@ public class LogManagerController { @GetMapping(value = "/getAllByPage") @ApiOperation(value = "分页获取全部") public ResultMessage getAllByPage(@RequestParam(required = false) Integer type, - @RequestParam String key, + @RequestParam String searchKey, String operatorName, SearchVO searchVo, PageVO pageVo) { try { - return ResultUtil.data(systemLogService.queryLog(null, operatorName, key, searchVo, pageVo)); + return ResultUtil.data(systemLogService.queryLog(null, operatorName, searchKey, searchVo, pageVo)); } catch (Exception e) { log.error("日志获取错误",e); } diff --git a/manager-api/src/main/resources/redisson.yaml b/manager-api/src/main/resources/redisson.yaml new file mode 100644 index 00000000..ac8dfc66 --- /dev/null +++ b/manager-api/src/main/resources/redisson.yaml @@ -0,0 +1,21 @@ +--- +singleServerConfig: + idleConnectionTimeout: 10000 + connectTimeout: 10000 + timeout: 3000 + retryAttempts: 3 + retryInterval: 1500 + password: lilishop + subscriptionsPerConnection: 5 + clientName: null + address: "redis://127.0.0.1:6379" + subscriptionConnectionMinimumIdleSize: 1 + subscriptionConnectionPoolSize: 50 + connectionMinimumIdleSize: 24 + connectionPoolSize: 64 + database: 0 + dnsMonitoringInterval: 5000 +threads: 16 +nettyThreads: 32 +codec: ! {} +transportMode: "NIO" \ No newline at end of file diff --git a/manager-api/src/test/java/cn/lili/test/promotion/SeckillTest.java b/manager-api/src/test/java/cn/lili/test/promotion/SeckillTest.java index 97df9614..b5de0d58 100644 --- a/manager-api/src/test/java/cn/lili/test/promotion/SeckillTest.java +++ b/manager-api/src/test/java/cn/lili/test/promotion/SeckillTest.java @@ -50,10 +50,11 @@ class SeckillTest { System.out.println(setting); SeckillSetting seckillSetting = new Gson().fromJson(setting.getSettingValue(), SeckillSetting.class); System.out.println(seckillSetting); - Seckill seckill = new Seckill(SeckillService.PRE_CREATION, seckillSetting.getHours(), seckillSetting.getSeckillRule()); - System.out.println(seckill); - boolean result = seckillService.savePromotions(seckill); - System.out.println(result); + boolean result = true; + for (int i = 1; i <= SeckillService.PRE_CREATION; i++) { + Seckill seckill = new Seckill(i, seckillSetting.getHours(), seckillSetting.getSeckillRule()); + seckillService.savePromotions(seckill); + } Assertions.assertTrue(result); } diff --git a/pom.xml b/pom.xml index 003e84e7..4b74886c 100644 --- a/pom.xml +++ b/pom.xml @@ -19,43 +19,42 @@ 1.8 4.2.3 - registry.cn-beijing.aliyuncs.com/lili-images - 1 - 4.22.17.ALL - 8.0.27 - 3.4.3.4 - 5.7.18 - 2.0.3.RELEASE - 3.0.0 - 2.9.10 - 1.18.22 - 3.5.5 - 4.5.18 - 3.11.1 - 2.0.8 - 2.2.1 - 0.10.7 - 4.7.2 - 4.0.0 - 1.1.20 - 1.0.3 - 4.7.2 - 4.4.1 - 4.5.12 UTF-8 UTF-8 true + registry.cn-beijing.aliyuncs.com/lili-images + 1 + 4.22.32.ALL + 3.5.1 + 5.7.20 + 2.0.3.RELEASE + 3.0.4 + 2.9.10 + 1.18.22 + 3.15.6 + 4.5.18 + 3.11.1 + 2.0.8 + 4.6.0 + 3.14.0 + 2.0.9 + 2.2.1 + 0.11.2 + 4.0.0 + 1.2.8 + 1.0.3 + 4.7.2 + 4.7.2 2.0.9 - 2.3.1 + 2.6.2 1.21 - 1.2 5.1.0 5.1.0 - 6.6 + 7.0.1 3.4.1 - 1.7.28 + 1.7.35 3.2.3 - 1.4 + 1.9 4.3 2.3.0 1.2.2 diff --git a/seller-api/src/main/java/cn/lili/controller/settings/LogStoreController.java b/seller-api/src/main/java/cn/lili/controller/settings/LogStoreController.java index e716d110..5ecead02 100644 --- a/seller-api/src/main/java/cn/lili/controller/settings/LogStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/settings/LogStoreController.java @@ -9,7 +9,6 @@ import cn.lili.modules.permission.service.SystemLogService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; diff --git a/seller-api/src/main/resources/redisson.yaml b/seller-api/src/main/resources/redisson.yaml new file mode 100644 index 00000000..ac8dfc66 --- /dev/null +++ b/seller-api/src/main/resources/redisson.yaml @@ -0,0 +1,21 @@ +--- +singleServerConfig: + idleConnectionTimeout: 10000 + connectTimeout: 10000 + timeout: 3000 + retryAttempts: 3 + retryInterval: 1500 + password: lilishop + subscriptionsPerConnection: 5 + clientName: null + address: "redis://127.0.0.1:6379" + subscriptionConnectionMinimumIdleSize: 1 + subscriptionConnectionPoolSize: 50 + connectionMinimumIdleSize: 24 + connectionPoolSize: 64 + database: 0 + dnsMonitoringInterval: 5000 +threads: 16 +nettyThreads: 32 +codec: ! {} +transportMode: "NIO" \ No newline at end of file