调整

zhywpt-service-ias/build.gradle

@@ -24,7 +24,6 @@ dependencies {
     implementation "org.springframework.boot:spring-boot-starter-data-redis"
     implementation "com.alibaba:easyexcel:3.2.1"
     implementation "org.redisson:redisson-spring-boot-starter:3.14.0"
-    implementation group: 'cn.jpush.api', name: 'jpush-client', version: '3.6.6'
     //定时器相关
     implementation 'org.springframework.boot:spring-boot-starter-quartz'
     implementation(group: 'io.springfox', name: 'springfox-boot-starter', version: '3.0.0') {

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

@@ -12,10 +12,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-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;
-import cn.com.taiji.ias.manager.handler.qtzlEmail.QtzlEmailSendManager;
+import cn.com.taiji.ias.manager.qtkPush.QtkPushGetSendManager;
+import cn.com.taiji.ias.manager.qtzlEmail.QtzlEmailSendManager;
 import cn.com.taiji.common.manager.ManagerException;
 import cn.com.taiji.common.web.ApiResponse;
 
@@ -27,11 +25,7 @@ public class QtkPushController extends MyApiValidController {
     @Autowired
     private QtkPushGetSendManager qtkPushGetSendManager;
     @Autowired
-    private HltSendShortManager hltSendShortManager;
-    @Autowired
     private QtzlEmailSendManager qtzlEmailSendManager;
-    @Autowired
-    private JpushAllAppManager jpushAllAppManager;
 
     @ApiOperation(value = "qtkPush-web消息发送")
     @PostMapping(value = "/qtkPushSendMessage")
@@ -39,12 +33,6 @@ public class QtkPushController extends MyApiValidController {
         QtkPushSendMessageResponse response = qtkPushGetSendManager.sendMessageHandler(request);
         return ApiResponse.of(response);
     }
-    @ApiOperation(value = "汇联通-短信发送")
-    @PostMapping(value = "/hlxShort")
-    public ApiResponse<HltSendShortResponse> hlxShort(@RequestBody @Valid HltSendShortRequest request) throws ManagerException {
-        HltSendShortResponse response = hltSendShortManager.hltSendShortHandler(request);
-        return ApiResponse.of(response);
-    }
 
     @ApiOperation(value = "黔通智联-电子邮件消息发送")
     @PostMapping(value = "/qtzlEmailSend")
@@ -53,11 +41,4 @@ public class QtkPushController extends MyApiValidController {
         return ApiResponse.of(response);
     }
 
-    @ApiOperation(value = "极光推送-指定registrationId(android/ios)-App通知栏通知和自定义消息")
-    @PostMapping(value = "/jpuShallRidnm")
-    public ApiResponse<JpushAllRidNotificationMessageResponse> jpuShallRidnm(@RequestBody @Valid JpushAllRidNotificationMessageRequest request) throws ManagerException {
-        JpushAllRidNotificationMessageResponse response = jpushAllAppManager.jpushAllRidNotificationMessageHandler(request);
-        return ApiResponse.of(response);
-    }
-
 }

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

@@ -13,13 +13,11 @@ 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.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;
-import cn.com.taiji.ias.manager.handler.qtzlEmail.QtzlEmailSendManager;
+import cn.com.taiji.ias.manager.htl.HltSendShortManager;
+import cn.com.taiji.ias.manager.qtkPush.QtkPushGetSendManager;
+import cn.com.taiji.ias.manager.qtzlEmail.QtzlEmailSendManager;
 
 @Service
 public class ChannelSendHandler extends AbstractIasServiceHandler<ChannelServiceCmd> {
@@ -30,8 +28,6 @@ public class ChannelSendHandler extends AbstractIasServiceHandler<ChannelService
     private HltSendShortManager hltSendShortManager;
     @Autowired
     private QtzlEmailSendManager qtzlEmailSendManager;
-    @Autowired
-    private JpushAllAppManager jpushAllAppManager;;
 
     public ChannelSendHandler() {
         super(IasServiceType.PROVINCE);
@@ -44,8 +40,6 @@ public class ChannelSendHandler extends AbstractIasServiceHandler<ChannelService
         switch (cmd) {
             case HLTSENDSHORT:
                 return hltSendShortManager.hltSendShortHandler((HltSendShortRequest) request);
-            case JPUSHALLRIDNOTIFICATION:
-                return jpushAllAppManager.jpushAllRidNotificationMessageHandler((JpushAllRidNotificationMessageRequest) request);
             case QTZLEMAILSEND:
                 return qtzlEmailSendManager.qtzlEmailSendHandler((QtzlEmailSendRequest) request);
             case QTKPUSHSEND:

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

@@ -1,19 +0,0 @@
-package cn.com.taiji.ias.manager.handler.jpush;
-
-import cn.com.taiji.common.manager.net.http.ServiceHandleException;
-import cn.com.taiji.core.model.comm.protocol.ias.message.JpushAllRidNotificationMessageRequest;
-import cn.com.taiji.core.model.comm.protocol.ias.message.JpushAllRidNotificationMessageResponse;
-
-/**
- * @Author ChenChao
- * @Date 2024/10/6 9:37
- * @Description  旧系统com.qtk.push.manager.handler.clientConfig.channel.jpush路径下
- * 多个handler放在一起组成一个manager
- */
-
-public interface JpushAllAppManager {
-    JpushAllRidNotificationMessageResponse jpushAllRidNotificationMessageHandler(JpushAllRidNotificationMessageRequest request) throws ServiceHandleException;
-
-
-
-}

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

@@ -1,16 +1,9 @@
-package cn.com.taiji.ias.manager.handler.htl;
+package cn.com.taiji.ias.manager.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.message.HltSendShortRequest;
 import cn.com.taiji.core.model.comm.protocol.ias.message.HltSendShortResponse;
 
-/**
- * @Author ChenChao
- * @Date 2024/10/6 11:45
- * @Description 旧系统com.qtk.push.manager.handler.clientConfig.channel.hlt路径下
- *  多个handler放在一起组成一个manager
- */
 
 public interface HltSendShortManager {
     HltSendShortResponse hltSendShortHandler(HltSendShortRequest request) throws ServiceHandleException;

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

@@ -1,4 +1,4 @@
-package cn.com.taiji.ias.manager.handler.htl;
+package cn.com.taiji.ias.manager.htl;
 
 import static cn.com.taiji.ias.api.TokenHelper.logger;
 

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/portal/SendCodeManager.java

@@ -7,7 +7,7 @@ import cn.com.taiji.core.model.comm.protocol.ias.message.HltSendShortRequest;
 import cn.com.taiji.core.model.comm.protocol.ias.portal.SendCodeRequest;
 import cn.com.taiji.core.model.comm.protocol.ias.portal.SendCodeResponse;
 import cn.com.taiji.core.model.comm.protocol.valid.GlyServiceError;
-import cn.com.taiji.ias.manager.handler.htl.HltSendShortManager;
+import cn.com.taiji.ias.manager.htl.HltSendShortManager;
 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 → zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/qtkPush/QtkPushGetSendManager.java

@@ -1,4 +1,4 @@
-package cn.com.taiji.ias.manager.handler.qtkPush;
+package cn.com.taiji.ias.manager.qtkPush;
 
 import cn.com.taiji.common.manager.net.http.ServiceHandleException;
 import cn.com.taiji.core.model.comm.protocol.ias.message.QtkPushSendMessageRequest;

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

@@ -1,4 +1,4 @@
-package cn.com.taiji.ias.manager.handler.qtkPush;
+package cn.com.taiji.ias.manager.qtkPush;
 
 
 import static com.zgglyun.common.model.SignOperation.logger;

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

@@ -1,4 +1,4 @@
-package cn.com.taiji.ias.manager.handler.qtzlEmail;
+package cn.com.taiji.ias.manager.qtzlEmail;
 
 import cn.com.taiji.common.manager.net.http.ServiceHandleException;
 import cn.com.taiji.core.model.comm.protocol.ias.message.QtzlEmailSendRequest;

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

@@ -1,4 +1,4 @@
-package cn.com.taiji.ias.manager.handler.qtzlEmail;
+package cn.com.taiji.ias.manager.qtzlEmail;
 
 import static cn.com.taiji.ias.api.TokenHelper.logger;