代码规范调整

techa03 · Nov 23, 2019 · 2b86e5e · 2b86e5e
1 parent c53c9ed
commit 2b86e5e
Show file tree

Hide file tree

Showing 12 changed files with 16 additions and 40 deletions.
diff --git a/...ongo-service/src/main/java/com/goodskill/mongo/service/listener/MongoMessageListener.java b/...ongo-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/...r/goodsKill-generator/src/main/java/org/seckill/dao/generator/GeneratorServiceEntity.java b/...r/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/...-provider/goodsKill-mp-dao/src/test/java/org/seckill/mp/dao/mapper/SeckillMapperTest.java b/...-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/...l-service/src/main/java/org/seckill/service/mock/strategy/RedisMongoReactiveStrategy.java b/...l-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/...vider/goodsKill-service/src/main/java/org/seckill/service/mp/impl/SeckillServiceImpl.java b/...vider/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<SeckillMapper, Seckill> 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/...rovider/goodsKill-service/src/main/java/org/seckill/service/mq/SeckillActiveConsumer.java b/...rovider/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/...provider/goodsKill-service/src/main/java/org/seckill/service/mq/SekcillKafkaConsumer.java b/...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/...der/goodsKill-service/src/test/java/org/seckill/service/mp/impl/GoodsServiceImplTest.java b/...der/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());
     }
 }
diff --git a/...r/goodsKill-service/src/test/java/org/seckill/service/mp/impl/SeckillServiceImplTest.java b/...r/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/...der/goodsKill-service/src/test/java/org/seckill/service/mq/SeckillActiveConsumerTest.java b/...der/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/...er/goodsKill-util/src/main/java/org/seckill/util/common/util/GenerateProjectTreeUtil.java b/...er/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<String> regExpList = new ArrayList<>();
     private static List<String> regDirExpList = new ArrayList<>();
 

diff --git a/...-web-consumer/goodsKill-web/src/main/java/org/seckill/web/controller/AdminController.java b/...-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