Merge remote-tracking branch 'origin/master'

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

@@ -7,7 +7,9 @@ spring:
       # 主库数据源
       master:
 #        url: jdbc:mysql://localhost:3306/ruoyi?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-        url: jdbc:mysql://115.29.151.39:3306/ruoyi?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false
+        url: jdbc:mysql://115.29.151.39:3306/ruoyi?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+#        url: jdbc:mysql://115.29.151.39:3306/Test?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+#        url: jdbc:mysql://115.29.151.39:3306/ruoyi?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false
         username: taidongerp
         password: liyuan@erp
       # 从库数据源