Merge remote-tracking branch 'origin/master'

admin

2019-07-30 573c491b4a1ba60e12a5678a01c1546c0077c1ee

 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/HelpController.java

@@ -1,6 +1,9 @@
package com.yeshi.fanli.controller.client.v1;



import java.io.PrintWriter;

import java.io.UnsupportedEncodingException;

import java.util.HashMap;

import java.util.Map;



import javax.annotation.Resource;



@@ -15,6 +18,7 @@
import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.VersionUtil;



import org.yeshi.utils.HttpUtil;

import org.yeshi.utils.JsonUtil;



@Controller

@@ -41,10 +45,17 @@
      AppPageNotification ap = appPageNotificationService.getAppPageNotificationByTypeCache(type);

      if ("home".equalsIgnoreCase(type)

            && VersionUtil.smallerThan_1_5_1(acceptData.getPlatform(), acceptData.getVersion()) && ap != null) {

         ap.setCanClose(false);

         ap.setContent("尊敬的用户，为更加准确高效的为你返利、省钱，请升级到返利券最新版本");

         AppPageNotification no = new AppPageNotification();

         no.setContentUrl("");

         no.setMd5("111111111111111111");

         no.setPageName(ap.getPageName());

         no.setShow(true);

         no.setType(ap.getType());

         no.setUpdateTime(ap.getUpdateTime());

         no.setCanClose(false);

         no.setContent("尊敬的用户，为更加准确高效的为你返利、省钱，请升级到返利券最新版本");

         Gson gson = new GsonBuilder().excludeFieldsWithoutExposeAnnotation().create();

         out.print(JsonUtil.loadTrueResult(gson.toJson(ap)));

         out.print(JsonUtil.loadTrueResult(gson.toJson(no)));

         return;

      }



@@ -57,4 +68,40 @@
      }

   }



   @RequestMapping(value = "updateApp")

   public void updateApp(AcceptData acceptData, PrintWriter out) {

      Map<String, String> params = new HashMap<>();

      if ("android".equalsIgnoreCase(acceptData.getPlatform())) {// android更新

//         acceptData.setVersion("10");

         params.put("method", "update");

         params.put("Platform", "Android");

         params.put("Version", acceptData.getVersion());

         params.put("device  ", acceptData.getDevice());

         params.put("time", System.currentTimeMillis() + "");

         params.put("Package", acceptData.getPackages());

         params.put("device", acceptData.getDevice());

         params.put("platform", "Android");

         params.put("key", "a3f390d88e4c41f2747bfa2f1b5f87db");

         params.put("versionCode", acceptData.getVersion() + "");

      } else {// IOS更新

         params.put("method", "update");

         params.put("Platform", "IOS");

         params.put("Version", acceptData.getVersion());

         params.put("device  ", acceptData.getDevice());

         params.put("time", System.currentTimeMillis() + "");

         params.put("Package", acceptData.getPackages());

         params.put("device", acceptData.getDevice());

         params.put("platform", "IOS");

         params.put("key", "32bb90e8976aab5298d5da10fe66f21d");

         params.put("versionCode", acceptData.getVersion() + "");

      }

      String url = "http://update.yeshitv.com:8090/update/update";

      String result = HttpUtil.post(url, params, null);

      try {

         out.print(new String(result.getBytes("ISO-8859-1"), "UTF-8"));

      } catch (UnsupportedEncodingException e) {

         out.print(result);

      }

   }



}