优化

platform-common/src/main/java/com/platform/common/validation/config/ValidatorConfig.java

@@ -1,33 +0,0 @@
-package com.platform.common.validation.config;
-
-import lombok.AllArgsConstructor;
-import org.hibernate.validator.HibernateValidator;
-import org.springframework.cache.annotation.EnableCaching;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-import javax.validation.Validation;
-import javax.validation.Validator;
-import javax.validation.ValidatorFactory;
-
-/**
- * @Description Redis 配置类
- * @Author chenyuehu
- * @Date 2019/5/7
- * @Version Copyright (c) 2019,北京乾元坤和科技有限公司 All rights reserved.
- */
-@EnableCaching
-@Configuration
-@AllArgsConstructor
-public class ValidatorConfig {
-
-    @Bean
-    public Validator validator() {
-        ValidatorFactory validatorFactory = Validation.byProvider(HibernateValidator.class)
-                .configure()
-                .addProperty("hibernate.validator.fail_fast", "true")
-                .buildValidatorFactory();
-        return validatorFactory.getValidator();
-    }
-
-}

platform-opc/src/main/java/com/platform/opc/OpcApplication.java

@@ -1,7 +1,5 @@
 package com.platform.opc;
 
-import com.platform.opc.util.OpcDAClient;
-import com.platform.opc.util.OpcUAClientUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.SpringApplication;
@@ -17,7 +15,7 @@ import java.util.TimeZone;
  * @Date 2019/7/22
  * @Version Copyright (c) 2019,北京乾元坤和科技有限公司 All rights reserved.
  */
-@SpringBootApplication
+@SpringBootApplication(scanBasePackages = {"com.platform.common", "com.platform.opc"})
 @EnableScheduling
 @Order(1)
 @Slf4j
@@ -30,7 +28,7 @@ public class OpcApplication implements CommandLineRunner {
 
     @Override
     public void run(String... args) throws Exception {
-        OpcDAClient.run();
+        // OpcDAClient.run();
         Thread.sleep(1000);
     }
 }

platform-opc/src/main/java/com/platform/opc/servie/OpcService.java

@@ -0,0 +1,35 @@
+package com.platform.opc.servie;
+
+import com.platform.common.constant.UpmsRedisKeyConstants;
+import com.platform.common.util.BeanUtils;
+import com.platform.common.util.RedisUtils;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.annotation.DependsOn;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.PostConstruct;
+
+@Service("opcService")
+@DependsOn({"beanUtils", "redisTemplate"})
+@AllArgsConstructor
+@Slf4j
+public class OpcService {
+
+    /**
+     * 初始化redis和点位分组数据，
+     */
+    @PostConstruct
+    public void initClients() {
+        // 判断开发环境还是本地环境
+        /*if (BeanUtils.isDev() || BeanUtils.isTest()) {
+            Boolean has = RedisUtils.hasKey(UpmsRedisKeyConstants.CACHE_ALL_CLIENT);
+            if (has) {
+                return;
+            }
+        }*/
+        log.info("测试redis");
+        RedisUtils.set("test", 1);
+    }
+
+}

platform-service/src/main/java/com/platform/service/verify/impl/VerifyCodeServiceImpl.java

@@ -6,8 +6,6 @@ import com.platform.common.cache.DictCache;
 import com.platform.common.constant.CommonConstants;
 import com.platform.common.constant.UpmsRedisKeyConstants;
 import com.platform.common.enums.DictTypeEnum;
-import com.platform.common.enums.ResultCode;
-import com.platform.common.exception.BusinessException;
 import com.platform.common.util.BeanUtils;
 import com.platform.common.util.RedisUtils;
 import com.platform.common.util.StringUtils;