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/TestController.java | 45 +++++++++++++++++++++++++++++++++++++++++----
1 files changed, 41 insertions(+), 4 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/TestController.java b/fanli/src/main/java/com/yeshi/fanli/controller/TestController.java
index 11ccfda..6f44ca0 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/TestController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/TestController.java
@@ -223,6 +223,13 @@
ehCacheCacheManager.getCacheManager().clearAll();
}
+
+ @RequestMapping(value = "removeRedisCache")
+ public void removeRedisCache(String key, PrintWriter out) {
+ redisManager.removeCommonString(key);
+ }
+
+
@RequestMapping(value = "testConfig")
public void getTestConfig(PrintWriter pw) {
pw.print(configService.get("test"));
@@ -243,10 +250,6 @@
}
}
- @RequestMapping(value = "insetDynamicInfoInvite")
- public void insetDynamicInfo(String content, String url,PrintWriter out) {
- dynamicInfoService.insertInviteMaterial(content, url, null, null);
- }
@RequestMapping(value = "insertShop")
@@ -370,4 +373,38 @@
e.printStackTrace();
}
}
+
+
+
+ /**
+ * 鎻掑叆閭�璇风礌鏉�
+ * @param out
+ */
+ @RequestMapping(value = "saveInvite")
+ public void saveInvite(InviteMaterial inviteMaterial, PrintWriter out) {
+ try {
+ inviteMaterial.setState(0);
+ inviteMaterialService.insert(inviteMaterial);
+ JsonUtil.printMode(out, null, JsonUtil.loadTrueResult("涓婁紶鎴愬姛"));
+ } catch (Exception e) {
+ JsonUtil.printMode(out, null, JsonUtil.loadFalseResult("涓婁紶澶辫触"));
+ e.printStackTrace();
+ }
+ }
+
+
+ /**
+ * 鎻掑叆閭�璇风礌鏉�
+ * @param out
+ */
+ @RequestMapping(value = "insertTimeInvite")
+ public void insertTimeInvite(PrintWriter out) {
+ try {
+ dynamicInfoService.insertTimeInvite();
+ JsonUtil.printMode(out, null, JsonUtil.loadTrueResult("鎿嶄綔鎴愬姛"));
+ } catch (Exception e) {
+ JsonUtil.printMode(out, null, JsonUtil.loadFalseResult("鎿嶄綔澶辫触"));
+ e.printStackTrace();
+ }
+ }
}
--
Gitblit v1.8.0