From 88b54772dbcf5ecab1e2316e4e4626ac901b8908 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 22 一月 2019 15:58:24 +0800
Subject: [PATCH] 邀请码添加返回状态
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/GoodsSubClassAdminController.java | 32 ++++++++------------------------
1 files changed, 8 insertions(+), 24 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/GoodsSubClassAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/GoodsSubClassAdminController.java
index b81dc68..852c69c 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/GoodsSubClassAdminController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/GoodsSubClassAdminController.java
@@ -7,7 +7,6 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
import net.sf.json.JSONObject;
@@ -18,6 +17,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.GsonBuilder;
@@ -27,8 +27,6 @@
import com.yeshi.fanli.service.inter.goods.GoodsSubClassService;
import com.yeshi.fanli.service.inter.lable.LabelClassService;
import com.yeshi.fanli.util.StringUtil;
-import com.yeshi.fanli.util.annotation.RequestNoLogin;
-import org.yeshi.utils.JsonUtil;
@Controller
@RequestMapping("admin/new/api/v1/goodsSubClass")
@@ -47,13 +45,9 @@
* @param request
* @param out
*/
- @RequestNoLogin()
@RequestMapping(value = "saveAdd", method = RequestMethod.POST)
public void saveAdd(String callback, Long pid, Integer type, GoodsSubClass goodsSubClass,
- HttpServletRequest request, HttpServletResponse response, PrintWriter out) {
-
- response.setHeader("Access-Control-Allow-Origin", "*");
- response.setHeader("Access-Control-Allow-Methods", "*");
+ HttpServletRequest request, PrintWriter out) {
try {
String name = goodsSubClass.getName();
@@ -61,7 +55,6 @@
out.print(JsonUtil.loadFalseResult("绫诲埆鍚嶇О涓嶈兘涓虹┖"));
return;
}
-
if (pid == null) {
out.print(JsonUtil.loadFalseResult("涓婄骇id涓虹┖"));
@@ -225,30 +218,23 @@
* @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) {
+ if (file == null) {
+ out.print(JsonUtil.loadFalseResult("鍥剧墖鏂囦欢涓嶈兘涓虹┖"));
+ return;
+ }
+
try {
GoodsSubClass goodsSubClass = goodsSubClassService.selectByPrimaryKey(id);
-
if (goodsSubClass == null) {
out.print(JsonUtil.loadFalseResult("璇ョ被鍒笉瀛樺湪鎴栧凡琚垹闄�"));
return;
}
- if (file == null) {
- out.print(JsonUtil.loadFalseResult("鍥剧墖鏂囦欢涓嶈兘涓虹┖"));
- return;
- }
int result = goodsSubClassService.uploadPicture(goodsSubClass, file);
-
if (result == 1) {
out.print(JsonUtil.loadTrueResult("涓婁紶鎴愬姛"));
} else {
@@ -256,11 +242,9 @@
}
} catch (Exception e) {
- // TODO Auto-generated catch block
e.printStackTrace();
out.print(JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
}
-
}
/**
--
Gitblit v1.8.0