From aa784ab65cc24caf45a4c38af7e5fdeb526eb393 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 14 五月 2019 14:49:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/ConfigAdminController.java | 47 +++++++++++++++--------------------------------
1 files changed, 15 insertions(+), 32 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/ConfigAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/ConfigAdminController.java
index e5ddfa0..c204090 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/ConfigAdminController.java
+++ b/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;
@@ -27,13 +26,10 @@
@Resource
private ConfigService configService;
-
+
@Resource
- private AppVersionService appVersionService;
-
- @Resource
- private EhCacheCacheManager ehCacheCacheManager;
-
+ private AppVersionService appVersionService;
+
/**
* 鏌ヨ鍒楄〃 - 鏂板悗鍙�
*
@@ -120,23 +116,22 @@
e.printStackTrace();
}
}
-
+
/**
* 鏌ヨ鍒楄〃 - 鏂板悗鍙�
- *
* @param callback
- * @param key
- * 鏌ヨ璇� 鍚嶇О
+ * @param key 鏌ヨ璇� 鍚嶇О
* @param pageIndex
* @param out
*/
@RequestMapping(value = "getVersionList")
- public void getVersionList(String callback, String key, Integer pageIndex, PrintWriter out) {
-
+ public void getVersionList(String callback, String key, Integer pageIndex, PrintWriter out){
+
try {
AppVersionInfo appVersionInfo = new AppVersionInfo();
appVersionInfo.setVersion("鍏ㄦ帹");
-
+
+
// IOS鐗堟湰
List<AppVersionInfo> list1 = appVersionService.getAppVersionInfoListByPlatform(AppVersionInfo.PLATFORM_IOS);
if (list1 == null) {
@@ -145,39 +140,27 @@
List<AppVersionInfo> listIOS = new ArrayList<AppVersionInfo>();
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>();
}
List<AppVersionInfo> listAndroid = new ArrayList<AppVersionInfo>();
listAndroid.add(appVersionInfo);
listAndroid.addAll(list2);
-
+
JSONObject data = new JSONObject();
data.put("android", listAndroid);
data.put("ios", listIOS);
-
+
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
-
+
} catch (Exception e) {
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(""));
}
}
--
Gitblit v1.8.0