Merge branch 'develop' of http://gitlab.sothing.top/843502640/jyzb_platformV2 into develop-lxh

jyzb-boot/src/main/resources/application-local.yml

@@ -26,7 +26,7 @@ knife4j:
 spring:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://192.168.3.128/db_jyzb?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=CTT&nullCatalogMeansCurrent=true
+    url: jdbc:mysql://192.168.3.128:3306/db_jyzb?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=CTT&nullCatalogMeansCurrent=true
     username: junmp
     password: 123456
 

jyzb-boot/src/main/resources/application-local.yml.orig

+scanner:
+  open: false
+
+# 配置第三方请求
+junmp:
+  swagger:
+    base-package: com.junmp
+  id:
+    worker-id: 1
+    data-center-id: 1
+    epoch: 1656036996843
+    max: 9999
+  log:
+    type: db
+  ds: true #是否多数据源
+
+knife4j:
+  enable: true
+  setting:
+    enableDebug: false
+#  basic:
+#    enable: true
+#    username: ning
+#    password: ning
+
+spring:
+  datasource:
+    driver-class-name: com.mysql.cj.jdbc.Driver
+<<<<<<< HEAD
+    url: jdbc:mysql://192.168.3.128:3306/db_jyzb?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=CTT&nullCatalogMeansCurrent=true
+=======
+    url: jdbc:mysql://192.168.3.128/db_jyzb?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=CTT&nullCatalogMeansCurrent=true
+>>>>>>> ce2cec735d8197f0f6b77fb7df738d825354bd3c
+    username: junmp
+    password: 123456
+
+  redis:
+    #host: 192.168.3.188
+    host: 192.168.3.188
+    port: 6379
+    database: 1
+    password:
+
+      flowable:
+        dmn:
+          enabled: false
+        cmmn:
+          enabled: false
+        idm:
+          enabled: false
+        async-history-executor-activate: false
+        async-executor-activate: false
+        check-process-definitions: false
+        content:
+          enabled: false
+        app:
+          enabled: false
+        eventregistry:
+          enabled: false
+
+#mybatis plus 设置
+mybatis-plus:
+  configuration:
+    cache-enabled: true
+    lazy-loading-enabled: true
+    multiple-result-sets-enabled: true
+    map-underscore-to-camel-case: true #开启驼峰命名
+  global-config:
+    banner: false
+    enable-sql-runner: true
+    db-config:
+      id-type: assign_id
+      table-underline: true
+#  mapper-locations: classpath*:com/junmp/junmpProcess/mapper/**/xml/*Mapper.xml
+      mapper-locations: classpath*:/mapper/**/*Mapper.xml
+flowable:
+  dmn:
+    enabled: false
+  cmmn:
+    enabled: false
+  idm:
+    enabled: false
+  async-history-executor-activate: false
+  async-executor-activate: false
+  check-process-definitions: false
+  content:
+    enabled: false
+  app:
+    enabled: false
+  eventregistry:
+    enabled: false
+
+com:
+  mqtt:
+    url: tcp://broker.emqx.io:1883  #这里要写 tcp://  不能是 mqtt,不然不是合法的 schema，源码中有
+    clientId: mqtt_test_spring
+    topics: iot/#,home/#
+    username: admin
+    password: public
+    timeout: 10
+    keepalive: 20
\ No newline at end of file