推送

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/JumpUrlDto.java

@@ -25,6 +25,17 @@ public class JumpUrlDto {
     @ApiModelProperty("其它参数")
     private String params ="";
 
+    @ApiModelProperty("客户端")
+    private String clientType ="";
+
+    public String getClientType() {
+        return clientType;
+    }
+
+    public void setClientType(String clientType) {
+        this.clientType = clientType;
+    }
+
     public String getAction() {
         return action;
     }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/SysMessageServiceImpl.java

@@ -221,7 +221,7 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 			return;
 		}
 		if (StringUtils.isEmpty(url)) {
-			url = selectConfigUrl(type.getCode());
+			url = selectConfigUrlJumpType(type.getCode(),jpushType);
 		}
 
 		String[] tos;
@@ -507,6 +507,10 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 
 	@Override
 	public String selectConfigUrl(String messageType,Object ...param) {
+        return selectConfigUrlJumpType(messageType,null,param);
+    }
+
+    private String selectConfigUrlJumpType(String messageType,String jumpType,Object ...param) {
 		SysMessageConfig sysMessageConfig = sysMessageConfigService.queryByType(messageType);
 		if (sysMessageConfig == null) {
 			throw new BizException("消息类型错误");
@@ -526,6 +530,9 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 		jumpUrlDto.setUrl(sysMessageConfig.getActionUrl());
 		jumpUrlDto.setPageTag(sysMessageConfig.getPageTag());
 		jumpUrlDto.setParams(sysMessageConfig.getParams());
+        if (StringUtils.isNotBlank(jumpType) && ClientEnum.TENANT_STUDENT.getCode().equals(jumpType)) {
+            jumpUrlDto.setClientType("TENANT");
+        }
 		return JSON.toJSONString(jumpUrlDto);
 	}
 }

toolset/thirdparty-component/src/main/java/com/yonge/toolset/thirdparty/message/provider/JiguangPushPlugin.java

@@ -91,9 +91,6 @@ public class JiguangPushPlugin implements MessageSenderPlugin, InitializingBean
 		android_extras.put("url", url);
 		android_extras.put("third_url_encode",true);
 		android_extras.put("memo", url);
-        if (StringUtils.isNotEmpty(type) && type.equals("TENANT_STUDENT")) {
-            android_extras.put("clientType", "TENANT");
-        }
 		android.put("extras", android_extras);
 
 		JSONObject android_intent = new JSONObject();// android额外参数