From 6fa4bba623713c396432ba8b863846883d6a1906 Mon Sep 17 00:00:00 2001 From: wayne <wayne8692wayne8692@gmail.com> Date: 星期三, 26 一月 2022 10:52:23 +0800 Subject: [PATCH] Merge branch 'pollex-dev' into sit --- pamapi/src/main/resources/config/application-dev.yml | 31 ++++++++++++++++++++++--------- 1 files changed, 22 insertions(+), 9 deletions(-) diff --git a/pamapi/src/main/resources/config/application-dev.yml b/pamapi/src/main/resources/config/application-dev.yml index 0239098..e612913 100644 --- a/pamapi/src/main/resources/config/application-dev.yml +++ b/pamapi/src/main/resources/config/application-dev.yml @@ -32,8 +32,8 @@ indent-output: true datasource: type: com.zaxxer.hikari.HikariDataSource - url: jdbc:postgresql://dev.pollex.com.tw:5433/pam - #url: jdbc:postgresql://localhost:5432/omo?currentSchema=omo + url: jdbc:postgresql://dev.pollex.com.tw:5433/pam_p2 + #url: jdbc:postgresql://localhost:5432/omo?currentSchema=public username: pamadmin password: pamadmin hikari: @@ -45,10 +45,16 @@ # Remove 'faker' if you do not want the sample data to be loaded automatically contexts: dev, faker mail: - host: localhost - port: 25 - username: - password: + host: smtp.gmail.com + port: 587 + username: pollex.testing@gmail.com + password: ilismmmhtscppxft + properties: + mail: + smtp: + auth: true + starttls: + enable: true messages: cache-duration: PT1S # 1 second, see the ISO 8601 standard thymeleaf: @@ -119,11 +125,18 @@ 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 sms: - url: https://vtwlifewinbo66.pru.intranet.asia/MesgQueueMgmnt/rest/smsSendMsgResource + send-notify-msg: false + url: https://localhost:8081/testSMS source-code: ePos sender: POS - sms-type: 0017 + sms-type: '0017' + subject: '慦�像��' email: - url: https://vtwlifeopensysuat.pru.intranet.asia/tsgw/mq/mqSendMail + send-notify-msg: false + url: https://localhost:8081/testEmail function-id: epos + sender-email: noreply@pcalife.com.tw + method: 'POLLEX_GMAIL' + file-folder-path: C://pam_file -- Gitblit v1.8.0