Merge branch 'master' into dev

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

@@ -14,6 +14,7 @@ import cn.jpush.api.push.model.audience.Audience;
 import cn.jpush.api.push.model.notification.AndroidNotification;
 import cn.jpush.api.push.model.notification.IosNotification;
 import cn.jpush.api.push.model.notification.Notification;
+import com.alibaba.fastjson.JSONObject;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
@@ -196,10 +197,10 @@ public class JPushBiz extends BaseBiz<MessagePushMapper, MessagePush> {
         String urlJson=messagePush.getUrlJson();
         String url="";
         String title="";
-        if (StringUtils.isNotBlank(messagePush.getIntent())){
-            JsonObject  jsonObject= getJsonObject(urlJson);
-            url=jsonObject.get("url").toString();
-            title=jsonObject.get("title").toString();
+        if (StringUtils.isNotBlank(messagePush.getUrlJson())){
+            JSONObject jsonObject=JSONObject.parseObject(urlJson);
+             url=jsonObject.getString("url");
+             title=jsonObject.getString("title");
 
         }
         extras.put("url",url);