Merge remote-tracking branch 'origin/master'

sinake

14 小时以前 533ffe54ffc7f0f39b9df8f7d99fee4880b50952

Merge remote-tracking branch 'origin/master'

 ruoyi-admin/src/main/resources/application-druid.yml

@@ -7,7 +7,8 @@
      # 主库数据源
      master:
        # 开发环境
        url: jdbc:mysql://192.168.100.10:3306/opo-qd?allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
#        url: jdbc:mysql://192.168.100.10:3306/opo-qd?allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
        url: jdbc:mysql://haiershi.a1.luyouxia.net:23844/opo-qd?allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
        username: smartor
        password: Smartor.2023