From f98c592460cb25a289116831416cf7df710269d5 Mon Sep 17 00:00:00 2001 From: liupopo Date: Sat, 25 Feb 2023 14:32:03 +0800 Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- supervise-customer-ui/src/utils/request.js | 2 +- yxt_supervise/gateway/src/main/resources/application.yml | 4 ++-- .../src/main/resources/application-test.yml | 1 - .../supervise-portal-biz/src/main/resources/application.yml | 4 ++-- .../src/main/resources/application-devv.yml | 2 +- .../src/main/resources/application-test.yml | 2 -- .../supervise-system-biz/src/main/resources/application.yml | 4 ++-- 7 files changed, 8 insertions(+), 11 deletions(-) diff --git a/supervise-customer-ui/src/utils/request.js b/supervise-customer-ui/src/utils/request.js index 12093fa6..0e8707ac 100644 --- a/supervise-customer-ui/src/utils/request.js +++ b/supervise-customer-ui/src/utils/request.js @@ -7,7 +7,7 @@ import { getToken, getStorage } from '@/utils/auth' const service = axios.create({ baseURL: process.env.VUE_APP_BASE_API, // url = base url + request url // withCredentials: true, // send cookies when cross-domain requests - timeout: 30000 // request timeout + timeout: 300000 // request timeout }) // request interceptor diff --git a/yxt_supervise/gateway/src/main/resources/application.yml b/yxt_supervise/gateway/src/main/resources/application.yml index a03ec05c..1702f481 100644 --- a/yxt_supervise/gateway/src/main/resources/application.yml +++ b/yxt_supervise/gateway/src/main/resources/application.yml @@ -12,8 +12,8 @@ spring: application: name: gateway-server profiles: -# active: devv - active: test + active: devv +# active: test cloud: gateway: routes: diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/resources/application-test.yml b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/resources/application-test.yml index b3ac5da5..fc2d0a76 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/resources/application-test.yml +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/resources/application-test.yml @@ -1,7 +1,6 @@ spring: datasource: driver-class-name: com.mysql.cj.jdbc.Driver -# url: jdbc:mysql://122.14.222.186:3306/supervise_supplychain?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true&allowMultiQueries=true&rewriteBatchedStatements=true url: jdbc:mysql://127.0.0.1:3306/supervise_supplychain?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true&allowMultiQueries=true&rewriteBatchedStatements=true username: root password: 1LAiGz$t1*Iw diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/resources/application.yml b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/resources/application.yml index 3a7fbf40..71a46344 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/resources/application.yml +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/resources/application.yml @@ -2,8 +2,8 @@ spring: application: name: supervise-portal profiles: -# active: devv - active: test + active: devv +# active: test messages: # 国际化资源文件路径 basename: i18n/messages diff --git a/yxt_supervise/supervise-system/supervise-system-biz/src/main/resources/application-devv.yml b/yxt_supervise/supervise-system/supervise-system-biz/src/main/resources/application-devv.yml index c566edf4..4d365f9e 100644 --- a/yxt_supervise/supervise-system/supervise-system-biz/src/main/resources/application-devv.yml +++ b/yxt_supervise/supervise-system/supervise-system-biz/src/main/resources/application-devv.yml @@ -4,7 +4,7 @@ spring: url: jdbc:mysql://127.0.0.1:3306/yxt_portal?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true&allowMultiQueries=true&rewriteBatchedStatements=true username: root password: root - #password: 1LAiGz$t1*Iw +# password: 1LAiGz$t1*Iw cloud: nacos: discovery: diff --git a/yxt_supervise/supervise-system/supervise-system-biz/src/main/resources/application-test.yml b/yxt_supervise/supervise-system/supervise-system-biz/src/main/resources/application-test.yml index 11b853f1..a9d04c02 100644 --- a/yxt_supervise/supervise-system/supervise-system-biz/src/main/resources/application-test.yml +++ b/yxt_supervise/supervise-system/supervise-system-biz/src/main/resources/application-test.yml @@ -1,8 +1,6 @@ spring: datasource: driver-class-name: com.mysql.cj.jdbc.Driver -# url: jdbc:mysql://122.14.222.186:3306/supervise_supplychain?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true&allowMultiQueries=true&rewriteBatchedStatements=true -# url: jdbc:mysql://8.130.39.13:3306/yxt_portal?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true&allowMultiQueries=true&rewriteBatchedStatements=true url: jdbc:mysql://127.0.0.1:3306/yxt_portal?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true&allowMultiQueries=true&rewriteBatchedStatements=true username: root password: 1LAiGz$t1*Iw diff --git a/yxt_supervise/supervise-system/supervise-system-biz/src/main/resources/application.yml b/yxt_supervise/supervise-system/supervise-system-biz/src/main/resources/application.yml index 195e3c4e..11fdfd4d 100644 --- a/yxt_supervise/supervise-system/supervise-system-biz/src/main/resources/application.yml +++ b/yxt_supervise/supervise-system/supervise-system-biz/src/main/resources/application.yml @@ -2,8 +2,8 @@ spring: application: name: supervise-system profiles: -# active: devv - active: test + active: devv +# active: test messages: # 国际化资源文件路径 basename: i18n/messages