diff --git a/yudao-server/src/main/resources/application-gtr7.yaml b/yudao-server/src/main/resources/application-gtr7.yaml index 99f226a1..ad4966af 100644 --- a/yudao-server/src/main/resources/application-gtr7.yaml +++ b/yudao-server/src/main/resources/application-gtr7.yaml @@ -59,11 +59,10 @@ spring: # Redis 配置。Redisson 默认的配置足够使用,一般不需要进行调优 data: redis: - host: ${redis.host} - port: ${redis.port} - database: ${redis.database} - username: ${redis.username} - password: ${redis.password} + host: 171.34.150.87 + port: 6379 + database: 5 + password: yEGXyWphiwfiawjG mongodb: uri: mongodb://mongo_BiKBdR:mongo_KaShrX@223.83.129.121:27017/farming-platform-iot?authSource=farming-platform-iot auto-index-creation: true @@ -231,4 +230,4 @@ iot: # 插件配置 pf4j: - pluginsDir: ${user.home}/plugins # 插件目录 \ No newline at end of file + pluginsDir: ${user.home}/plugins # 插件目录 diff --git a/yudao-server/src/main/resources/db.properties b/yudao-server/src/main/resources/db.properties index 866f8713..5fae60f4 100644 --- a/yudao-server/src/main/resources/db.properties +++ b/yudao-server/src/main/resources/db.properties @@ -2,57 +2,17 @@ # yun ge server ######################### -#mysql.url=jdbc:mysql://223.83.129.121:3360/farming-platform?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true -##mysql.url=jdbc:mysql://Mysql:3306/farming-platform?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true -#mysql.username=farming-platform -#mysql.password=wCM7fBMhFP3zNdJ3 -# -#redis.host= 112.126.60.236 -##redis.host=Redis -#redis.port=65532 -#redis.database=5 -#redis.username= -#redis.password=luxifa970219 -# -#wm.wx.mp.app-id=wx508d9a9ab84f67d0 -#wm.wx.mp.secret=92c571b9973f9078c11da47a16c4094c -#wm.wx.miniapp.app-id=wx508d9a9ab84f67d0 -#wm.wx.miniapp.secret=92c571b9973f9078c11da47a16c4094c -# -#wanmao.wms.url_1=getTenantByMobile -## prod -#wanmao.wms.hosts=https://wms.simple.gltec.cn/prod-api -## test -##wanmao.wms.hosts=47.111.15.9:8074/prod-api -# -## gaode key -#gaode.weather.webkey=ea0a0486aaea8dbf9f68274df1160df3 -# -## print -#print.jby.hosts=http://api.poscom.cn/apisc/templetPrint -#print.jby.api-key=8KOSGN3SX11QV80IY8N6PYFMNF29R1N9 -#print.jby.member-code=7A7453F04CB067987229F7BBAD888CFF -#print.jby.template-id=be64feabccf44de189f7019daa0dd7fb -#print.jby.device-id=00543113467925660 +mysql.url=jdbc:mysql://223.83.129.121:3360/farming-platform?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true +#mysql.url=jdbc:mysql://Mysql:3306/farming-platform?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true +mysql.username=farming-platform +mysql.password=wCM7fBMhFP3zNdJ3 - - - - - -#======================== -# wan mao server -#======================== - -mysql.url=jdbc:mysql://rm-2ze979o6dt71z2mf6so.mysql.rds.aliyuncs.com:3306/farming-platform?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true -mysql.username=root -mysql.password=Wm@123456 - -redis.host=r-2zepgu4tu2ofnhhgzopd.redis.rds.aliyuncs.com +redis.host=171.34.150.87 +#redis.host=Redis redis.port=6379 -redis.database=5 -redis.username=yunge -redis.password=Yunge123 +redis.database=6 +redis.username= +redis.password=yEGXyWphiwfiawjG wm.wx.mp.app-id=wx508d9a9ab84f67d0 wm.wx.mp.secret=92c571b9973f9078c11da47a16c4094c @@ -80,6 +40,46 @@ print.jby.device-id=00543113467925660 +#======================== +# wan mao server +#======================== +# +#mysql.url=jdbc:mysql://rm-2ze979o6dt71z2mf6so.mysql.rds.aliyuncs.com:3306/farming-platform?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true +#mysql.username=root +#mysql.password=Wm@123456 +# +#redis.host=r-2zepgu4tu2ofnhhgzopd.redis.rds.aliyuncs.com +#redis.port=6379 +#redis.database=5 +#redis.username=yunge +#redis.password=Yunge123 +# +#wm.wx.mp.app-id=wx508d9a9ab84f67d0 +#wm.wx.mp.secret=92c571b9973f9078c11da47a16c4094c +#wm.wx.miniapp.app-id=wx508d9a9ab84f67d0 +#wm.wx.miniapp.secret=92c571b9973f9078c11da47a16c4094c +# +#wanmao.wms.url_1=getTenantByMobile +## prod +#wanmao.wms.hosts=https://wms.simple.gltec.cn/prod-api +## test +##wanmao.wms.hosts=47.111.15.9:8074/prod-api +# +## gaode key +#gaode.weather.webkey=ea0a0486aaea8dbf9f68274df1160df3 +# +## print +#print.jby.hosts=http://api.poscom.cn/apisc/templetPrint +#print.jby.api-key=8KOSGN3SX11QV80IY8N6PYFMNF29R1N9 +#print.jby.member-code=7A7453F04CB067987229F7BBAD888CFF +#print.jby.template-id=be64feabccf44de189f7019daa0dd7fb +#print.jby.device-id=00543113467925660 +# +# + + + + #======================== # ji shui server #======================== @@ -100,4 +100,4 @@ print.jby.device-id=00543113467925660 #wms.hosts=https://wms.jslstec.cn/prod-api #wms.url_1=getTenantByMobile -#gaode.weather.webkey=6e867624a911d74e673f5e68c52a61e7 \ No newline at end of file +#gaode.weather.webkey=6e867624a911d74e673f5e68c52a61e7