fix: 暂时回滚protobuf-java 版本

abi-cloud-qr-platform-common/src/main/java/com/abi/task/common/tablestore/TableStoreUtils.java

@@ -453,7 +453,7 @@ public class TableStoreUtils {
 
 
     public Map<String,String> listTables() {
-        List<String> tableNames = client().listTable().getTableNames();
+        List<String> tableNames = this.listTable();
         if (CollectionUtil.isNotEmpty(tableNames)){
             return tableNames.stream().collect(Collectors.toMap(t->t,t->t));
         }

abi-cloud-qr-platform-server/pom.xml

@@ -29,19 +29,8 @@
             <groupId>com.abi.qr.platform</groupId>
             <artifactId>abi-cloud-qr-platform-common</artifactId>
             <version>1.0-SNAPSHOT</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>com.google.protobuf</groupId>
-                    <artifactId>protobuf-java</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <!-- 其他微服务api -->
-        <dependency>
-            <groupId>com.google.protobuf</groupId>
-            <artifactId>protobuf-java</artifactId>
-            <version>3.4.0</version>
         </dependency>
+
         <!-- 外部jar包 -->
         <dependency>
             <groupId>org.springframework.cloud</groupId>

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/controller/console/QrPackageController.java

@@ -61,6 +61,7 @@ public class QrPackageController {
 
     @ApiOperation("审核通过码包")
     @PostMapping("/passQrPackage")
+    @PassToken
     public BaseResponse passQrPackage(@Validated @RequestBody PassQrPackageReq passQrPackageReq) {
         qrPackageService.passQrPackage(passQrPackageReq);
         return BaseResponse.create();

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dao/mapper/BaseBrandMapper.java

@@ -1,11 +1,7 @@
 package com.abi.qms.platform.dao.mapper;
 
 import com.abi.qms.platform.dao.entity.BaseBrand;
-import com.abi.qms.platform.dao.vo.result.ActivePackageVO;
-import com.abi.qms.platform.dto.req.ListActivePackageAddReq;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/infrastructure/config/RabbitmqConfig.java

@@ -1,6 +1,7 @@
 package com.abi.qms.platform.infrastructure.config;
 
 import com.abi.qms.platform.infrastructure.mq.GenerateCodeConsumer;
+import com.abi.qms.platform.infrastructure.mq.TableStoreBatchInsertConsumer;
 import org.springframework.amqp.core.Queue;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -19,4 +20,9 @@ public class RabbitmqConfig {
 		return new Queue(GenerateCodeConsumer.GENERATE_CODE_BY_REPERTORY_QUEUE);
 	}
 
+	@Bean
+	public Queue declareTableBatchInsertQueue() {
+		return new Queue(TableStoreBatchInsertConsumer.TABLE_STORE_BATCH_INSERT_QUEUE);
+	}
+
 }

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/infrastructure/mq/TableStoreBatchInsertConsumer.java

@@ -0,0 +1,33 @@
+package com.abi.qms.platform.infrastructure.mq;
+
+import com.rabbitmq.client.Channel;
+import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.amqp.core.Message;
+import org.springframework.amqp.rabbit.annotation.RabbitListener;
+import org.springframework.amqp.rabbit.listener.api.ChannelAwareMessageListener;
+import org.springframework.stereotype.Component;
+
+/**
+ * @className: com.abi.qms.platform.infrastructure.mq-> TableStoreBatchInsertConsumer
+ * @description: tableStore batchInsert
+ * @author: Marko.W
+ * @createDate: 2021-06-16 10:39
+ * @version: 1.0
+ * @todo:
+ */
+@Slf4j
+@Component
+public class TableStoreBatchInsertConsumer implements ChannelAwareMessageListener {
+
+    public static final String TABLE_STORE_BATCH_INSERT_QUEUE = "table_store__queue";
+
+
+
+    @Override
+    @SneakyThrows
+    @RabbitListener(queues = TABLE_STORE_BATCH_INSERT_QUEUE)
+    public void onMessage(Message message, Channel channel){
+
+    }
+}

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/infrastructure/qr/build/parent/RandomBuildCode.java

@@ -1,4 +1,7 @@
 package com.abi.qms.platform.infrastructure.qr.build.parent;
+import com.abi.task.common.api.exception.BusinessException;
+
+import javax.annotation.PostConstruct;
 import java.security.NoSuchAlgorithmException;
 import java.security.SecureRandom;
 import java.util.Random;
@@ -17,12 +20,13 @@ public abstract class RandomBuildCode extends BuildCode {
     /**
      * SecureRandom is preferred to Random
      */
-    private Random rand;
-    {
+    private static Random rand;
+
+    static {
         try {
             rand = getInstanceStrong();
         } catch (NoSuchAlgorithmException e) {
-            e.printStackTrace();
+            throw new BusinessException(404,"初始化随机数生成方法异常");
         }
     }
 

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/infrastructure/util/RandomCodeUtils.java

@@ -18,11 +18,11 @@ public class RandomCodeUtils {
      * SecureRandom is preferred to Random
      */
     private static Random rand;
-    {
+    static {
         try {
             rand = getInstanceStrong();
         } catch (NoSuchAlgorithmException e) {
-           throw new BusinessException(404,"初始化随机数生成方法异常");
+            throw new BusinessException(404,"初始化随机数生成方法异常");
         }
     }
 
@@ -63,4 +63,4 @@ public class RandomCodeUtils {
         return result.toString();
     }
 
-}
+}

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/runner/CheckTableStoreRunner.java

@@ -1,22 +1,13 @@
 package com.abi.qms.platform.runner;
 
 import com.abi.qms.platform.dao.tablestore.entity.QrCode;
-import com.abi.task.common.api.exception.BusinessException;
 import com.abi.task.common.tablestore.TableStoreUtils;
 import com.abi.task.common.tablestore.common.TableStore;
 import com.google.common.collect.Sets;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.ApplicationArguments;
 import org.springframework.boot.ApplicationRunner;
-import org.springframework.boot.actuate.beans.BeansEndpoint;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationContextAware;
-import org.springframework.core.io.Resource;
-import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
-import org.springframework.core.type.classreading.CachingMetadataReaderFactory;
-import org.springframework.core.type.classreading.MetadataReader;
 import org.springframework.stereotype.Component;
 
 import java.util.Map;
@@ -38,15 +29,13 @@ public class CheckTableStoreRunner implements ApplicationRunner {
     @Autowired
     private TableStoreUtils tableStoreUtils;
 
-    @Autowired
-    private ApplicationContextAware applicationContextAware;
 
     private static AtomicInteger retryTimes = new AtomicInteger(0);
     private static String RESOURCE_PATH = "classpath*:com/abi/qms/platform/dao/tablestore/entity/*.class";
 
 
     @Override
-    public void run(ApplicationArguments args) throws Exception {
+    public void run(ApplicationArguments args){
         Set<TableStore> tableNames = getAllEntity();
         Map<String,String> existTableNames = tableStoreUtils.listTables();
         tableNames.stream()
@@ -62,34 +51,6 @@ public class CheckTableStoreRunner implements ApplicationRunner {
     private static Set<TableStore> getAllEntity(){
         Set<TableStore> ret = Sets.newHashSet();
         ret.add(QrCode.class.getAnnotation(TableStore.class));
-//        PathMatchingResourcePatternResolver pathMatchingResourcePatternResolver = new PathMatchingResourcePatternResolver();
-//        CachingMetadataReaderFactory cachingMetadataReaderFactory = new CachingMetadataReaderFactory();
-//        try {
-//            Resource[] resources = pathMatchingResourcePatternResolver.getResources(RESOURCE_PATH);
-//            ClassLoader loader = ClassLoader.getSystemClassLoader();
-//            for (Resource resource : resources) {
-//                MetadataReader reader = cachingMetadataReaderFactory.getMetadataReader(resource);
-//                String className = reader.getClassMetadata().getClassName();
-//                Class aClass = loader.loadClass(className);
-//                TableStore annotation = (TableStore) aClass.getAnnotation(TableStore.class);
-//                if (ObjectUtils.isNotEmpty(annotation)){
-//                    ret.add(annotation);
-//                }
-//            }
-//        } catch (Exception e) {
-//            if (retryTimes.getAndIncrement()>2){
-//                log.error("TableStore 初始化检查失败",e);
-//                throw new BusinessException(500,"TableStore 初始化检查失败");
-//            }
-//            try {
-//                Thread.sleep(retryTimes.get() * 1000);
-//            } catch (InterruptedException interruptedException) {
-//                // Do Nothing
-//            }
-//            //进行当前重试
-//            log.info("当前开始重试,第{}次",retryTimes.get());
-//            return getAllEntity();
-//        }
         return ret;
     }
 

version.txt

@@ -1 +1 @@
-feature1.0.02106160956
+feature1.0.02106161123