From 27d109b5792305d849f578627f98e1cb55a330f4 Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期五, 11 三月 2022 15:12:54 +0800
Subject: [PATCH] Merge branch 'Phase3' into pollex-dev
---
pamapi/src/main/resources/config/application-pollex.yml | 2 +-
pamapi/src/main/resources/config/application-dev.yml | 2 +-
pamapi/src/main/resources/config/application-sit.yml | 2 +-
pamapi/src/main/resources/config/application-uat.yml | 2 +-
PAMapp/nuxt.config.js | 1 +
pamapi/src/main/resources/config/application-prod.yml | 3 ++-
6 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/PAMapp/nuxt.config.js b/PAMapp/nuxt.config.js
index 73033a1..ea5ad7f 100644
--- a/PAMapp/nuxt.config.js
+++ b/PAMapp/nuxt.config.js
@@ -72,6 +72,7 @@
},
router: {
base: process.env.ENV === 'uat' ? '/pam/' : '',
+ mode: 'hash',
middleware: ['getUrlQuery', 'errorRoute']
}
}
diff --git a/pamapi/src/main/resources/config/application-dev.yml b/pamapi/src/main/resources/config/application-dev.yml
index e612913..9ceb7e1 100644
--- a/pamapi/src/main/resources/config/application-dev.yml
+++ b/pamapi/src/main/resources/config/application-dev.yml
@@ -125,7 +125,7 @@
e-service-login-url: https://eserviceuat.pcalife.com.tw/sso/chatbotValidate
e-service-login-func: ValidateUsrLogin
e-service-login-sys: epos
- front-end-domain: http://localhost:3000
+ front-end-domain: 'http://localhost:3000/#'
sms:
send-notify-msg: false
url: https://localhost:8081/testSMS
diff --git a/pamapi/src/main/resources/config/application-pollex.yml b/pamapi/src/main/resources/config/application-pollex.yml
index e6a2ae8..b05f912 100644
--- a/pamapi/src/main/resources/config/application-pollex.yml
+++ b/pamapi/src/main/resources/config/application-pollex.yml
@@ -123,7 +123,7 @@
e-service-login-url: https://eserviceuat.pcalife.com.tw/sso/chatbotValidate
e-service-login-func: ValidateUsrLogin
e-service-login-sys: epos
- front-end-domain: http://dev.pollex.com.tw:5566/pam
+ front-end-domain: 'http://dev.pollex.com.tw:5566/pam/#'
sms:
send-notify-msg: false
url: https://localhost:8081/testSMS
diff --git a/pamapi/src/main/resources/config/application-prod.yml b/pamapi/src/main/resources/config/application-prod.yml
index f4185f4..8059119 100644
--- a/pamapi/src/main/resources/config/application-prod.yml
+++ b/pamapi/src/main/resources/config/application-prod.yml
@@ -131,6 +131,7 @@
# https://www.jhipster.tech/common-application-properties/
# ===================================================================
+# PROD�憓�Ⅱ隤�
application:
mock-login: false
otp-web-service-url: https://vtwlifeopensysuat.pru.intranet.asia/pcalife-otp/ws/otpWebService?wsdl
@@ -139,7 +140,7 @@
e-service-login-url: https://eserviceuat.pcalife.com.tw/sso/chatbotValidate
e-service-login-func: ValidateUsrLogin
e-service-login-sys: epos
- front-end-domain: https://vtwlifeopensysuat.pru.intranet.asia/pam
+ front-end-domain: 'https://onlineuat.pcalife.com.tw/pam/#'
sms:
send-notify-msg: true
url: https://vtwlifeopensysuat.pru.intranet.asia/MesgQueueMgmnt/rest/smsSendMsgResource
diff --git a/pamapi/src/main/resources/config/application-sit.yml b/pamapi/src/main/resources/config/application-sit.yml
index 6f0da19..2333d7c 100644
--- a/pamapi/src/main/resources/config/application-sit.yml
+++ b/pamapi/src/main/resources/config/application-sit.yml
@@ -117,7 +117,7 @@
e-service-login-url: https://eserviceuat.pcalife.com.tw/sso/chatbotValidate
e-service-login-func: ValidateUsrLogin
e-service-login-sys: epos
- front-end-domain: https://vtwlifeopensyssit.pru.intranet.asia/pam
+ front-end-domain: 'https://vtwlifeopensyssit.pru.intranet.asia/pam/#'
sms:
send-notify-msg: true
url: https://vtwlifeopensysuat.pru.intranet.asia/MesgQueueMgmnt/rest/smsSendMsgResource
diff --git a/pamapi/src/main/resources/config/application-uat.yml b/pamapi/src/main/resources/config/application-uat.yml
index d3b767a..2921536 100644
--- a/pamapi/src/main/resources/config/application-uat.yml
+++ b/pamapi/src/main/resources/config/application-uat.yml
@@ -117,7 +117,7 @@
e-service-login-url: https://eserviceuat.pcalife.com.tw/sso/chatbotValidate
e-service-login-func: ValidateUsrLogin
e-service-login-sys: epos
- front-end-domain: https://onlineuat.pcalife.com.tw/pam
+ front-end-domain: 'https://onlineuat.pcalife.com.tw/pam/#'
sms:
send-notify-msg: true
url: https://vtwlifeopensysuat.pru.intranet.asia/MesgQueueMgmnt/rest/smsSendMsgResource
--
Gitblit v1.8.0