diff --git a/goodsKill-mongo-provider/goodskill-mongo-service/src/main/java/com/goodskill/mongo/service/listener/MongoMessageListener.java b/goodsKill-mongo-provider/goodskill-mongo-service/src/main/java/com/goodskill/mongo/service/listener/MongoMessageListener.java index fd17e7ce..73e587bb 100644 --- a/goodsKill-mongo-provider/goodskill-mongo-service/src/main/java/com/goodskill/mongo/service/listener/MongoMessageListener.java +++ b/goodsKill-mongo-provider/goodskill-mongo-service/src/main/java/com/goodskill/mongo/service/listener/MongoMessageListener.java @@ -2,7 +2,6 @@ import com.goodskill.mongo.entity.SuccessKilledDto; import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.mongodb.core.ReactiveMongoTemplate; import org.springframework.jms.annotation.JmsListener; import org.springframework.stereotype.Component; @@ -20,8 +19,11 @@ @Component @Slf4j public class MongoMessageListener { - @Autowired - ReactiveMongoTemplate ops; + private final ReactiveMongoTemplate ops; + + public MongoMessageListener(ReactiveMongoTemplate ops) { + this.ops = ops; + } /** * 监听指定队列,并发数10-20 diff --git a/goodsKill-spring-boot-provider/goodsKill-generator/src/main/java/org/seckill/dao/generator/GeneratorServiceEntity.java b/goodsKill-spring-boot-provider/goodsKill-generator/src/main/java/org/seckill/dao/generator/GeneratorServiceEntity.java index bf80feb3..0d83bbef 100644 --- a/goodsKill-spring-boot-provider/goodsKill-generator/src/main/java/org/seckill/dao/generator/GeneratorServiceEntity.java +++ b/goodsKill-spring-boot-provider/goodsKill-generator/src/main/java/org/seckill/dao/generator/GeneratorServiceEntity.java @@ -44,7 +44,6 @@ private static void generateByTables(boolean serviceNameStartWithI, String pack final String username = System.getProperty("user.name"); - final String projectLocalPath = System.getProperty("user.dir"); config.setActiveRecord(false) .setAuthor(username) .setEnableCache(false) diff --git a/goodsKill-spring-boot-provider/goodsKill-mp-dao/src/test/java/org/seckill/mp/dao/mapper/SeckillMapperTest.java b/goodsKill-spring-boot-provider/goodsKill-mp-dao/src/test/java/org/seckill/mp/dao/mapper/SeckillMapperTest.java index 90335469..e1a50f20 100644 --- a/goodsKill-spring-boot-provider/goodsKill-mp-dao/src/test/java/org/seckill/mp/dao/mapper/SeckillMapperTest.java +++ b/goodsKill-spring-boot-provider/goodsKill-mp-dao/src/test/java/org/seckill/mp/dao/mapper/SeckillMapperTest.java @@ -31,7 +31,4 @@ public void reduceNumberOptimized() { assertTrue(count >= 0); } - @Test - public void reduceNumberByProcedure() { - } } diff --git a/goodsKill-spring-boot-provider/goodsKill-service/src/main/java/org/seckill/service/mock/strategy/RedisMongoReactiveStrategy.java b/goodsKill-spring-boot-provider/goodsKill-service/src/main/java/org/seckill/service/mock/strategy/RedisMongoReactiveStrategy.java index d955f8f8..96bfb20a 100644 --- a/goodsKill-spring-boot-provider/goodsKill-service/src/main/java/org/seckill/service/mock/strategy/RedisMongoReactiveStrategy.java +++ b/goodsKill-spring-boot-provider/goodsKill-service/src/main/java/org/seckill/service/mock/strategy/RedisMongoReactiveStrategy.java @@ -6,7 +6,6 @@ import org.seckill.entity.Seckill; import org.seckill.mp.dao.mapper.SeckillMapper; import org.seckill.service.common.RedisService; -import org.seckill.service.inner.SeckillExecutor; import org.seckill.service.mq.ActiveMqMessageSender; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.RedisTemplate; @@ -26,8 +25,6 @@ @Component @Slf4j public class RedisMongoReactiveStrategy implements GoodsKillStrategy { - @Autowired - private SeckillExecutor seckillExecutor; @Autowired private RedisService redisService; @Autowired diff --git a/goodsKill-spring-boot-provider/goodsKill-service/src/main/java/org/seckill/service/mp/impl/SeckillServiceImpl.java b/goodsKill-spring-boot-provider/goodsKill-service/src/main/java/org/seckill/service/mp/impl/SeckillServiceImpl.java index f187af5a..da42b7be 100644 --- a/goodsKill-spring-boot-provider/goodsKill-service/src/main/java/org/seckill/service/mp/impl/SeckillServiceImpl.java +++ b/goodsKill-spring-boot-provider/goodsKill-service/src/main/java/org/seckill/service/mp/impl/SeckillServiceImpl.java @@ -24,14 +24,12 @@ import org.seckill.mp.dao.mapper.SuccessKilledMapper; import org.seckill.service.common.RedisService; import org.seckill.service.common.trade.alipay.AlipayRunner; -import org.seckill.service.inner.SeckillExecutor; import org.seckill.service.mock.strategy.GoodsKillStrategyEnum; import org.seckill.util.common.util.DateUtil; import org.seckill.util.common.util.MD5Util; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.core.ValueOperations; -import org.springframework.jms.core.JmsTemplate; import org.springframework.transaction.annotation.Transactional; import java.math.BigInteger; @@ -55,12 +53,8 @@ @Slf4j public class SeckillServiceImpl extends ServiceImpl implements SeckillService { - @Autowired - SeckillExecutor seckillExecutor; - @Autowired - JmsTemplate jmsTemplate; @Reference(version = "1.0.0", check = false) - SuccessKilledMongoService successKilledMongoService; + private SuccessKilledMongoService successKilledMongoService; @Autowired private AlipayRunner alipayRunner; @Autowired diff --git a/goodsKill-spring-boot-provider/goodsKill-service/src/main/java/org/seckill/service/mq/SeckillActiveConsumer.java b/goodsKill-spring-boot-provider/goodsKill-service/src/main/java/org/seckill/service/mq/SeckillActiveConsumer.java index 0f605299..53453b8f 100644 --- a/goodsKill-spring-boot-provider/goodsKill-service/src/main/java/org/seckill/service/mq/SeckillActiveConsumer.java +++ b/goodsKill-spring-boot-provider/goodsKill-service/src/main/java/org/seckill/service/mq/SeckillActiveConsumer.java @@ -1,8 +1,6 @@ package org.seckill.service.mq; import lombok.extern.slf4j.Slf4j; -import org.seckill.mp.dao.mapper.SeckillMapper; -import org.seckill.mp.dao.mapper.SuccessKilledMapper; import org.seckill.service.inner.SeckillExecutor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; @@ -20,10 +18,6 @@ */ @Slf4j public class SeckillActiveConsumer implements MessageListener { - @Autowired - private SeckillMapper seckillMapper; - @Autowired - private SuccessKilledMapper successKilledMapper; @Autowired @Qualifier("jmsTemplate") private JmsTemplate jmsTemplate; diff --git a/goodsKill-spring-boot-provider/goodsKill-service/src/main/java/org/seckill/service/mq/SekcillKafkaConsumer.java b/goodsKill-spring-boot-provider/goodsKill-service/src/main/java/org/seckill/service/mq/SekcillKafkaConsumer.java index db11d96e..d0e48db9 100644 --- a/goodsKill-spring-boot-provider/goodsKill-service/src/main/java/org/seckill/service/mq/SekcillKafkaConsumer.java +++ b/goodsKill-spring-boot-provider/goodsKill-service/src/main/java/org/seckill/service/mq/SekcillKafkaConsumer.java @@ -56,6 +56,7 @@ public void onMessage(Object data) { /** * 此为ActiveMq消息监听器(监听模拟秒杀场景八消息队列) + * * @param message 消息 */ @JmsListener(destination = "GOODSKILL_SENCE8") @@ -80,9 +81,10 @@ public void processMessage(Message message) { * * @param seckillId 秒杀活动id * @param userPhone 用户手机号 - * @param note 备注 + * @param note 备注 */ private void dealSeckill(long seckillId, String userPhone, String note) { + log.info("seckillId:{},userphone:{}", seckillId, userPhone); Seckill seckill = redisService.getSeckill(seckillId); long number = redisTemplate.opsForValue().increment(seckillId); if (number < seckill.getNumber()) { diff --git a/goodsKill-spring-boot-provider/goodsKill-service/src/test/java/org/seckill/service/mp/impl/GoodsServiceImplTest.java b/goodsKill-spring-boot-provider/goodsKill-service/src/test/java/org/seckill/service/mp/impl/GoodsServiceImplTest.java index 539c29bd..091cfe29 100644 --- a/goodsKill-spring-boot-provider/goodsKill-service/src/test/java/org/seckill/service/mp/impl/GoodsServiceImplTest.java +++ b/goodsKill-spring-boot-provider/goodsKill-service/src/test/java/org/seckill/service/mp/impl/GoodsServiceImplTest.java @@ -9,7 +9,6 @@ import org.seckill.entity.Goods; import org.seckill.mp.dao.mapper.GoodsMapper; -import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.only; import static org.mockito.Mockito.verify; @@ -33,6 +32,6 @@ public void uploadGoodsPhoto() { public void addGoods() { Goods goods = new Goods(); goodsService.addGoods(goods, new byte[100]); - assertTrue(true); + verify(goodsEsService, only()).save(any()); } } \ No newline at end of file diff --git a/goodsKill-spring-boot-provider/goodsKill-service/src/test/java/org/seckill/service/mp/impl/SeckillServiceImplTest.java b/goodsKill-spring-boot-provider/goodsKill-service/src/test/java/org/seckill/service/mp/impl/SeckillServiceImplTest.java index c829d239..0097db63 100644 --- a/goodsKill-spring-boot-provider/goodsKill-service/src/test/java/org/seckill/service/mp/impl/SeckillServiceImplTest.java +++ b/goodsKill-spring-boot-provider/goodsKill-service/src/test/java/org/seckill/service/mp/impl/SeckillServiceImplTest.java @@ -78,14 +78,6 @@ public void deleteSuccessKillRecord() { verify(successKilledMapper, only()).delete(any()); } - @Test - public void execute() { -// SeckillMockRequestDto requestDto = new SeckillMockRequestDto(1L, 10, "1324"); -// when().thenReturn(null); -// doNothing(seckillExecutor.dealSeckill(1L, "1324", SQL_PROCEDURE.getName())); -// seckillService.execute(requestDto, GoodsKillStrategyEnum.PROCEDURE.getCode()); - } - @Test public void getSuccessKillCount() { when(successKilledMapper.selectCount(any())).thenReturn(0); diff --git a/goodsKill-spring-boot-provider/goodsKill-service/src/test/java/org/seckill/service/mq/SeckillActiveConsumerTest.java b/goodsKill-spring-boot-provider/goodsKill-service/src/test/java/org/seckill/service/mq/SeckillActiveConsumerTest.java index 227d0780..05fae1a1 100644 --- a/goodsKill-spring-boot-provider/goodsKill-service/src/test/java/org/seckill/service/mq/SeckillActiveConsumerTest.java +++ b/goodsKill-spring-boot-provider/goodsKill-service/src/test/java/org/seckill/service/mq/SeckillActiveConsumerTest.java @@ -14,6 +14,7 @@ import static org.mockito.Mockito.*; + @RunWith(MockitoJUnitRunner.class) public class SeckillActiveConsumerTest { @InjectMocks diff --git a/goodsKill-spring-boot-provider/goodsKill-util/src/main/java/org/seckill/util/common/util/GenerateProjectTreeUtil.java b/goodsKill-spring-boot-provider/goodsKill-util/src/main/java/org/seckill/util/common/util/GenerateProjectTreeUtil.java index a1d01e11..0cc3232f 100644 --- a/goodsKill-spring-boot-provider/goodsKill-util/src/main/java/org/seckill/util/common/util/GenerateProjectTreeUtil.java +++ b/goodsKill-spring-boot-provider/goodsKill-util/src/main/java/org/seckill/util/common/util/GenerateProjectTreeUtil.java @@ -12,7 +12,6 @@ * */ public class GenerateProjectTreeUtil { - private static StringBuffer sb = new StringBuffer("|--"); private static List regExpList = new ArrayList<>(); private static List regDirExpList = new ArrayList<>(); diff --git a/goodsKill-spring-boot-web-consumer/goodsKill-web/src/main/java/org/seckill/web/controller/AdminController.java b/goodsKill-spring-boot-web-consumer/goodsKill-web/src/main/java/org/seckill/web/controller/AdminController.java index 7d0b565e..e59826a4 100644 --- a/goodsKill-spring-boot-web-consumer/goodsKill-web/src/main/java/org/seckill/web/controller/AdminController.java +++ b/goodsKill-spring-boot-web-consumer/goodsKill-web/src/main/java/org/seckill/web/controller/AdminController.java @@ -27,15 +27,15 @@ @Slf4j public class AdminController { @Reference(version = "${demo.service.version}") - UserAccountService userService; + private UserAccountService userService; @Reference(version = "${demo.service.version}") - RoleService roleService; + private RoleService roleService; @Reference(version = "${demo.service.version}") - UserRoleService userRoleService; + private UserRoleService userRoleService; @Reference(version = "${demo.service.version}") - PermissionService permissionService; + private PermissionService permissionService; @Reference(version = "${demo.service.version}") - RolePermissionService rolePermissionService; + private RolePermissionService rolePermissionService; @GetMapping("/role") @ResponseBody