From 91154029c9929daefbfb1fd124af18b552c817d6 Mon Sep 17 00:00:00 2001 From: Administrator <1923636941@qq.com> Date: Mon, 15 May 2023 19:07:14 +0800 Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application-cr.properties | 24 ++++++++------------ src/main/resources/application.properties | 21 ----------------- 2 files changed, 10 insertions(+), 35 deletions(-) diff --git a/src/main/resources/application-cr.properties b/src/main/resources/application-cr.properties index d6784b26e..753cf47ca 100644 --- a/src/main/resources/application-cr.properties +++ b/src/main/resources/application-cr.properties @@ -6,18 +6,14 @@ http.port=21323 #spring.datasource.url=jdbc:mysql://139.9.66.234:3386/wisdomsite_ty?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true #spring.datasource.url=jdbc:mysql://182.90.224.237:3306/wisdomsite?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false #spring.datasource.url=jdbc:mysql://139.9.66.234:3306/wisdomsite?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true -spring.datasource.url=jdbc:mysql://localhost:3306/wisdomsite?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false -spring.datasource.username=ENC(XR4C/hvTYCUqudS49Wh/jA==) -spring.datasource.password=ENC(LsKaVL2ycDu+uUNoPndYLA==) +spring.datasource.url=jdbc:mysql://localhost:3306/zhgd?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false +spring.datasource.username=ENC(lRspM3gSyiQcjQf1yMyOjg==) +spring.datasource.password=ENC(QGayqFar3bfVMSThuRKFTjcaktJmSdjE) server.port=12333 #server.port=30246 -basePath=C:/jxj/prod/backEnd/itbgpImage/ -server.tomcat.basedir=C:/jxj/prod/backEnd/tempImage/ -#arcsoft.dllPath=D:/hz/wisdomSite/src/main/resources/dll -#basePath=F:/zhgd/itbgpImage/ -#server.tomcat.basedir=F:/zhgd/tempImage/ -#arcsoft.dllPath=F:/zhgd/dll -arcsoft.dllPath=C:/jxj/prod/backEnd/dll +basePath=/home/zhgd/app/service/itbgpImage/ +server.tomcat.basedir=/home/zhgd/app/service/tempImage/ +arcsoft.dllPath=/home/zhgd/app/service/dll security.enable=false isGetStandardData=false isGetEnvironmentData=false @@ -27,7 +23,7 @@ video.alarm.newUrl=223.82.100.80:6040 wx-appid= wx-AppSecret= mqtt-scope=zjsjTopic -serverUrl=http://124.71.67.160:8088/ +serverUrl=http://118.121.198.147:23232/ #serverUrl=http://182.90.224.237:7000 #serverUrl=http://127.0.0.1:6023 #\u89C6\u9891\u5206\u6790url @@ -50,7 +46,7 @@ spring.file-storage.local[0].enable-access=false # \u8BBF\u95EE\u57DF\u540D\uFF0C\u4F8B\u5982\uFF1A\u201Chttp://127.0.0.1:6023/image/\u201D\uFF0C\u6CE8\u610F\u540E\u9762\u8981\u548C path-patterns \u4FDD\u6301\u4E00\u81F4\uFF0C\u201C/\u201D\u7ED3\u5C3E\uFF0C\u672C\u5730\u5B58\u50A8\u5EFA\u8BAE\u4F7F\u7528\u76F8\u5BF9\u8DEF\u5F84\uFF0C\u65B9\u4FBF\u540E\u671F\u66F4\u6362\u57DF\u540D spring.file-storage.local[0].domain= # \u5B58\u50A8\u5730\u5740 -spring.file-storage.local[0].base-path=C:/jxj/prod/backEnd/itbgpImage/ +spring.file-storage.local[0].base-path=/home/zhgd/app/service/itbgpImage/ # \u8BBF\u95EE\u8DEF\u5F84\uFF0C\u5F00\u542F enable-access \u540E\uFF0C\u901A\u8FC7\u6B64\u8DEF\u5F84\u53EF\u4EE5\u8BBF\u95EE\u5230\u4E0A\u4F20\u7684\u6587\u4EF6 spring.file-storage.local[0].path-patterns= spring.file-storage.aliyun-oss[0].platform=aliyun-oss @@ -68,7 +64,7 @@ spring.boot.admin.client.instance.name=zjsj # \u6C34\u7535\u6570\u636E\u63A8\u9001\u5730\u5740 double-carbon.water-data-url=http://test.cesms.net double-carbon.ammeter-data-url=http://test.cesms.net -license.licensePath=C:/jxj/prod/backEnd/license/license.lic -license.publicKeysStorePath=C:/jxj/prod/backEnd/license/publicCerts.keystore +license.licensePath=/home/zhgd/app/service/license/license.lic +license.publicKeysStorePath=/home/zhgd/app/service/license/publicCerts.keystore #\u9AD8\u652F\u6A21\u7684tcp\u670D\u52A1\u7AEF\u7684\u7AEF\u53E3\u53F7 high_formwork.netty.port=15333 diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index f3e01fd45..eb03bd71c 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,26 +1,5 @@ # \u73AF\u5883\u9009\u62E9 spring.profiles.active=zjsj-gsx -#spring.profiles.active=dev6024 -#spring.profiles.active=dev6025 -#spring.profiles.active=hncs -#spring.profiles.active=zhhz -#spring.profiles.active=zjsj -#spring.profiles.active=zjsj_dev -#spring.profiles.active=lgdccompany -#spring.profiles.active=lgdcproject -#spring.profiles.active=nc -#spring.profiles.active=testdb -#spring.profiles.active=test -#spring.profiles.active=yc -#spring.profiles.active=hq -#spring.profiles.active=zjyjdj -#spring.profiles.active=zjyjxx -#spring.profiles.active=gzms -#spring.profiles.active=gxlt -#spring.profiles.active=hz -#spring.profiles.active=zjyj -#spring.profiles.active=hqhf -#spring.profiles.active=prod # \u56FD\u9645\u5316\u914D\u7F6E spring.messages.basename=i18n/messages spring.messages.encoding=utf-8