From be67478cae6bf9308f15949a21e7d0a57a3f0ecb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 16 七月 2020 15:37:31 +0800
Subject: [PATCH] dubbo集成修改
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/UploadController.java | 42 +++++++++++++++++++++---------------------
1 files changed, 21 insertions(+), 21 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 cf1f896..b04cf9c 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
@@ -10,8 +10,7 @@
import javax.annotation.Resource;
-import net.sf.json.JSONObject;
-
+import com.yeshi.fanli.entity.accept.AdminAcceptData;
import org.springframework.core.task.TaskExecutor;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -24,23 +23,24 @@
import com.yeshi.fanli.entity.taobao.TaoBaoOrder;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.AdminUserService;
-import com.yeshi.fanli.service.inter.hongbao.HongBaoService;
import com.yeshi.fanli.service.inter.order.OrderProcessService;
import com.yeshi.fanli.service.inter.order.OrderService;
-import com.yeshi.fanli.service.inter.taobao.TaoBaoOrderService;
+import com.yeshi.fanli.service.inter.order.tb.TaoBaoOrderService;
import com.yeshi.fanli.util.CMQManager;
import com.yeshi.fanli.util.Constant;
+import com.yeshi.fanli.util.FilePathEnum;
+import com.yeshi.fanli.util.RedisKeyEnum;
import com.yeshi.fanli.util.RedisManager;
import com.yeshi.fanli.util.StringUtil;
-import com.yeshi.fanli.util.TimeUtil;
+import org.yeshi.utils.TimeUtil;
import com.yeshi.fanli.util.taobao.TaoBaoOrderUtil;
+
+import net.sf.json.JSONObject;
@Controller
@RequestMapping("admin/new/api/v1/upload")
public class UploadController {
- @Resource
- private HongBaoService hongBaoService;
@Resource
private OrderService orderService;
@@ -70,13 +70,13 @@
// private static final String ORDERFAILURE = "璁㈠崟澶辨晥";
@RequestMapping(value = "uploadImg", method = RequestMethod.POST)
- public void uploadImg(@RequestParam("file") CommonsMultipartFile file, PrintWriter out) {
+ public void uploadImg(AdminAcceptData acceptData, @RequestParam("file") CommonsMultipartFile file, PrintWriter out) {
try {
InputStream inputStream = file.getInputStream();
String contentType = file.getContentType();
String type = contentType.substring(contentType.indexOf("/") + 1);
String uploadFilePath = COSManager.getInstance()
- .uploadFile(inputStream, UUID.randomUUID().toString().replace("-", "") + "." + type).getUrl();
+ .uploadFile(inputStream, FilePathEnum.section.getPath() + UUID.randomUUID().toString().replace("-", "") + "." + type).getUrl();
out.print(JsonUtil.loadTrueResult(uploadFilePath));
} catch (IOException e) {
e.printStackTrace();
@@ -93,13 +93,13 @@
* @param out
*/
@RequestMapping(value = "uploadInstallApk")
- public void uploadInstallApk(@RequestParam("file") CommonsMultipartFile file, PrintWriter out) {
+ public void uploadInstallApk(AdminAcceptData acceptData,@RequestParam("file") CommonsMultipartFile file, PrintWriter out) {
try {
InputStream inputStream = file.getInputStream();
String contentType = file.getContentType();
String type = contentType.substring(contentType.indexOf("/") + 1);
String uploadFilePath = COSManager.getInstance()
- .uploadFile(inputStream, UUID.randomUUID().toString().replace("-", "") + "." + type + ".apk")
+ .uploadFile(inputStream, FilePathEnum.apk.getPath() + UUID.randomUUID().toString().replace("-", "") + "." + type + ".apk")
.getUrl();
out.print(JsonUtil.loadTrueResult(uploadFilePath));
} catch (Exception e) {
@@ -109,7 +109,7 @@
}
@RequestMapping(value = "uploadfImg")
- public void uploadfImg(@RequestParam("file") CommonsMultipartFile file, PrintWriter out) {
+ public void uploadfImg(AdminAcceptData acceptData,@RequestParam("file") CommonsMultipartFile file, PrintWriter out) {
try {
InputStream inputStream = file.getInputStream();
long timeMillis = System.currentTimeMillis();
@@ -117,7 +117,7 @@
String contentType = file.getContentType();
String type = contentType.substring(contentType.indexOf("/") + 1);
String uploadFilePath = COSManager.getInstance()
- .uploadFile(inputStream, "section/" + date + "/" + timeMillis + "." + type).getUrl();
+ .uploadFile(inputStream, FilePathEnum.section.getPath() + timeMillis + "." + type).getUrl();
JSONObject data = new JSONObject();
data.put("original", file.getOriginalFilename());
data.put("name", file.getOriginalFilename());
@@ -151,7 +151,7 @@
while (its.hasNext()) {
String key = its.next();
List<TaoBaoOrder> orders = map.get(key);
- String redisKey = "addorderqueue-" + key;
+ String redisKey = RedisKeyEnum.getRedisKey(RedisKeyEnum.addOrderQueue, key);
// redis鍋氶鐜囬檺鍒�
if (Constant.IS_OUTNET) {
try {
@@ -164,7 +164,7 @@
}
}
- CMQManager.getInstance().addTaoBaoOrderMsg(key, orders);
+ CMQManager.getInstance().addTaoBaoOrderMsg(key);
try {
// 6灏忔椂鍐呬笉鍐嶅鐞�
if (Constant.IS_OUTNET) {
@@ -185,7 +185,7 @@
}
@RequestMapping(value = "uploadOrder", method = RequestMethod.POST)
- public void uploadOrder(@RequestParam("file") CommonsMultipartFile file, PrintWriter out) {
+ public void uploadOrder(AdminAcceptData acceptData,@RequestParam("file") CommonsMultipartFile file, PrintWriter out) {
if (file != null) {
try {
List<TaoBaoOrder> orderList = TaoBaoOrderUtil.parseOrder(file.getInputStream());
@@ -224,7 +224,7 @@
* @param out
*/
@RequestMapping(value = "uploadOrderFile")
- public void uploadOrderFile(@RequestParam("file") CommonsMultipartFile file, PrintWriter out) {
+ public void uploadOrderFile(AdminAcceptData acceptData,@RequestParam("file") CommonsMultipartFile file, PrintWriter out) {
if (file == null) {
out.print(JsonUtil.loadFalseResult("涓婁紶鏂囦欢涓嶈兘涓虹┖"));
@@ -265,7 +265,7 @@
* @param out
*/
@RequestMapping(value = "uploadPicture")
- public void uploadPicture(@RequestParam("file") CommonsMultipartFile file, PrintWriter out) {
+ public void uploadPicture(AdminAcceptData acceptData,@RequestParam("file") CommonsMultipartFile file, PrintWriter out) {
if (file == null) {
out.print(JsonUtil.loadFalseResult("涓婁紶鏂囦欢涓虹┖"));
@@ -277,7 +277,7 @@
String contentType = file.getContentType();
String type = contentType.substring(contentType.indexOf("/") + 1);
// 涓婁紶鏂囦欢鐩稿浣嶇疆
- String fileUrl="/img/admin/" + UUID.randomUUID().toString().replace("-", "") + "." + type;
+ String fileUrl=FilePathEnum.section.getPath() + UUID.randomUUID().toString().replace("-", "") + "." + type;
String uploadPath = COSManager.getInstance().uploadFile(inputStream, fileUrl).getUrl();
@@ -303,7 +303,7 @@
* @param out
*/
@RequestMapping(value = "installPackage")
- public void installPackage(@RequestParam("file") CommonsMultipartFile file, PrintWriter out) {
+ public void installPackage(AdminAcceptData acceptData,@RequestParam("file") CommonsMultipartFile file, PrintWriter out) {
if (file == null) {
out.print(JsonUtil.loadFalseResult("涓婁紶鏂囦欢涓虹┖"));
@@ -316,7 +316,7 @@
String type = contentType.substring(contentType.indexOf("/") + 1);
// 涓婁紶鏂囦欢鐩稿浣嶇疆
- String fileUrl="/apk/admin/" + UUID.randomUUID().toString().replace("-", "") + "." + type + ".apk";
+ String fileUrl= FilePathEnum.apk.getPath() + UUID.randomUUID().toString().replace("-", "") + "." + type + ".apk";
String uploadFilePath = COSManager.getInstance().uploadFile(inputStream, fileUrl).getUrl();
--
Gitblit v1.8.0