Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

lidongdong

2022-12-08 284a4b9bda8f7c09f550c15e71ced282e5531a08

 flower_city/src/main/resources/application.properties

@@ -1,9 +1,11 @@
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
spring.datasource.username=root
spring.datasource.password=nahanMysqlPwd&&RemoteRemote2019nahan
#spring.datasource.username=root
#spring.datasource.password=nahanMysqlPwd&&RemoteRemote2019nahan
spring.datasource.username=remote
spring.datasource.password=Panzhihua!@#admin123#@!
#spring.datasource.url=jdbc:mysql://10.8.0.74:3306/huacheng_smart_life?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&allowMultiQueries=true&serverTimezone=GMT%2B8
spring.datasource.url=jdbc:mysql://182.151.2.19:3306/huacheng_smart_life?allowMultiQueries=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8

#spring.datasource.url=jdbc:mysql://182.151.2.19:3306/huacheng_smart_life?allowMultiQueries=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
spring.datasource.url=jdbc:mysql://118.121.197.120:3306/huacheng_smart_life?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8

server.port=8187
#server.port=8088
@@ -11,10 +13,15 @@
swagger.enabled=true
swagger.pathMapping=/
#Redis
spring.redis.host=127.0.0.1
#spring.redis.host=127.0.0.1
#spring.redis.port=6379
#spring.redis.database=2
#spring.redis.password=nahanRedisPwsIsVerySimple&&

spring.redis.host=192.168.1.52
spring.redis.port=6379
spring.redis.database=2
spring.redis.password=nahanRedisPwsIsVerySimple&&
spring.redis.password=ODEGi3MXRBNQ8pH2



@@ -33,12 +40,17 @@



ftp.username=root
ftp.password=6-gj!bx@TNb!Dwpjd]1h1Kvqmc
ftp.host=182.151.31.48
ftp.port=22
ftp.url=https://test.panzhihua.nhys.cdnhxx.com/
#ftp.username=root
#ftp.password=6-gj!bx@TNb!Dwpjd]1h1Kvqmc
#ftp.host=182.151.31.48
#ftp.port=22
#ftp.url=https://test.panzhihua.nhys.cdnhxx.com/




ftp.username= root
ftp.password= @!nY0[-zxO
ftp.host= 182.151.24.68
ftp.port= 22
ftp.url= https://www.psciio.com