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 | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 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 a1e168b..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,6 +10,7 @@
import javax.annotation.Resource;
+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;
@@ -28,9 +29,10 @@
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;
@@ -68,7 +70,7 @@
// 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();
@@ -91,7 +93,7 @@
* @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();
@@ -107,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();
@@ -149,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 {
@@ -183,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());
@@ -222,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("涓婁紶鏂囦欢涓嶈兘涓虹┖"));
@@ -263,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("涓婁紶鏂囦欢涓虹┖"));
@@ -301,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("涓婁紶鏂囦欢涓虹┖"));
--
Gitblit v1.8.0