Merge branch 'local-master' into local-slave

nb-admin/Dockerfile

@@ -1,4 +1,4 @@
-FROM docker.io/java:8
+FROM docker.io/openjdk:8
 
 ADD target/nb-admin-1.0.jar /nb.jar
 ADD src/main/resources/python/jython-standalone-2.7.1.jar /jython-standalone-2.7.1.jar

nb-admin/pom.xml

@@ -102,6 +102,11 @@
             <groupId>org.yaml</groupId>
             <artifactId>snakeyaml</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>org.flywaydb</groupId>
+            <artifactId>flyway-core</artifactId>
+        </dependency>
     </dependencies>
 
 

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

@@ -30,7 +30,7 @@ spring:
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
     driverClassName: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://192.168.100.32:3306/nbnetpump?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8&autoReconnect=true
+    url: jdbc:mysql://192.168.100.32:3307/nbnetpump?useUnicode=true&createDatabaseIfNotExist=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8&autoReconnect=true
     username: root
     password: 123456
     druid:
@@ -100,6 +100,11 @@ spring:
         max-active: 16
         # #连接池最大阻塞等待时间（使用负值表示没有限制）
         max-wait: -1ms
+  rabbitmq:
+    username: guest
+    host: 192.168.100.32
+    port: 5672
+    password: guest
 request:
   check:
     enable: false

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

@@ -10,6 +10,17 @@ spring:
     active: dev
   jackson:
     time-zone: GMT+8
+  flyway:
+    enabled: true
+    encoding: UTF-8
+#    迁移脚本位置
+    locations:
+      - classpath:db/migration
+    sql-migration-prefix: V
+    sql-migration-separator: _
+    sql-migration-suffixes: .sql
+    validate-on-migrate: true
+    baseline-on-migrate: true
 
 server:
   port: 9090

nb-service/iot-service/src/main/java/com/nb/aliyun/service/distribute/MasterDistributeQueueConfig.java

@@ -0,0 +1,22 @@
+package com.nb.aliyun.service.distribute;
+
+import com.nb.aliyun.service.AliIotConstant;
+import lombok.AllArgsConstructor;
+import org.springframework.amqp.core.DirectExchange;
+import org.springframework.context.annotation.Bean;
+import org.springframework.stereotype.Component;
+
+/**
+ * @ClassName : RabbitMqChannelConfig
+ * @Description :
+ * @Author : LF
+ * @Date: 2023年07月31日
+ */
+@Component
+@AllArgsConstructor
+public class MasterDistributeQueueConfig {
+    @Bean
+    DirectExchange distributeExchange() {
+        return new DirectExchange(AliIotConstant.Exchange,true,false);
+    }
+}

nb-service/iot-service/src/main/java/com/nb/aliyun/service/mq/RabbitMqChannelConfig.java

@@ -1,25 +0,0 @@
-package com.nb.aliyun.service.mq;
-
-import lombok.AllArgsConstructor;
-import org.springframework.amqp.rabbit.core.RabbitTemplate;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.PostConstruct;
-
-/**
- * @ClassName : RabbitMqChannelConfig
- * @Description :
- * @Author : LF
- * @Date: 2023年07月31日
- */
-@Component
-@ConditionalOnBean(RabbitTemplate.class)
-@AllArgsConstructor
-public class RabbitMqChannelConfig {
-    private final RabbitTemplate rabbitTemplate;
-    @PostConstruct
-    public void init(){
-
-    }
-}

pom.xml

@@ -47,6 +47,7 @@
         <aliyun.oss.version>3.15.0</aliyun.oss.version>
         <poi.tl.verison>1.12.0</poi.tl.verison>
         <poi.version>5.2.2</poi.version>
+        <flyway.version>8.2.0</flyway.version>
     </properties>
 
     <modules>
@@ -380,6 +381,12 @@
                 <version>${pinyin.verison}</version>
             </dependency>
 
+            <!-- flyway -->
+            <dependency>
+                <groupId>org.flywaydb</groupId>
+                <artifactId>flyway-core</artifactId>
+                <version>${flyway.version}</version>
+            </dependency>
 
         </dependencies>
     </dependencyManagement>