Merge branch 'dev'

manager/src/main/java/cc/iotkit/manager/config/EmbeddedElasticSearchConfig.java

@@ -24,7 +24,7 @@ public class EmbeddedElasticSearchConfig {
     }
 
     public static boolean embeddedEnable() {
-        return "true".equals(System.getProperty("embeddedElasticSearch"));
+        return !"true".equals(System.getProperty("disabledEmbeddedEs"));
     }
 
     @SneakyThrows

manager/src/main/java/cc/iotkit/manager/config/EmbeddedRedisConfig.java

@@ -5,17 +5,17 @@ import redis.embedded.RedisServer;
 public class EmbeddedRedisConfig {
 
     public static boolean embeddedEnable() {
-        return "true".equals(System.getProperty("embeddedRedisServer"));
+        return !"true".equals(System.getProperty("disabledEmbeddedRedis"));
     }
 
     public static void startEmbeddedRedisServer() {
         RedisServer redisServer;
-       String os= System.getProperty("os.name").toLowerCase();
-      if(os.contains("windows")){
-          redisServer = RedisServer.builder().setting("maxheap 200m").build();
-      }else{
-          redisServer=new RedisServer();
-      }
+        String os = System.getProperty("os.name").toLowerCase();
+        if (os.contains("windows")) {
+            redisServer = RedisServer.builder().setting("maxheap 200m").build();
+        } else {
+            redisServer = new RedisServer();
+        }
         redisServer.start();
     }
 

manager/src/main/java/cc/iotkit/manager/controller/aligenie/AligenieDeviceController.java

@@ -20,7 +20,6 @@ import cc.iotkit.model.device.DeviceInfo;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -45,8 +44,6 @@ public class AligenieDeviceController {
     private DeviceService deviceService;
     @Autowired
     private DeviceDao deviceDao;
-    @Value("${pulsar.broker}")
-    private String pulsarBrokerUrl;
 
     @GetMapping("/list/{uid}")
     public List<AligenieDevice> getDevices(@PathVariable("uid") String uid) {

manager/src/main/resources/application-dev.yml

@@ -29,7 +29,7 @@ spring:
 
 #图片存储用的是阿里云oss，如果需要上传产品图片才需要配置
 aliyun:
-  bucketId: 填写阿里云bucketId
+  bucketId: iotkit-img
   endpoint: oss-cn-shenzhen.aliyuncs.com
   accessKeyId: 填写阿里云accessKeyId
   accessKeySecret: 填写阿里云accessKeySecret
@@ -50,11 +50,6 @@ sa-token:
   # 是否输出操作日志
   is-log: false
 
-#pulsar消息队列配置，需要进行配置
-pulsar:
-  broker: pulsar://pulsar broker地址:6650
-  service: http://pulsar 服务地址:8080
-
 #认证中心地址
 oauth2:
-  auth-server-url: http://127.0.0.1:8086
+  auth-server-url: http://127.0.0.1:8086

manager/src/main/resources/application.yml

@@ -29,7 +29,7 @@ spring:
 
 #图片存储用的是阿里云oss，如果需要上传产品图片才需要配置
 aliyun:
-  bucketId: 填写阿里云bucketId
+  bucketId: iotkit-img
   endpoint: oss-cn-shenzhen.aliyuncs.com
   accessKeyId: 填写阿里云accessKeyId
   accessKeySecret: 填写阿里云accessKeySecret
@@ -50,11 +50,6 @@ sa-token:
   # 是否输出操作日志
   is-log: false
 
-#pulsar消息队列配置，需要进行配置
-pulsar:
-  broker: pulsar://pulsar broker地址:6650
-  service: http://pulsar 服务地址:8080
-
 #认证中心地址
 oauth2:
-  auth-server-url: http://127.0.0.1:8086
+  auth-server-url: http://127.0.0.1:8086

protocol-gateway/pom.xml

@@ -19,7 +19,7 @@
         <module>component</module>
         <module>mqtt-client-simulator</module>
         <module>http-biz-component</module>
-        <module>ctwing-component</module>
+<!--        <module>ctwing-component</module>-->
     </modules>
 
 </project>