18339543638 пре 1 година
родитељ
комит
9507dbdc0d

+ 6 - 6
nb-admin/src/main/resources/application-dev.yml

@@ -85,7 +85,7 @@ spring:
       # 端口,默认为6379
     port: 9736
       # 数据库索引
-    database: 8
+    database: 6
     # 密码
     password: 6E6985E1F7CB40F24A\.
     # 连接超时时间
@@ -114,7 +114,7 @@ request:
 # 阿里云对接配置
 iot:
   consumers:
-    - enable: true
+    - enable: false
       consumer: com.nb.aliyun.service.consumer.NBAndFourGConsumerGroupService
       name: NB
       config:
@@ -124,9 +124,9 @@ iot:
         aliyunUid: "1238892013759131"
         regionId: "cn-shanghai"
         iotInstanceId: "iot-060a0bgd"
-        enable: true
+        enable: false
         productKey: he1fACg7ySx
-    - enable: true
+    - enable: false
       consumer: com.nb.aliyun.service.consumer.NBAndFourGConsumerGroupService
       name: 4G
       config:
@@ -136,7 +136,7 @@ iot:
         aliyunUid: "1777492656465771"
         regionId: "cn-shanghai"
         iotInstanceId: "iot-06z00hi2guq5qi3"
-        enable: true
+        enable: false
         productKey: k0g9w9xRhhi
 aliyun:
   accessKey: "LTAI4G7FA9ytMc76oNkJ45YJ"
@@ -151,4 +151,4 @@ oss:
 
 notify:
   wechat:
-    url: https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=c3e093fe-5125-47d5-a171-0f4be2f61a78
+    url: https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=c3e093fe-5125-47d5-a171-0f4be2f61a78

+ 1 - 1
nb-admin/src/main/resources/application.yml

@@ -7,7 +7,7 @@ spring:
   application:
     name: nb
   profiles:
-    active: prod
+    active: dev
   jackson:
     time-zone: GMT+8
 

+ 4 - 4
nb-core/src/main/java/com/nb/core/doc/SwaggerConfig.java

@@ -23,10 +23,10 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2WebMvc;
 
 import java.util.*;
 
-//@Configuration
-//@EnableKnife4j
-//@EnableSwagger2WebMvc
-//@Profile("dev")
+@Configuration
+@EnableKnife4j
+@EnableSwagger2WebMvc
+@Profile("dev")
 public class SwaggerConfig implements WebMvcConfigurer {
 
     public static final String VERSION = "1.0.0";

+ 0 - 1
nb-service/web-service/src/main/java/com/nb/web/service/doc/WebDocConfig.java

@@ -24,7 +24,6 @@ import java.util.List;
 @Component
 public class WebDocConfig {
     @Bean
-    @Profile("dev")
     public Docket system(){
         return new Docket(DocumentationType.SWAGGER_2)
                 .select()