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/GoodsClassAdminCotroller.java | 27 ++++++---------------------
1 files changed, 6 insertions(+), 21 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/GoodsClassAdminCotroller.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/GoodsClassAdminCotroller.java
index 7277912..c0598f7 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/GoodsClassAdminCotroller.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/GoodsClassAdminCotroller.java
@@ -8,7 +8,8 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+
+import net.sf.json.JSONObject;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -17,6 +18,7 @@
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.multipart.commons.CommonsMultipartFile;
+import org.yeshi.utils.JsonUtil;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
@@ -34,10 +36,6 @@
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.Utils;
-import com.yeshi.fanli.util.annotation.RequestNoLogin;
-import org.yeshi.utils.JsonUtil;
-
-import net.sf.json.JSONObject;
@Controller
@RequestMapping("admin/new/api/v1/goodsclass")
@@ -230,12 +228,8 @@
* @param request
* @param out
*/
- @RequestNoLogin()
@RequestMapping(value = "saveAdd", method = RequestMethod.POST)
- public void saveAdd(String callback, GoodsClass goodsClass, HttpServletRequest request, HttpServletResponse response, PrintWriter out) {
-
- response.setHeader("Access-Control-Allow-Origin", "*");
- response.setHeader("Access-Control-Allow-Methods", "*");
+ public void saveAdd(String callback, GoodsClass goodsClass, HttpServletRequest request, PrintWriter out) {
try {
String name = goodsClass.getName();
@@ -414,18 +408,13 @@
* @param out
* @param response
*/
- @RequestNoLogin()
@RequestMapping(value = "uploadPicture")
- public void uploadPicture(Long id, @RequestParam("file") CommonsMultipartFile file, PrintWriter out, HttpServletResponse response) {
-
- response.setHeader("Access-Control-Allow-Origin", "*");
- response.setHeader("Access-Control-Allow-Methods", "*");
+ public void uploadPicture(Long id, @RequestParam("file") CommonsMultipartFile file, PrintWriter out) {
try {
-
GoodsClass goodsClass = goodsClassService.getGoodsClass(id);
- if (goodsClass == null) {
+ if (goodsClass == null ) {
out.print(JsonUtil.loadFalseResult("璇ョ被鍒笉瀛樺湪鎴栧凡琚垹闄�"));
return;
}
@@ -436,15 +425,11 @@
}
goodsClassService.uploadPicture(goodsClass, file);
-
out.print(JsonUtil.loadTrueResult("涓婁紶鎴愬姛"));
-
} catch (Exception e) {
- // TODO Auto-generated catch block
e.printStackTrace();
out.print(JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
}
-
}
/**
--
Gitblit v1.8.0