钉钉、微信、阿里消息集成

ibznotify-core/src/main/java/cn/ibizlab/core/extensions/aspect/RefreshTokenAspect.java

@@ -44,7 +44,7 @@ public class RefreshTokenAspect {
      */
     private void refreshToken(JoinPoint point){
         Object[] args = point.getArgs();
-        if (args.length > 0) {
+        if (args.length > 0 && args[0] instanceof MsgOpenAccess) {
             MsgOpenAccess msgOpenAccess = (MsgOpenAccess) args[0];
             if(msgOpenAccess.getOpenType().equals("wechat") || msgOpenAccess.getOpenType().equals("dingtalk")){
                 notifyCoreService.refreshToken(msgOpenAccess);

ibznotify-core/src/main/java/cn/ibizlab/core/extensions/domain/Msg.java

+package cn.ibizlab.core.extensions.domain;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.util.Map;
+
+@Data
+public class Msg {
+
+    @NotBlank(message="系统标识不能为空")
+    private String system;
+
+    @NotBlank(message="模板标识不能为空")
+    private String templateid;
+
+    @NotBlank(message="模板类型不能为空")
+    private String msgtypes;
+
+    @NotBlank(message="用户标识不能为空")
+    private String userids;
+
+    private Map templparams;
+}

ibznotify-core/src/main/java/cn/ibizlab/core/extensions/domain/Template.java

+package cn.ibizlab.core.extensions.domain;
+
+import com.alibaba.fastjson.JSONArray;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+@Data
+public class Template {
+
+    @NotBlank(message="系统标识不能为空")
+    private String system;
+
+    @NotNull(message="模板不能为空")
+    private JSONArray template;
+
+    @NotBlank(message="模板类型不能为空")
+    private String templtypes;
+}

ibznotify-provider/ibznotify-provider-api/src/main/java/cn/ibizlab/api/rest/extensions/NotifyCoreResource.java

 package cn.ibizlab.api.rest.extensions;
 
+import cn.ibizlab.core.extensions.domain.Msg;
+import cn.ibizlab.core.extensions.domain.Template;
 import cn.ibizlab.core.extensions.service.NotifyCoreService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 @RestController
 public class NotifyCoreResource {
@@ -16,28 +15,13 @@ public class NotifyCoreResource {
     @Autowired
     NotifyCoreService notifyCoreService;
 
-    @RequestMapping(method = RequestMethod.GET,value = "/sendDingTalkMsg")
-    public ResponseEntity<Boolean> sendDingTalkMsg(@Validated @RequestParam String tid, @RequestParam String userId){
-        return ResponseEntity.status(HttpStatus.OK).body(notifyCoreService.sendDingTalkMsg(tid,userId));
-//        return ResponseEntity.status(HttpStatus.OK).body(notifyCoreService.sendDingTalkMsg("6c2e3779dd159ceba3e70e7502f4cf6f","760fd9aae5bb9475cb4e18b80d689ea7"));
+    @RequestMapping(method = RequestMethod.POST,value = "/SendMsg")
+    public ResponseEntity<Boolean> SendMsg(@Validated @RequestBody Msg msg){
+        return ResponseEntity.status(HttpStatus.OK).body(notifyCoreService.sendMsg(msg));
     }
 
-    @RequestMapping(method = RequestMethod.GET,value = "/sendWeChatMsg")
-    public ResponseEntity<Boolean> sendWeChatMsg(@Validated @RequestParam String tid,@RequestParam String userId){
-        return ResponseEntity.status(HttpStatus.OK).body(notifyCoreService.sendWeChatMsg(tid,userId));
-//         return ResponseEntity.status(HttpStatus.OK).body(notifyCoreService.sendWeChatMsg("8ddcea1f2a9743f159bd765133443684","760fd9aae5bb9475cb4e18b80d689ea7"));
+    @RequestMapping(method = RequestMethod.POST,value = "/createMsgTemplate")
+    public ResponseEntity<Boolean> createMsgTemplate(@Validated @RequestBody Template template){
+        return ResponseEntity.status(HttpStatus.OK).body(notifyCoreService.createMsgTemplate(template));
     }
-
-    @RequestMapping(method = RequestMethod.GET,value = "/sendAliEMail")
-    public ResponseEntity<Boolean> sendAliEMail(@Validated @RequestParam String tid,@RequestParam String userId){
-        return ResponseEntity.status(HttpStatus.OK).body(notifyCoreService.sendAliEMail(tid,userId));
-//        return ResponseEntity.status(HttpStatus.OK).body(notifyCoreService.sendAliEMail("5f4c72e0eb1eb3cf5b57c319a021d5b9","760fd9aae5bb9475cb4e18b80d689ea7"));
-    }
-
-    @RequestMapping(method = RequestMethod.GET,value = "/SendAliSms")
-    public ResponseEntity<Boolean> SendAliSms(@Validated @RequestParam String tid,@RequestParam String userId){
-        return ResponseEntity.status(HttpStatus.OK).body(notifyCoreService.SendAliSms(tid,userId));
-//        return ResponseEntity.status(HttpStatus.OK).body(notifyCoreService.SendAliSms("Vufzr1HEvhntkIOK8HkT_poUTLAmpwSbjzK0ncOkSuw","18677074230"));
-    }
-
 }