Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	pom.xml

nafmii-app/src/main/resources/application-dev.yml

@@ -10,7 +10,6 @@ logging:
   config: classpath:logback-spring.xml
   config: classpath:logback-spring.xml
 mybatis:
 mybatis:
   mapper-locations: classpath:mapper/*.xml
   mapper-locations: classpath:mapper/*.xml
-
 spring:
 spring:
   datasource:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
     driver-class-name: com.mysql.cj.jdbc.Driver
@@ -27,35 +26,26 @@ spring:
       pool-name: NFMII_HikariCP
       pool-name: NFMII_HikariCP
       connection-test-query: SELECT 1
       connection-test-query: SELECT 1
   redis:
   redis:
-    # Redis数据库索引（默认为0）
+    # Redis数据库索引（默认为0）
     database: 0
     database: 0
-    # Redis服务器地址
+    # Redis服务器地址
     host: 127.0.0.1
     host: 127.0.0.1
     port: 6379
     port: 6379
-    # Redis服务器连接密码（默认为空）
+    # Redis服务器连接密码（默认为空）
     password:
     password:
     jedis:
     jedis:
       pool:
       pool:
-        # 连接池最大连接数（使用负值表示没有限制）
+        # 连接池最大连接数（使用负值表示没有限制）
         max-active: 20
         max-active: 20
         max-wait: -1ms
         max-wait: -1ms
         max-idle: 10
         max-idle: 10
         min-idle: 0
         min-idle: 0
     timeout: 1000ms
     timeout: 1000ms
-  zipkin:
-    base-url: http://localhost:9411
-    enabled: true
-    sleuth:
-      web:
-        client:
-          enabled: true
-      sampler:
-        probability: 1.0  #zipkin采集率  0.1表示 10%采集率
 nafmii:
 nafmii:
   log-path: D:/NAFMII
   log-path: D:/NAFMII
   dao-uri: org.nafmii.app
   dao-uri: org.nafmii.app
   ftp:
   ftp:
-    host: 127.0.0.1
-    password: peng1003
-    prot: 21
-    username: ypenglv
\ No newline at end of file
+      host: 127.0.0.1
+      password: peng1003
+      prot: 21
+      username: ypenglv
\ No newline at end of file