Merge remote-tracking branch 'origin/master'

ZengTao

2025-11-29 4dc1abb37aec033fdbd09d290c6f62d082ba774a

 hangzhoumesParent/moduleService/hollowGlassModule/src/main/resources/application-dev.yml

@@ -5,7 +5,7 @@
      strict: false #设置严格模式,默认false不启动. 启动后在未匹配到指定数据源时候回抛出异常,不启动会使用默认数据源.
      datasource:
        northGlassMes:
          url: jdbc:mysql://127.0.0.1:3306/yw_mes?serverTimezone=GMT%2b8
          url: jdbc:mysql://127.0.0.1:3306/north_glass_mes?serverTimezone=GMT%2b8
          username: root
          password: beibo.123/
          driver-class-name: com.mysql.cj.jdbc.Driver
@@ -19,12 +19,17 @@
          username: root
          password: beibo.123/
          driver-class-name: com.mysql.cj.jdbc.Driver
        sd:
          url: jdbc:mysql://127.0.0.1:3306/sd?serverTimezone=GMT%2b8
          username: root
          password: beibo.123/
          driver-class-name: com.mysql.cj.jdbc.Driver
  cloud:
    nacos:
      discovery:
        server-addr: 127.0.0.1:8848
  redis:
    database: 1
    database: 0
    host: 127.0.0.1
    port: 6379
    password: 123456