From ac594e4efb30ba28776d74b0fb08ab34d7c32023 Mon Sep 17 00:00:00 2001 From: HelenHuang <LinHuang@pollex.com.tw> Date: 星期四, 30 十二月 2021 15:20:08 +0800 Subject: [PATCH] Merge branch 'Phase2' --- pamapi/src/main/resources/config/application-dev.yml | 41 ++++++++++++++++++++++++++++++----------- 1 files changed, 30 insertions(+), 11 deletions(-) diff --git a/pamapi/src/main/resources/config/application-dev.yml b/pamapi/src/main/resources/config/application-dev.yml index 63f3b25..4132106 100644 --- a/pamapi/src/main/resources/config/application-dev.yml +++ b/pamapi/src/main/resources/config/application-dev.yml @@ -32,7 +32,8 @@ indent-output: true datasource: type: com.zaxxer.hikari.HikariDataSource - url: jdbc:postgresql://dev.pollex.com.tw:5433/pam + url: jdbc:postgresql://dev.pollex.com.tw:5433/pam_p2 + #url: jdbc:postgresql://localhost:5432/omo?currentSchema=omo username: pamadmin password: pamadmin hikari: @@ -76,15 +77,14 @@ ehcache: # Ehcache configuration time-to-live-seconds: 3600 # By default objects stay 1 hour in the cache max-entries: 100 # Number of objects in each cache entry - # CORS is only enabled by default with the "dev" profile - cors: - # Allow Ionic for JHipster by default (* no longer allowed in Spring Boot 2.4+) - allowed-origins: 'http://localhost:8100,https://localhost:8100,http://localhost:9000,https://localhost:9000' - allowed-methods: '*' - allowed-headers: '*' - exposed-headers: 'Authorization,Link,X-Total-Count,X-${jhipster.clientApp.name}-alert,X-${jhipster.clientApp.name}-error,X-${jhipster.clientApp.name}-params' - allow-credentials: true - max-age: 1800 +# cors: +# # Allow Ionic for JHipster by default (* no longer allowed in Spring Boot 2.4+) +# allowed-origins: 'http://localhost:8100,https://localhost:8100,http://localhost:9000,https://localhost:9000' +# allowed-methods: '*' +# allowed-headers: '*' +# exposed-headers: 'Authorization,Link,X-Total-Count,X-${jhipster.clientApp.name}-alert,X-${jhipster.clientApp.name}-error,X-${jhipster.clientApp.name}-params' +# allow-credentials: true +# max-age: 1800 security: authentication: jwt: @@ -111,4 +111,23 @@ # https://www.jhipster.tech/common-application-properties/ # =================================================================== -# application: +application: + mock-login: true + otp-web-service-url: https://vtwlifeopensyssit.pru.intranet.asia:443/pcalife-otp/ws/otpWebService?wsdl + otp-web-service-password: es20!%Pass + otp-web-service-system-type: epos + 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 + send-notify-msg: false + sms: + url: https://localhost:8081/testSMS + source-code: ePos + sender: POS + sms-type: '0017' + subject: '慦�像��' + email: + url: https://localhost:8081/testEmail + function-id: epos + file-folder-path: D://pam_file -- Gitblit v1.8.0