diff --git a/e10dev/src/main/java/com/weaver/sxjg/esb/EsbRpcRemoteSendDx.java b/e10dev/src/main/java/com/weaver/sxjg/esb/EsbRpcRemoteSendDx.java index 3333192..8b9294c 100644 --- a/e10dev/src/main/java/com/weaver/sxjg/esb/EsbRpcRemoteSendDx.java +++ b/e10dev/src/main/java/com/weaver/sxjg/esb/EsbRpcRemoteSendDx.java @@ -2,7 +2,6 @@ package com.weaver.sxjg.esb; import com.weaver.ebuilder.common.exception.BusinessException; import com.weaver.esb.api.rpc.EsbRpcRemoteInterface; -import org.apache.commons.configuration.Configuration; import org.apache.commons.configuration.ConfigurationException; import org.apache.commons.configuration.PropertiesConfiguration; import org.slf4j.Logger; @@ -23,11 +22,16 @@ import java.util.Map; @Service("esbRpcRemoteSendDx_sj") public class EsbRpcRemoteSendDx implements EsbRpcRemoteInterface { public EsbRpcRemoteSendDx() { + PropertiesConfiguration p = null; try { - Configuration p = new PropertiesConfiguration("config/sxjg.properties"); + p = new PropertiesConfiguration(); + p.setEncoding("utf-8"); + p.setFileName("config/sxjg.properties"); + p.load(); this.setPwd(p.getString("message.Pwd")); this.setUrl(p.getString("message.url")); this.setCorpID(p.getString("message.CorpID")); + this.setQm(p.getString("message.qm")); }catch (ConfigurationException e) { throw new BusinessException("获取sxjg.properties配置文件失败,", e); } @@ -36,10 +40,19 @@ public class EsbRpcRemoteSendDx implements EsbRpcRemoteInterface { private String corpID; private String pwd; private String url; + private String qm; @Override public Map execute(Map params) { Map rs = new HashMap<>(); - String content = (String)params.get("content"); + String content1 = (String)params.get("content"); + log.error("sj二开qm配置:"+this.getQm()); + String content = ""; + //处理系统中的签名问题,第三方系统会在短信尾加上签名,这里需要将系统拼接的去掉。 + if(content1.startsWith(this.getQm())) { + content = content1.split(this.getQm(),2)[1].trim(); + }else { + content = content1; + } String mobile = (String)params.get("mobile"); String send_time = ""; String cell = ""; @@ -80,7 +93,6 @@ public class EsbRpcRemoteSendDx implements EsbRpcRemoteInterface { rs.put("description",String.valueOf(inputLine)); return rs; } - public String getCorpID() { return corpID; } @@ -104,4 +116,13 @@ public class EsbRpcRemoteSendDx implements EsbRpcRemoteInterface { public void setUrl(String url) { this.url = url; } + + public String getQm() { + return qm; + } + + public void setQm(String qm1) { + String qm2 = "【"+qm1+"】"; + this.qm = qm2; + } } diff --git a/e10dev/src/main/resources/config/sxjg.properties b/e10dev/src/main/resources/config/sxjg.properties index 6bc49af..9862072 100644 --- a/e10dev/src/main/resources/config/sxjg.properties +++ b/e10dev/src/main/resources/config/sxjg.properties @@ -1,4 +1,5 @@ #短信平台配置信息 message.CorpID=XAJT002089 message.Pwd=8EB31B -message.url=https://sdk3.028lk.com:9988/BatchSend2.aspx \ No newline at end of file +message.url=https://sdk3.028lk.com:9988/BatchSend2.aspx +message.qm=陕西建工集团 \ No newline at end of file