Merge remote-tracking branch 'origin/master'

admin

2019-05-14 aa784ab65cc24caf45a4c38af7e5fdeb526eb393

 fanli/src/main/java/com/yeshi/fanli/controller/admin/ConfigAdminController.java

@@ -6,7 +6,6 @@


import javax.annotation.Resource;



import org.springframework.cache.ehcache.EhCacheCacheManager;

import org.springframework.stereotype.Controller;

import org.springframework.web.bind.annotation.RequestMapping;

import org.yeshi.utils.JsonUtil;

@@ -30,9 +29,6 @@


   @Resource

   private AppVersionService appVersionService;



   @Resource

   private EhCacheCacheManager ehCacheCacheManager;



   /**

    * 查询列表 - 新后台

@@ -123,10 +119,8 @@


   /**

    * 查询列表 - 新后台

    * 
    * @param callback

    * @param key

    *            查询词 名称

    * @param key 查询词  名称

    * @param pageIndex

    * @param out

    */

@@ -137,6 +131,7 @@
         AppVersionInfo appVersionInfo = new AppVersionInfo();

         appVersionInfo.setVersion("全推");



			
         // IOS版本

         List<AppVersionInfo> list1 = appVersionService.getAppVersionInfoListByPlatform(AppVersionInfo.PLATFORM_IOS);

         if (list1 == null) {

@@ -146,9 +141,9 @@
         listIOS.add(appVersionInfo);

         listIOS.addAll(list1);



			
         // 安卓版本

         List<AppVersionInfo> list2 = appVersionService

               .getAppVersionInfoListByPlatform(AppVersionInfo.PLATFORM_ANDROID);

         List<AppVersionInfo> list2 = appVersionService.getAppVersionInfoListByPlatform(AppVersionInfo.PLATFORM_ANDROID);

         if (list2 == null) {

            list2 = new ArrayList<AppVersionInfo>();

         }

@@ -166,18 +161,6 @@
         JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("版本查询失败"));

         e.printStackTrace();

      }

   }



   /***

    * 清除缓存

    * 
    * @param callback

    * @param out

    */

   @RequestMapping(value = "clearCaches")

   public void clearCaches(String callback, PrintWriter out) {

      ehCacheCacheManager.getCacheManager().clearAll();

      JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(""));

   }



}