diff --git a/.idea/encodings.xml b/.idea/encodings.xml index d3b06be..1261739 100644 --- a/.idea/encodings.xml +++ b/.idea/encodings.xml @@ -1,6 +1,7 @@ + diff --git a/wms-admin/src/main/resources/application-druid.yml b/wms-admin/src/main/resources/application-druid.yml index 005eb15..d0e9baf 100644 --- a/wms-admin/src/main/resources/application-druid.yml +++ b/wms-admin/src/main/resources/application-druid.yml @@ -5,16 +5,16 @@ spring: driverClassName: com.mysql.cj.jdbc.Driver druid: # 主库数据源 -# master: -# url: jdbc:mysql://localhost:3306/wms?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 -# username: root -## password: ntscc@2018 -# password: root - master: - url: jdbc:mysql://192.168.234.134:3306/wms_ntpp_n7?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 - username: developer - password: developer + url: jdbc:mysql://localhost:3306/wms?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + username: root + password: ntscc@2018 + # password: root + +# master: +# url: jdbc:mysql://192.168.234.134:3306/wms_ntpp_n7?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 +# username: developer +# password: developer # 从库数据源 slave: # 从数据源开关/默认关闭 diff --git a/wms-business/src/main/resources/mapper/TBaseProviderMapper.xml b/wms-business/src/main/resources/mapper/TBaseProviderMapper.xml index d4cce0b..849904e 100644 --- a/wms-business/src/main/resources/mapper/TBaseProviderMapper.xml +++ b/wms-business/src/main/resources/mapper/TBaseProviderMapper.xml @@ -2,5 +2,6 @@ + \ No newline at end of file