ias 发送短信调整，文件名称调整

gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/ias/channel/ChannelServiceCmd.java → gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/ias/message/ChannelServiceCmd.java

@@ -1,12 +1,9 @@
-package cn.com.taiji.core.model.comm.protocol.ias.channel;
+package cn.com.taiji.core.model.comm.protocol.ias.message;
 
 import cn.com.taiji.core.model.comm.protocol.SignServiceCommand;
 import cn.com.taiji.core.model.comm.protocol.SignServiceType;
 import cn.com.taiji.core.model.comm.protocol.ias.AbstractIasRequest;
 import cn.com.taiji.core.model.comm.protocol.ias.IasServiceType;
-import cn.com.taiji.core.model.comm.protocol.ias.channel.hlt.HltSendShortRequest;
-import cn.com.taiji.core.model.comm.protocol.ias.channel.jpush.JpushAllRidNotificationMessageRequest;
-import cn.com.taiji.core.model.comm.protocol.ias.channel.qtkPush.QtkPushSendMessageRequest;
 
 public enum ChannelServiceCmd implements SignServiceCommand {
 

gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/ias/channel/hlt/HltSendShortRequest.java → gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/ias/message/HltSendShortRequest.java

@@ -1,19 +1,13 @@
-package cn.com.taiji.core.model.comm.protocol.ias.channel.hlt;
+package cn.com.taiji.core.model.comm.protocol.ias.message;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
 
-import cn.com.taiji.core.model.comm.protocol.SignServiceCommand;
 import cn.com.taiji.core.model.comm.protocol.ias.AbstractIasRequest;
-import cn.com.taiji.core.model.comm.protocol.ias.channel.ChannelServiceCmd;
-import cn.com.taiji.core.model.comm.protocol.ias.portal.AbstractPortalRequest;
-import cn.com.taiji.core.model.comm.protocol.ias.portal.LoginByCodeResponse;
-import cn.com.taiji.core.model.comm.protocol.ias.portal.PortalServiceCmd;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.google.common.collect.Lists;
 
-import cn.com.taiji.common.entity.BaseEntity;
 import cn.com.taiji.common.manager.net.http.ServiceHandleException;
 import cn.com.taiji.core.model.comm.protocol.valid.GlyServiceError;
 import cn.hutool.core.collection.CollectionUtil;

gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/ias/channel/hlt/HltSendShortResponse.java → gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/ias/message/HltSendShortResponse.java

@@ -1,4 +1,4 @@
-package cn.com.taiji.core.model.comm.protocol.ias.channel.hlt;
+package cn.com.taiji.core.model.comm.protocol.ias.message;
 
 import cn.com.taiji.core.model.comm.protocol.ias.portal.AbstractPortalResponse;
 

gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/ias/channel/jpush/JpushAllRidNotificationMessageRequest.java → gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/ias/message/JpushAllRidNotificationMessageRequest.java

@@ -1,16 +1,12 @@
-package cn.com.taiji.core.model.comm.protocol.ias.channel.jpush;
+package cn.com.taiji.core.model.comm.protocol.ias.message;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
 
 import cn.com.taiji.core.model.comm.protocol.ias.AbstractIasRequest;
-import cn.com.taiji.core.model.comm.protocol.ias.channel.ChannelServiceCmd;
-import cn.com.taiji.core.model.comm.protocol.ias.channel.hlt.HltSendShortResponse;
-import cn.com.taiji.core.model.comm.protocol.ias.portal.PortalServiceCmd;
 import com.google.common.collect.Lists;
 
-import cn.com.taiji.common.entity.BaseEntity;
 import cn.com.taiji.common.manager.net.http.ServiceHandleException;
 import cn.com.taiji.core.model.comm.protocol.valid.GlyServiceError;
 import cn.hutool.core.collection.CollectionUtil;

gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/ias/channel/jpush/JpushAllRidNotificationMessageResponse.java → gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/ias/message/JpushAllRidNotificationMessageResponse.java

@@ -1,4 +1,4 @@
-package cn.com.taiji.core.model.comm.protocol.ias.channel.jpush;
+package cn.com.taiji.core.model.comm.protocol.ias.message;
 
 
 import cn.com.taiji.common.entity.BaseEntity;

gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/ias/channel/qtkPush/QtkPushSendMessageRequest.java → gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/ias/message/QtkPushSendMessageRequest.java

@@ -1,4 +1,4 @@
-package cn.com.taiji.core.model.comm.protocol.ias.channel.qtkPush;
+package cn.com.taiji.core.model.comm.protocol.ias.message;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
@@ -9,7 +9,6 @@ import com.google.common.collect.Lists;
 
 import cn.com.taiji.common.manager.net.http.ServiceHandleException;
 import cn.com.taiji.core.model.comm.protocol.ias.AbstractIasRequest;
-import cn.com.taiji.core.model.comm.protocol.ias.channel.ChannelServiceCmd;
 import cn.com.taiji.core.model.comm.protocol.valid.GlyServiceError;
 import cn.hutool.core.collection.CollectionUtil;
 

gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/ias/channel/qtkPush/QtkPushSendMessageResponse.java → gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/ias/message/QtkPushSendMessageResponse.java

@@ -1,4 +1,4 @@
-package cn.com.taiji.core.model.comm.protocol.ias.channel.qtkPush;
+package cn.com.taiji.core.model.comm.protocol.ias.message;
 
 
 import cn.com.taiji.core.model.comm.protocol.ias.portal.AbstractPortalResponse;

gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/ias/channel/qtzlEmail/QtzlEmailSendRequest.java → gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/ias/message/QtzlEmailSendRequest.java

@@ -1,4 +1,4 @@
-package cn.com.taiji.core.model.comm.protocol.ias.channel.qtzlEmail;
+package cn.com.taiji.core.model.comm.protocol.ias.message;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
@@ -11,9 +11,8 @@ import com.google.common.collect.Lists;
 
 import cn.com.taiji.common.manager.net.http.ServiceHandleException;
 import cn.com.taiji.core.model.comm.protocol.ias.AbstractIasRequest;
-import cn.com.taiji.core.model.comm.protocol.ias.channel.ChannelServiceCmd;
-import cn.com.taiji.core.model.comm.protocol.ias.channel.qtzlEmail.dto.FileVo;
-import cn.com.taiji.core.model.comm.protocol.ias.channel.qtzlEmail.dto.MIMEMultipartTypeEnum;
+import cn.com.taiji.core.model.comm.protocol.ias.message.dto.FileVo;
+import cn.com.taiji.core.model.comm.protocol.ias.message.dto.MIMEMultipartTypeEnum;
 import cn.com.taiji.core.model.comm.protocol.valid.GlyServiceError;
 import cn.hutool.core.collection.CollectionUtil;
 

gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/ias/channel/qtzlEmail/QtzlEmailSendResponse.java → gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/ias/message/QtzlEmailSendResponse.java

@@ -1,4 +1,4 @@
-package cn.com.taiji.core.model.comm.protocol.ias.channel.qtzlEmail;
+package cn.com.taiji.core.model.comm.protocol.ias.message;
 
 
 import cn.com.taiji.core.model.comm.protocol.ias.portal.AbstractPortalResponse;

gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/ias/channel/qtzlEmail/dto/FileVo.java → gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/ias/message/dto/FileVo.java

@@ -1,4 +1,4 @@
-package cn.com.taiji.core.model.comm.protocol.ias.channel.qtzlEmail.dto;
+package cn.com.taiji.core.model.comm.protocol.ias.message.dto;
 
 import java.util.Objects;
 

gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/ias/channel/qtzlEmail/dto/MIMEMultipartTypeEnum.java → gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/ias/message/dto/MIMEMultipartTypeEnum.java

@@ -1,4 +1,4 @@
-package cn.com.taiji.core.model.comm.protocol.ias.channel.qtzlEmail.dto;
+package cn.com.taiji.core.model.comm.protocol.ias.message.dto;
 
 /**
  * @author shake

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/api/QtkPushController.java

@@ -2,14 +2,8 @@ package cn.com.taiji.ias.api;
 
 import javax.validation.Valid;
 
-import cn.com.taiji.core.model.comm.protocol.ias.channel.hlt.HltSendShortRequest;
-import cn.com.taiji.core.model.comm.protocol.ias.channel.hlt.HltSendShortResponse;
-import cn.com.taiji.core.model.comm.protocol.ias.channel.jpush.JpushAllRidNotificationMessageRequest;
-import cn.com.taiji.core.model.comm.protocol.ias.channel.jpush.JpushAllRidNotificationMessageResponse;
-import cn.com.taiji.core.model.comm.protocol.ias.channel.qtkPush.QtkPushSendMessageRequest;
-import cn.com.taiji.core.model.comm.protocol.ias.channel.qtkPush.QtkPushSendMessageResponse;
-import cn.com.taiji.core.model.comm.protocol.ias.channel.qtzlEmail.QtzlEmailSendRequest;
-import cn.com.taiji.core.model.comm.protocol.ias.channel.qtzlEmail.QtzlEmailSendResponse;
+import cn.com.taiji.core.model.comm.protocol.ias.message.*;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/clientConfig/HltManager.java

@@ -1,9 +1,7 @@
 package cn.com.taiji.ias.manager.clientConfig;
 
 import cn.com.taiji.common.manager.ManagerException;
-import cn.com.taiji.core.model.comm.protocol.ias.channel.hlt.HltSendShortRequest;
-import cn.com.taiji.core.model.comm.protocol.ias.channel.hlt.HltSendShortResponse;
-
+import cn.com.taiji.core.model.comm.protocol.ias.message.*;
 /***
  * 汇联通
  * @Author weicailin

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/clientConfig/HltManagerImpl.java

@@ -1,19 +1,28 @@
 package cn.com.taiji.ias.manager.clientConfig;
 
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
+import java.util.UUID;
 
-import cn.com.taiji.core.model.comm.protocol.ias.channel.hlt.HltSendShortRequest;
-import cn.com.taiji.core.model.comm.protocol.ias.channel.hlt.HltSendShortResponse;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import cn.com.taiji.core.model.comm.protocol.qtus.sso.SendMessageRequest;
 
+import com.alibaba.fastjson2.JSON;
+
+import cn.com.taiji.common.manager.net.http.ServiceHandleException;
+import cn.com.taiji.common.pub.StringTools;
+import cn.com.taiji.core.model.comm.protocol.ias.message.HltSendShortRequest;
+import cn.com.taiji.core.model.comm.protocol.ias.message.HltSendShortResponse;
 import cn.com.taiji.ias.manager.AbstractCommManager;
+import cn.com.taiji.ias.manager.request.HltSmsSendReq;
+import cn.com.taiji.ias.manager.request.SubmitSmsRequset;
+import cn.com.taiji.ias.manager.tools.MD5Util;
 import cn.com.taiji.ias.manager.tools.ThreadPoolTools;
+import cn.com.taiji.ias.tools.hlt.DesUtil;
+import okhttp3.*;
 
 /**
  * @Author weicailin
@@ -26,6 +35,13 @@ public class HltManagerImpl extends AbstractCommManager implements HltManager {
     @Autowired
     private ThreadPoolTools threadPoolTools;
 
+    private static final String URL_V1 = "http://192.168.100.63:8130/api/v1/execute.html";//
+    private static final String SENDER_ID_V1 = "5c7c94dc740948f9adcd0a18c1ebfc92";//
+    private static final String SMS_TYPE_CODE_V1 = "NOTIFY_SMS";//
+    private static final String SMS_SIGN_CODE_V1 = "0FC1E767";//
+    private static final String SMS_ACCESS_CODE_V1 = "30374DA4DD934A02A8DCB7F60926B5BE";//
+    private static final String SMS_CHANNEL_CODE_V1 = "ETC_order_No";//
+    private static final String SMS_METHOD_V1 = "submitSms";//
     @Override
     public HltSendShortResponse sendShort(HltSendShortRequest request, String apiKey) {
         send(request);
@@ -43,25 +59,14 @@ public class HltManagerImpl extends AbstractCommManager implements HltManager {
 
             List<String> mobileList = request.getMobileList();
             for (String mobile : mobileList) {
-                //请求统一会员平台密码登录接口
                 //配置统一会员会员平台的参数
-                SendMessageRequest hltShortRequest = new SendMessageRequest();
-                hltShortRequest.setMobile(mobile);
-                hltShortRequest.setMessage(request.getMessage());
-                Map<String, Object> stringObjectMap = null;
-                //将异常吃掉，发送失败就发送失败，不能影响后续待发送短信的发送
+                SubmitSmsRequset sendReq =new SubmitSmsRequset();
+                sendReq.setMobile(mobile);
+                sendReq.setSms(request.getMessage());
                 try {
-                    stringObjectMap = jsonPostRepeat(hltShortRequest, null);
-                    if (stringObjectMap == null) {
-                        logger.error("发送手机短信，调用中台，无返回结果！手机号码：{}", mobile);
-                        failTouserList.add(mobile);
-                    } else {
-                        successCount++;
-                    }
+                    sendHltSmsV1(sendReq);
                 } catch (Exception e) {
-                    errorReason = e.getMessage();
-                    logger.error(e.toString());
-                    failTouserList.add(mobile);
+                    throw new RuntimeException(e);
                 }
             }
             logger.info("********** 短信发送 END **********");
@@ -78,4 +83,57 @@ public class HltManagerImpl extends AbstractCommManager implements HltManager {
             }
         });
     }
+
+
+    private void sendHltSmsV1(SubmitSmsRequset sendReq) throws Exception {
+        String smsServerUrl = URL_V1;
+        sendReq.setSenderId(SENDER_ID_V1);
+        sendReq.setChannelCode(SMS_CHANNEL_CODE_V1);
+        sendReq.setSmsTypeCode(SMS_TYPE_CODE_V1);
+        sendReq.setSourceName("统一会员平台");
+        logger.info(sendReq.toJson(true));
+
+        HltSmsSendReq req = new HltSmsSendReq();
+        req.setAccessCode(SMS_ACCESS_CODE_V1);
+        req.setMethod(SMS_METHOD_V1);
+        String reqId = UUID.randomUUID().toString().replace("-", "");
+        req.setRequestId(reqId);
+        String reqData = DesUtil.encode(sendReq.toJson(), StandardCharsets.UTF_8, SMS_SIGN_CODE_V1).replaceAll("(\\r\\n|\\n|\\\\n|\\s)", "");
+        req.setData(reqData);
+        req.setSign(sign(req.getAccessCode(), req.getRequestId(), req.getMethod(), req.getData(), SMS_SIGN_CODE_V1));
+
+        OkHttpClient client = new OkHttpClient().newBuilder().build();
+
+        MediaType mediaType = MediaType.parse("text/html;charset=utf-8");
+        RequestBody requestBody = RequestBody.create(mediaType, req.toJson());
+        Request request = new Request.Builder().url(smsServerUrl).method("POST", requestBody).addHeader("Content-Type", "text/html;charset=utf-8").build();
+
+        ResponseBody responseBody;
+        String responseBodyString = null;
+        try (Response response = client.newCall(request).execute()) {
+            responseBody = response.body();
+            if (responseBody != null) {
+                responseBodyString = responseBody.string();
+            }
+        }
+
+
+        if (!StringTools.hasText(responseBodyString)) {
+            throw new ServiceHandleException("网络错误 请重试", 704);
+        }
+
+        String formatedResString = responseBodyString.replaceAll("(\\r\\n|\\n|\\\\n|\\s)", "");
+        // formatedResString 要先验证一下是否是json格式 不是的话抛出异常
+        try {
+            JSON.parseObject(formatedResString);
+        } catch (Exception e) {
+            logger.info("", e);
+            throw new ServiceHandleException("网络错误 请重试",704);
+        }
+    }
+
+    private static String sign(String accessCode, String requestId, String method, String data, String signCode) {
+        String str = (accessCode + signCode) + (requestId + signCode) + (method + signCode) + (data + signCode);
+        return MD5Util.MD5(str, "UTF-8");
+    }
 }

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/clientConfig/JpushManager.java

@@ -1,8 +1,8 @@
 package cn.com.taiji.ias.manager.clientConfig;
 
 import cn.com.taiji.common.manager.ManagerException;
-import cn.com.taiji.core.model.comm.protocol.ias.channel.jpush.JpushAllRidNotificationMessageRequest;
-import cn.com.taiji.core.model.comm.protocol.ias.channel.jpush.JpushAllRidNotificationMessageResponse;
+import cn.com.taiji.core.model.comm.protocol.ias.message.JpushAllRidNotificationMessageRequest;
+import cn.com.taiji.core.model.comm.protocol.ias.message.JpushAllRidNotificationMessageResponse;
 
 
 /***

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/clientConfig/JpushManagerImpl.java

@@ -1,7 +1,7 @@
 package cn.com.taiji.ias.manager.clientConfig;
 
-import cn.com.taiji.core.model.comm.protocol.ias.channel.jpush.JpushAllRidNotificationMessageRequest;
-import cn.com.taiji.core.model.comm.protocol.ias.channel.jpush.JpushAllRidNotificationMessageResponse;
+import cn.com.taiji.core.model.comm.protocol.ias.message.JpushAllRidNotificationMessageRequest;
+import cn.com.taiji.core.model.comm.protocol.ias.message.JpushAllRidNotificationMessageResponse;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/clientConfig/QtkPushManager.java

@@ -1,8 +1,7 @@
 package cn.com.taiji.ias.manager.clientConfig;
 
 import cn.com.taiji.common.manager.ManagerException;
-import cn.com.taiji.core.model.comm.protocol.ias.channel.qtkPush.QtkPushSendMessageRequest;
-import cn.com.taiji.core.model.comm.protocol.ias.channel.qtkPush.QtkPushSendMessageResponse;
+import cn.com.taiji.core.model.comm.protocol.ias.message.*;
 
 /**
  * qtk推送（web）

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/clientConfig/QtkPushManagerImpl.java

@@ -6,8 +6,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import cn.com.taiji.common.manager.ManagerException;
-import cn.com.taiji.core.model.comm.protocol.ias.channel.qtkPush.QtkPushSendMessageRequest;
-import cn.com.taiji.core.model.comm.protocol.ias.channel.qtkPush.QtkPushSendMessageResponse;
+import cn.com.taiji.core.model.comm.protocol.ias.message.QtkPushSendMessageRequest;
+import cn.com.taiji.core.model.comm.protocol.ias.message.QtkPushSendMessageResponse;
 import cn.com.taiji.ias.manager.tools.ThreadPoolTools;
 
 /**

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/clientConfig/QtzlEmailManager.java

@@ -1,9 +1,7 @@
 package cn.com.taiji.ias.manager.clientConfig;
 
 import cn.com.taiji.common.manager.ManagerException;
-import cn.com.taiji.core.model.comm.protocol.ias.channel.qtzlEmail.QtzlEmailSendRequest;
-import cn.com.taiji.core.model.comm.protocol.ias.channel.qtzlEmail.QtzlEmailSendResponse;
-
+import cn.com.taiji.core.model.comm.protocol.ias.message.*;
 /***
  * 黔通智联-大数据部-邮件
  * @Author weicailin

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/clientConfig/QtzlEmailManagerImpl.java

@@ -10,8 +10,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
-import cn.com.taiji.core.model.comm.protocol.ias.channel.qtzlEmail.QtzlEmailSendRequest;
-import cn.com.taiji.core.model.comm.protocol.ias.channel.qtzlEmail.QtzlEmailSendResponse;
+import cn.com.taiji.core.model.comm.protocol.ias.message.*;
 import cn.com.taiji.ias.manager.AbstractCommManager;
 import cn.com.taiji.ias.manager.request.EmailRequest;
 import cn.com.taiji.ias.manager.tools.ThreadPoolTools;

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/handler/ChannelSendHandler.java

@@ -11,11 +11,11 @@ import cn.com.taiji.core.model.comm.protocol.AbstractSignTypeRequest;
 import cn.com.taiji.core.model.comm.protocol.AbstractSignTypeResponse;
 import cn.com.taiji.core.model.comm.protocol.SignJsonRequest;
 import cn.com.taiji.core.model.comm.protocol.ias.IasServiceType;
-import cn.com.taiji.core.model.comm.protocol.ias.channel.ChannelServiceCmd;
-import cn.com.taiji.core.model.comm.protocol.ias.channel.hlt.HltSendShortRequest;
-import cn.com.taiji.core.model.comm.protocol.ias.channel.jpush.JpushAllRidNotificationMessageRequest;
-import cn.com.taiji.core.model.comm.protocol.ias.channel.qtkPush.QtkPushSendMessageRequest;
-import cn.com.taiji.core.model.comm.protocol.ias.channel.qtzlEmail.QtzlEmailSendRequest;
+import cn.com.taiji.core.model.comm.protocol.ias.message.ChannelServiceCmd;
+import cn.com.taiji.core.model.comm.protocol.ias.message.HltSendShortRequest;
+import cn.com.taiji.core.model.comm.protocol.ias.message.JpushAllRidNotificationMessageRequest;
+import cn.com.taiji.core.model.comm.protocol.ias.message.QtkPushSendMessageRequest;
+import cn.com.taiji.core.model.comm.protocol.ias.message.QtzlEmailSendRequest;
 import cn.com.taiji.ias.manager.handler.htl.HltSendShortManager;
 import cn.com.taiji.ias.manager.handler.jpush.JpushAllAppManager;
 import cn.com.taiji.ias.manager.handler.qtkPush.QtkPushGetSendManager;

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/handler/htl/HltSendShortManager.java

@@ -2,8 +2,8 @@ package cn.com.taiji.ias.manager.handler.htl;
 
 import cn.com.taiji.common.manager.ManagerException;
 import cn.com.taiji.common.manager.net.http.ServiceHandleException;
-import cn.com.taiji.core.model.comm.protocol.ias.channel.hlt.HltSendShortRequest;
-import cn.com.taiji.core.model.comm.protocol.ias.channel.hlt.HltSendShortResponse;
+import cn.com.taiji.core.model.comm.protocol.ias.message.HltSendShortRequest;
+import cn.com.taiji.core.model.comm.protocol.ias.message.HltSendShortResponse;
 
 /**
  * @Author ChenChao

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/handler/htl/HltSendShortManagerIpml.java

@@ -3,8 +3,8 @@ package cn.com.taiji.ias.manager.handler.htl;
 import static cn.com.taiji.ias.api.TokenHelper.logger;
 
 import cn.com.taiji.common.manager.net.http.ServiceHandleException;
-import cn.com.taiji.core.model.comm.protocol.ias.channel.hlt.HltSendShortRequest;
-import cn.com.taiji.core.model.comm.protocol.ias.channel.hlt.HltSendShortResponse;
+import cn.com.taiji.core.model.comm.protocol.ias.message.HltSendShortRequest;
+import cn.com.taiji.core.model.comm.protocol.ias.message.HltSendShortResponse;
 import cn.com.taiji.core.model.comm.protocol.valid.GlyServiceError;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/handler/jpush/JpushAllAppManager.java

@@ -1,9 +1,8 @@
 package cn.com.taiji.ias.manager.handler.jpush;
 
-import cn.com.taiji.common.manager.ManagerException;
 import cn.com.taiji.common.manager.net.http.ServiceHandleException;
-import cn.com.taiji.core.model.comm.protocol.ias.channel.jpush.JpushAllRidNotificationMessageRequest;
-import cn.com.taiji.core.model.comm.protocol.ias.channel.jpush.JpushAllRidNotificationMessageResponse;
+import cn.com.taiji.core.model.comm.protocol.ias.message.JpushAllRidNotificationMessageRequest;
+import cn.com.taiji.core.model.comm.protocol.ias.message.JpushAllRidNotificationMessageResponse;
 
 /**
  * @Author ChenChao

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/handler/jpush/JpushAllAppManagerImpl.java

@@ -3,8 +3,8 @@ package cn.com.taiji.ias.manager.handler.jpush;
 import static cn.com.taiji.ias.api.TokenHelper.logger;
 
 import cn.com.taiji.common.manager.net.http.ServiceHandleException;
-import cn.com.taiji.core.model.comm.protocol.ias.channel.jpush.JpushAllRidNotificationMessageRequest;
-import cn.com.taiji.core.model.comm.protocol.ias.channel.jpush.JpushAllRidNotificationMessageResponse;
+import cn.com.taiji.core.model.comm.protocol.ias.message.JpushAllRidNotificationMessageRequest;
+import cn.com.taiji.core.model.comm.protocol.ias.message.JpushAllRidNotificationMessageResponse;
 import cn.com.taiji.core.model.comm.protocol.valid.GlyServiceError;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/handler/qtkPush/QtkPushGetSendManager.java

@@ -1,8 +1,8 @@
 package cn.com.taiji.ias.manager.handler.qtkPush;
 
 import cn.com.taiji.common.manager.net.http.ServiceHandleException;
-import cn.com.taiji.core.model.comm.protocol.ias.channel.qtkPush.QtkPushSendMessageRequest;
-import cn.com.taiji.core.model.comm.protocol.ias.channel.qtkPush.QtkPushSendMessageResponse;
+import cn.com.taiji.core.model.comm.protocol.ias.message.QtkPushSendMessageRequest;
+import cn.com.taiji.core.model.comm.protocol.ias.message.QtkPushSendMessageResponse;
 /**
  * @Author ChenChao
  * @Date 2024/10/6 13:16

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/handler/qtkPush/QtkPushGetSendManagerImpl.java

@@ -4,8 +4,8 @@ package cn.com.taiji.ias.manager.handler.qtkPush;
 import static com.zgglyun.common.model.SignOperation.logger;
 
 import cn.com.taiji.common.manager.net.http.ServiceHandleException;
-import cn.com.taiji.core.model.comm.protocol.ias.channel.qtkPush.QtkPushSendMessageRequest;
-import cn.com.taiji.core.model.comm.protocol.ias.channel.qtkPush.QtkPushSendMessageResponse;
+import cn.com.taiji.core.model.comm.protocol.ias.message.QtkPushSendMessageRequest;
+import cn.com.taiji.core.model.comm.protocol.ias.message.QtkPushSendMessageResponse;
 import cn.com.taiji.core.model.comm.protocol.valid.GlyServiceError;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/handler/qtzlEmail/QtzlEmailSendManager.java

@@ -1,8 +1,8 @@
 package cn.com.taiji.ias.manager.handler.qtzlEmail;
 
 import cn.com.taiji.common.manager.net.http.ServiceHandleException;
-import cn.com.taiji.core.model.comm.protocol.ias.channel.qtzlEmail.QtzlEmailSendRequest;
-import cn.com.taiji.core.model.comm.protocol.ias.channel.qtzlEmail.QtzlEmailSendResponse;
+import cn.com.taiji.core.model.comm.protocol.ias.message.QtzlEmailSendRequest;
+import cn.com.taiji.core.model.comm.protocol.ias.message.QtzlEmailSendResponse;
 
 /**
  * @Author ChenChao

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/handler/qtzlEmail/QtzlEmailSendManagerImpl.java

@@ -7,8 +7,8 @@ import org.springframework.stereotype.Service;
 
 import cn.com.taiji.common.manager.ManagerException;
 import cn.com.taiji.common.manager.net.http.ServiceHandleException;
-import cn.com.taiji.core.model.comm.protocol.ias.channel.qtzlEmail.QtzlEmailSendRequest;
-import cn.com.taiji.core.model.comm.protocol.ias.channel.qtzlEmail.QtzlEmailSendResponse;
+import cn.com.taiji.core.model.comm.protocol.ias.message.QtzlEmailSendRequest;
+import cn.com.taiji.core.model.comm.protocol.ias.message.QtzlEmailSendResponse;
 import cn.com.taiji.core.model.comm.protocol.valid.GlyServiceError;
 import cn.com.taiji.ias.manager.clientConfig.QtzlEmailManager;
 

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/request/EmailRequest.java

@@ -1,8 +1,8 @@
 package cn.com.taiji.ias.manager.request;
 
 import cn.com.taiji.core.model.comm.protocol.AbstractReqIdTypeRequest;
-import cn.com.taiji.core.model.comm.protocol.ias.channel.qtzlEmail.dto.FileVo;
-import cn.com.taiji.core.model.comm.protocol.ias.channel.qtzlEmail.dto.MIMEMultipartTypeEnum;
+import cn.com.taiji.core.model.comm.protocol.ias.message.dto.FileVo;
+import cn.com.taiji.core.model.comm.protocol.ias.message.dto.MIMEMultipartTypeEnum;
 import lombok.Data;
 
 import java.util.List;

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/request/HltShortRequest.java

@@ -1,16 +0,0 @@
-package cn.com.taiji.ias.manager.request;
-
-import cn.com.taiji.core.model.comm.protocol.AbstractReqIdTypeRequest;
-import lombok.Data;
-
-/**
- * @Author ChenChao
- * @Date 2024/10/6 0:03
- * @Description  请求统一会员平台密码登录接口
- */
-
-@Data
-public class HltShortRequest extends AbstractReqIdTypeRequest {
-    private String mobile;
-    private String message;
-}

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/request/HltSmsSendReq.java

@@ -0,0 +1,58 @@
+package cn.com.taiji.ias.manager.request;
+
+import cn.com.taiji.common.entity.BaseEntity;
+
+public class HltSmsSendReq extends BaseEntity{
+    /**
+     * 接入码
+     */
+    private String accessCode;
+    /**
+     * 请求id，每次传入的请求id不允许相同，长度不能超过50位
+     */
+    private String requestId;
+    /**
+     * 请求业务接口名称
+     */
+    private String method;
+    /**
+     * 业务数据，用signCode进行DES加密
+     */
+    private String data;
+    /**
+     * 数据签名
+     */
+    private String sign;
+	public String getAccessCode() {
+		return accessCode;
+	}
+	public void setAccessCode(String accessCode) {
+		this.accessCode = accessCode;
+	}
+	public String getRequestId() {
+		return requestId;
+	}
+	public void setRequestId(String requestId) {
+		this.requestId = requestId;
+	}
+	public String getMethod() {
+		return method;
+	}
+	public void setMethod(String method) {
+		this.method = method;
+	}
+	public String getData() {
+		return data;
+	}
+	public void setData(String data) {
+		this.data = data;
+	}
+	public String getSign() {
+		return sign;
+	}
+	public void setSign(String sign) {
+		this.sign = sign;
+	}
+
+
+}

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/request/SmsCodeRequset.java

@@ -0,0 +1,28 @@
+package cn.com.taiji.ias.manager.request;
+
+import cn.com.taiji.common.entity.BaseEntity;
+
+public abstract class SmsCodeRequset extends BaseEntity{
+    /**
+     * 短信平台发送配置编号
+     */
+   private String senderId;
+    /**
+     * 渠道编码
+     */
+   private String channelCode;
+	public String getSenderId() {
+		return senderId;
+	}
+	public void setSenderId(String senderId) {
+		this.senderId = senderId;
+	}
+	public String getChannelCode() {
+		return channelCode;
+	}
+	public void setChannelCode(String channelCode) {
+		this.channelCode = channelCode;
+	}
+
+
+}

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/request/SubmitSmsRequset.java

@@ -0,0 +1,51 @@
+package cn.com.taiji.ias.manager.request;
+
+/**
+ * 提交短信
+ */
+public class SubmitSmsRequset extends SmsCodeRequset {
+    /**
+     *短信类型编码
+     */
+    private String smsTypeCode;
+    /**
+     *接收短信的手机号
+     */
+    private String mobile;
+    /**
+     *短信内容
+     */
+    private String sms;
+	/**
+	 * 短信发送来源
+	 */
+	private String sourceName;
+
+	public String getSourceName() {
+		return sourceName;
+	}
+
+	public void setSourceName(String sourceName) {
+		this.sourceName = sourceName;
+	}
+
+	public String getSmsTypeCode() {
+		return smsTypeCode;
+	}
+	public void setSmsTypeCode(String smsTypeCode) {
+		this.smsTypeCode = smsTypeCode;
+	}
+	public String getMobile() {
+		return mobile;
+	}
+	public void setMobile(String mobile) {
+		this.mobile = mobile;
+	}
+	public String getSms() {
+		return sms;
+	}
+	public void setSms(String sms) {
+		this.sms = sms;
+	}
+
+}

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/tools/MD5Util.java

@@ -0,0 +1,105 @@
+package cn.com.taiji.ias.manager.tools;
+
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+
+public class MD5Util {
+
+	public final static String MD5(String s) {
+		char hexDigits[] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F' };
+		try {
+			byte[] btInput = s.getBytes();
+			// 获得MD5摘要算法的 MessageDigest 对象
+			MessageDigest mdInst = MessageDigest.getInstance("MD5");
+			// 使用指定的字节更新摘要
+			mdInst.update(btInput);
+			// 获得密文
+			byte[] md = mdInst.digest();
+			// 把密文转换成十六进制的字符串形式
+			int j = md.length;
+			char str[] = new char[j * 2];
+			int k = 0;
+			for (int i = 0; i < j; i++) {
+				byte byte0 = md[i];
+				str[k++] = hexDigits[byte0 >>> 4 & 0xf];
+				str[k++] = hexDigits[byte0 & 0xf];
+			}
+			return new String(str);
+		} catch (Exception e) {
+			e.printStackTrace();
+			return null;
+		}
+	}
+
+	/**
+	 *
+	 * @time 2017年10月9日10:07:49
+	 * @author Lxm
+	 * @param data
+	 * @param charset
+	 * @return
+	 */
+	public final static String MD5(String data, String charset) {
+		char hexDigits[] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F' };
+		try {
+			byte[] btInput = data.getBytes(charset);
+			// 获得MD5摘要算法的 MessageDigest 对象
+			MessageDigest mdInst = MessageDigest.getInstance("MD5");
+			// 使用指定的字节更新摘要
+			mdInst.update(btInput);
+			// 获得密文
+			byte[] md = mdInst.digest();
+			// 把密文转换成十六进制的字符串形式
+			int j = md.length;
+			char str[] = new char[j * 2];
+			int k = 0;
+			for (int i = 0; i < j; i++) {
+				byte byte0 = md[i];
+				str[k++] = hexDigits[byte0 >>> 4 & 0xf];
+				str[k++] = hexDigits[byte0 & 0xf];
+			}
+			return new String(str);
+		} catch (Exception e) {
+			e.printStackTrace();
+			return null;
+		}
+	}
+
+	/**
+	 * 获取32，16位md5
+	 *
+	 * @param sourceStr
+	 * @param bit
+	 * @return
+	 */
+	public static String MD5Plus(String sourceStr, int bit) {
+		String result = "";
+		try {
+			MessageDigest md = MessageDigest.getInstance("MD5");
+			md.update(sourceStr.getBytes());
+			byte b[] = md.digest();
+			int i;
+			StringBuffer buf = new StringBuffer("");
+			for (int offset = 0; offset < b.length; offset++) {
+				i = b[offset];
+				if (i < 0)
+					i += 256;
+				if (i < 16)
+					buf.append("0");
+				buf.append(Integer.toHexString(i));
+			}
+			result = buf.toString();
+			if (bit == 16) {
+				result = buf.toString().substring(8, 24);
+			}
+			// System.out.println("MD5(" + sourceStr + ",32) = " + result);
+			// System.out.println("MD5(" + sourceStr + ",16) = "
+			// +buf.toString().substring(8, 24));
+		} catch (NoSuchAlgorithmException e) {
+			System.out.println(e);
+		}
+		return result;
+	}
+
+
+}