From 573c491b4a1ba60e12a5678a01c1546c0077c1ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 七月 2019 09:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/ConfigAdminController.java | 62 +++++++++++++++++++++++++++++++
1 files changed, 62 insertions(+), 0 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 f889fde..709e298 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
@@ -1,15 +1,19 @@
package com.yeshi.fanli.controller.admin;
import java.io.PrintWriter;
+import java.util.ArrayList;
import java.util.List;
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;
+import com.yeshi.fanli.entity.AppVersionInfo;
import com.yeshi.fanli.entity.common.Config;
+import com.yeshi.fanli.service.inter.config.AppVersionService;
import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.tag.PageEntity;
import com.yeshi.fanli.util.Constant;
@@ -23,6 +27,12 @@
@Resource
private ConfigService configService;
+
+ @Resource
+ private AppVersionService appVersionService;
+
+ @Resource
+ private EhCacheCacheManager ehCacheCacheManager;
/**
* 鏌ヨ鍒楄〃 - 鏂板悗鍙�
@@ -109,7 +119,59 @@
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("淇敼澶辫触"));
e.printStackTrace();
}
+ }
+ /**
+ * 鏌ヨ鍒楄〃 - 鏂板悗鍙�
+ *
+ * @param callback
+ * @param key
+ * 鏌ヨ璇� 鍚嶇О
+ * @param pageIndex
+ * @param out
+ */
+ @RequestMapping(value = "getVersionList")
+ 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) {
+ list1 = new ArrayList<AppVersionInfo>();
+ }
+ List<AppVersionInfo> listIOS = new ArrayList<AppVersionInfo>();
+ listIOS.add(appVersionInfo);
+ listIOS.addAll(list1);
+
+ // 瀹夊崜鐗堟湰
+ 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();
+ }
+ }
+
+ @RequestMapping(value = "clearCaches")
+ public void clearCaches(String callback, PrintWriter out) {
+ ehCacheCacheManager.getCacheManager().clearAll();
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(""));
}
}
--
Gitblit v1.8.0