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

KillerADO

2021-12-23 41bc5df9cda6a43ef47313622dd1ffde1480d06f

[update] 調整簡訊的service url與新增簡訊的標題欄位

修改6個檔案

	pamapi/src/main/java/com/pollex/pam/config/ApplicationProperties.java	9 ●●●●● 修補檔 \| 檢視 \| 原始 \| 究查 \| 歷程
	pamapi/src/main/java/com/pollex/pam/service/SendMsgService.java	2 ●●●●● 修補檔 \| 檢視 \| 原始 \| 究查 \| 歷程
	pamapi/src/main/resources/config/application-dev.yml	1 ●●●●● 修補檔 \| 檢視 \| 原始 \| 究查 \| 歷程
	pamapi/src/main/resources/config/application-pollex.yml	1 ●●●●● 修補檔 \| 檢視 \| 原始 \| 究查 \| 歷程
	pamapi/src/main/resources/config/application-sit.yml	3 ●●●●● 修補檔 \| 檢視 \| 原始 \| 究查 \| 歷程
	pamapi/src/main/resources/config/application-uat.yml	3 ●●●●● 修補檔 \| 檢視 \| 原始 \| 究查 \| 歷程

 pamapi/src/main/java/com/pollex/pam/config/ApplicationProperties.java

@@ -116,6 +116,7 @@
        private String sourceCode;
        private String sender;
        private String smsType;
        private String subject;

        public String getUrl() {
            return url;
@@ -148,6 +149,14 @@
        public void setSmsType(String smsType) {
            this.smsType = smsType;
        }

        public String getSubject() {
            return subject;
        }

        public void setSubject(String subject) {
            this.subject = subject;
        }
    }

    public static class Email {

 pamapi/src/main/java/com/pollex/pam/service/SendMsgService.java

@@ -131,7 +131,7 @@
        sendSMSRequest.setSender(smsProperties.getSender());
        sendSMSRequest.setMsgTypeSet(smsProperties.getSmsType());
        sendSMSRequest.setSendTime(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:00")));
        sendSMSRequest.setSubject("");
        sendSMSRequest.setSubject(smsProperties.getSubject());
        sendSMSRequest.setActivityId("");

        SMSDetail smsDetail = new SMSDetail();

 pamapi/src/main/resources/config/application-dev.yml

@@ -126,6 +126,7 @@
    source-code: ePos
    sender: POS
    sms-type: '0017'
    subject: 'testing sms subject'
  email:
    url: https://localhost:8081/testEmail
    function-id: epos

 pamapi/src/main/resources/config/application-pollex.yml

@@ -124,6 +124,7 @@
    source-code: ePos
    sender: POS
    sms-type: '0017'
    subject: 'testing sms subject'
  email:
    url: https://localhost:8081/testEmail
    function-id: epos

 pamapi/src/main/resources/config/application-sit.yml

@@ -120,10 +120,11 @@
  front-end-domain: https://vtwlifeopensyssit.pru.intranet.asia/pam
  send-notify-msg: true
  sms:
    url: https://vtwlifewinbo66.pru.intranet.asia/MesgQueueMgmnt/rest/smsSendMsgResource
    url: https://vtwlifeopensysuat.pru.intranet.asia/MesgQueueMgmnt/rest/smsSendMsgResource
    source-code: ePos
    sender: POS
    sms-type: '0017'
    subject: 'testing sms subject'
  email:
    url: https://vtwlifeopensysuat.pru.intranet.asia/tsgw/mq/mqSendMail
    function-id: epos

 pamapi/src/main/resources/config/application-uat.yml

@@ -120,10 +120,11 @@
  front-end-domain: https://vtwlifeopensysuat.pru.intranet.asia/pam
  send-notify-msg: true
  sms:
    url: https://vtwlifewinbo66.pru.intranet.asia/MesgQueueMgmnt/rest/smsSendMsgResource
    url: https://vtwlifeopensysuat.pru.intranet.asia/MesgQueueMgmnt/rest/smsSendMsgResource
    source-code: ePos
    sender: POS
    sms-type: '0017'
    subject: 'testing sms subject'
  email:
    url: https://vtwlifeopensysuat.pru.intranet.asia/tsgw/mq/mqSendMail
    function-id: epos

			@@ -116,6 +116,7 @@
			private String sourceCode;
			private String sender;
			private String smsType;
			private String subject;

			public String getUrl() {
			return url;
			@@ -148,6 +149,14 @@
			public void setSmsType(String smsType) {
			this.smsType = smsType;
			}

			public String getSubject() {
			return subject;
			}

			public void setSubject(String subject) {
			this.subject = subject;
			}
			}

			public static class Email {

			@@ -131,7 +131,7 @@
			sendSMSRequest.setSender(smsProperties.getSender());
			sendSMSRequest.setMsgTypeSet(smsProperties.getSmsType());
			sendSMSRequest.setSendTime(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:00")));
			sendSMSRequest.setSubject("");
			sendSMSRequest.setSubject(smsProperties.getSubject());
			sendSMSRequest.setActivityId("");

			SMSDetail smsDetail = new SMSDetail();

			@@ -126,6 +126,7 @@
			source-code: ePos
			sender: POS
			sms-type: '0017'
			subject: 'testing sms subject'
			email:
			url: https://localhost:8081/testEmail
			function-id: epos

			@@ -124,6 +124,7 @@
			source-code: ePos
			sender: POS
			sms-type: '0017'
			subject: 'testing sms subject'
			email:
			url: https://localhost:8081/testEmail
			function-id: epos

			@@ -120,10 +120,11 @@
			front-end-domain: https://vtwlifeopensyssit.pru.intranet.asia/pam
			send-notify-msg: true
			sms:
			url: https://vtwlifewinbo66.pru.intranet.asia/MesgQueueMgmnt/rest/smsSendMsgResource
			url: https://vtwlifeopensysuat.pru.intranet.asia/MesgQueueMgmnt/rest/smsSendMsgResource
			source-code: ePos
			sender: POS
			sms-type: '0017'
			subject: 'testing sms subject'
			email:
			url: https://vtwlifeopensysuat.pru.intranet.asia/tsgw/mq/mqSendMail
			function-id: epos