From bd8213ddfe04f41b7ad0f4c6377afbe39a44b4af Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 18 一月 2019 15:54:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/PushGoodsController.java | 22 ++++------------------
1 files changed, 4 insertions(+), 18 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/PushGoodsController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/PushGoodsController.java
index b53771a..8aa8c69 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/PushGoodsController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/PushGoodsController.java
@@ -5,7 +5,8 @@
import java.util.List;
import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
+
+import net.sf.json.JSONObject;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -14,7 +15,6 @@
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.reflect.TypeToken;
-import com.yeshi.fanli.entity.common.AdminUser;
import com.yeshi.fanli.entity.goods.CommonGoods;
import com.yeshi.fanli.entity.push.PushGoods;
import com.yeshi.fanli.entity.push.PushGoodsGroup;
@@ -27,10 +27,7 @@
import com.yeshi.fanli.tag.PageEntity;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
-import com.yeshi.fanli.util.annotation.RequestNoLogin;
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
-
-import net.sf.json.JSONObject;
@Controller
@RequestMapping("admin/new/api/v1/pushgoods")
@@ -52,20 +49,9 @@
* @param special
* @param out
*/
- @RequestNoLogin()
@RequestMapping(value = "save")
- public void save(String callback, PushGoods pushGoods, Long editorUid, String idArray, HttpServletResponse response,
- PrintWriter out) {
-
- response.setHeader("Access-Control-Allow-Origin", "*");
- response.setHeader("Access-Control-Allow-Methods", "*");
-
- AdminUser admin = adminUserService.selectByPrimaryKey(editorUid);
- if (admin == null) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔鐢ㄦ埛楠岃瘉澶辫触"));
- return;
- }
-
+ public void save(String callback, PushGoods pushGoods, String idArray, PrintWriter out) {
+
try {
String alertTitle = pushGoods.getAlertTitle();
--
Gitblit v1.8.0