Merge remote-tracking branch 'origin/master'

钟日健

2021-02-27 b88cc45c2f4be66795df34a3f0bfcba35c7bc912

 blade-service/blade-jfpts/src/main/resources/application-dev.yml

@@ -5,6 +5,6 @@
#数据源配置
spring:
  datasource:
    url: jdbc:mysql://36.134.81.48:3306/jfpt?allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true&useOldAliasMetadataBehavior=true
    username: root
    password: jfpt123
    url: ${blade.datasource.dev.url}
    username: ${blade.datasource.dev.username}
    password: ${blade.datasource.dev.password}