pcalife/PAM.git - dev.pollex.com.tw

wayne

2022-03-11 27d109b5792305d849f578627f98e1cb55a330f4

Merge branch 'Phase3' into pollex-dev

修改6個檔案

	PAMapp/nuxt.config.js	1 ●●●●● 修補檔 \| 檢視 \| 原始 \| 究查 \| 歷程
	pamapi/src/main/resources/config/application-dev.yml	2 ●●●●● 修補檔 \| 檢視 \| 原始 \| 究查 \| 歷程
	pamapi/src/main/resources/config/application-pollex.yml	2 ●●●●● 修補檔 \| 檢視 \| 原始 \| 究查 \| 歷程
	pamapi/src/main/resources/config/application-prod.yml	3 ●●●●● 修補檔 \| 檢視 \| 原始 \| 究查 \| 歷程
	pamapi/src/main/resources/config/application-sit.yml	2 ●●●●● 修補檔 \| 檢視 \| 原始 \| 究查 \| 歷程
	pamapi/src/main/resources/config/application-uat.yml	2 ●●●●● 修補檔 \| 檢視 \| 原始 \| 究查 \| 歷程

 PAMapp/nuxt.config.js

@@ -72,6 +72,7 @@
  },
  router: {
    base: process.env.ENV === 'uat' ? '/pam/' : '',
    mode: 'hash',
    middleware: ['getUrlQuery', 'errorRoute']
  }
}

 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

 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

 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

 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

 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

			@@ -72,6 +72,7 @@
			},
			router: {
			base: process.env.ENV === 'uat' ? '/pam/' : '',
			mode: 'hash',
			middleware: ['getUrlQuery', 'errorRoute']
			}
			}

			@@ -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

			@@ -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

			@@ -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

			@@ -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