Merge branch 'master-customer-management' into dev

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/biz/JPushBiz.java

@@ -171,7 +171,8 @@ public class JPushBiz extends BaseBiz<MessagePushMapper, MessagePush> {
                 log.info("无有效数据--type=="+messagePush.getType()+"------userId=="+userIds);
                 return  null;
             }
-            audience=Audience.alias(userIds);
+            String [] userIdList=userIds.split(",");
+            audience=Audience.alias(userIdList);
         }
         JsonObject intent = new JsonObject();
         if (StringUtils.isNotBlank(messagePush.getIntent())){

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/controller/JPushController.java

@@ -36,7 +36,7 @@ public class JPushController {
 
     @RequestMapping(value = "/stype", method = RequestMethod.GET)
     public ObjectRestResponse stype(@RequestParam(value = "id",defaultValue = "0") Integer id,
-                                   @RequestParam(value = "userIds",defaultValue = "") String userIds,
+                                   @RequestParam(value = "userIds",defaultValue = "303") String userIds,
                                     @RequestParam(value = "orderNo",defaultValue = "") String orderNo) throws Exception {
         return jPushBiz.jpushToAlias(id,userIds,orderNo);
     }