Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

business/push-service/src/main/java/com/yihu/jw/push/service/GetuiService.java

@@ -155,6 +155,7 @@ public class GetuiService {
                    "component="+json.getString("platform")+"/io.dcloud.PandoraEntry;S.UP-OL-SU=true;" +
                    "S.title="+json.getString("title")+";" +
                    "S.content="+json.getString("body")+";" +
                    "S.payload="+json.getString("payload")+";" +
                    "S.url="+json.getString("url")+";end";
            notification1.setIntent(intent);

business/push-service/src/main/java/com/yihu/jw/push/util/GetuiUtil.java

@@ -108,7 +108,7 @@ public class GetuiUtil {
//            System.out.println("个推推送失败：code:" + apiResult.getCode() + ", msg: " + apiResult.getMsg());
//        }
//        String cid = "d2fee750dcdf7a2567444b1d4f629305";
        String cid = "a7fff64dd3dfd12ee43a1b94f3266cfa";
        String cid = "d0e395d2e04b1da6f45a4f700883297d";
        String title = "ios11:49标题";
        String body = "安卓离线展示的内容";
        String url = "https://www.baidu.com/";
@@ -165,6 +165,7 @@ public class GetuiUtil {
                    "component="+json.getString("platform")+"/io.dcloud.PandoraEntry;S.UP-OL-SU=true;" +
                    "S.title="+json.getString("title")+";" +
                    "S.content="+json.getString("body")+";" +
                    "S.payload="+json.getString("payload")+";" +
                    "S.url="+json.getString("url")+";end";
            notification1.setIntent(intent);