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/UploadController.java | 52 ++++++----------------------------------------------
1 files changed, 6 insertions(+), 46 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/UploadController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/UploadController.java
index 6079622..cf1f896 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/UploadController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/UploadController.java
@@ -9,8 +9,8 @@
import java.util.UUID;
import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+
+import net.sf.json.JSONObject;
import org.springframework.core.task.TaskExecutor;
import org.springframework.stereotype.Controller;
@@ -21,7 +21,6 @@
import org.yeshi.utils.JsonUtil;
import org.yeshi.utils.tencentcloud.COSManager;
-import com.yeshi.fanli.entity.common.AdminUser;
import com.yeshi.fanli.entity.taobao.TaoBaoOrder;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.AdminUserService;
@@ -34,11 +33,7 @@
import com.yeshi.fanli.util.RedisManager;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.TimeUtil;
-import com.yeshi.fanli.util.annotation.RequestNoLogin;
import com.yeshi.fanli.util.taobao.TaoBaoOrderUtil;
-
-import freemarker.core.ArithmeticEngine.ConservativeEngine;
-import net.sf.json.JSONObject;
@Controller
@RequestMapping("admin/new/api/v1/upload")
@@ -228,19 +223,8 @@
* @param response
* @param out
*/
- @RequestNoLogin()
@RequestMapping(value = "uploadOrderFile")
- public void uploadOrderFile(@RequestParam("file") CommonsMultipartFile file, Long uid, HttpServletRequest request,
- HttpServletResponse response, PrintWriter out) {
-
- response.setHeader("Access-Control-Allow-Origin", "*");
- response.setHeader("Access-Control-Allow-Methods", "*");
-
- AdminUser admin = adminUserService.selectByPrimaryKey(uid);
- if (admin == null) {
- out.print(JsonUtil.loadFalseResult("鐢ㄦ埛楠岃瘉鏈�氳繃"));
- return;
- }
+ public void uploadOrderFile(@RequestParam("file") CommonsMultipartFile file, PrintWriter out) {
if (file == null) {
out.print(JsonUtil.loadFalseResult("涓婁紶鏂囦欢涓嶈兘涓虹┖"));
@@ -280,19 +264,8 @@
* @param file
* @param out
*/
- @RequestNoLogin()
@RequestMapping(value = "uploadPicture")
- public void uploadPicture(@RequestParam("file") CommonsMultipartFile file, Long uid, HttpServletResponse response,
- PrintWriter out) {
-
- response.setHeader("Access-Control-Allow-Origin", "*");
- response.setHeader("Access-Control-Allow-Methods", "*");
-
- AdminUser admin = adminUserService.selectByPrimaryKey(uid);
- if (admin == null) {
- out.print(JsonUtil.loadFalseResult("褰撳墠璐︽埛楠岃瘉澶辫触"));
- return;
- }
+ public void uploadPicture(@RequestParam("file") CommonsMultipartFile file, PrintWriter out) {
if (file == null) {
out.print(JsonUtil.loadFalseResult("涓婁紶鏂囦欢涓虹┖"));
@@ -316,9 +289,6 @@
data.put("type", "." + type);
data.put("state", "SUCCESS");
out.print(JsonUtil.loadTrueResult(data));
-
- out.print(JsonUtil.loadTrueResult(uploadPath));
-
} catch (IOException e) {
out.print(JsonUtil.loadFalseResult("涓婁紶鍥剧墖澶辫触"));
e.printStackTrace();
@@ -333,17 +303,7 @@
* @param out
*/
@RequestMapping(value = "installPackage")
- public void installPackage(@RequestParam("file") CommonsMultipartFile file, Long uid,
- HttpServletResponse response, PrintWriter out) {
-
- response.setHeader("Access-Control-Allow-Origin", "*");
- response.setHeader("Access-Control-Allow-Methods", "*");
-
- AdminUser admin = adminUserService.selectByPrimaryKey(uid);
- if (admin == null) {
- out.print(JsonUtil.loadFalseResult("褰撳墠璐︽埛楠岃瘉澶辫触"));
- return;
- }
+ public void installPackage(@RequestParam("file") CommonsMultipartFile file, PrintWriter out) {
if (file == null) {
out.print(JsonUtil.loadFalseResult("涓婁紶鏂囦欢涓虹┖"));
@@ -356,7 +316,7 @@
String type = contentType.substring(contentType.indexOf("/") + 1);
// 涓婁紶鏂囦欢鐩稿浣嶇疆
- String fileUrl="/apk/admin" + UUID.randomUUID().toString().replace("-", "") + "." + type + ".apk";
+ String fileUrl="/apk/admin/" + UUID.randomUUID().toString().replace("-", "") + "." + type + ".apk";
String uploadFilePath = COSManager.getInstance().uploadFile(inputStream, fileUrl).getUrl();
--
Gitblit v1.8.0