From 09ab9394bd3614f373082754300c6ef39d60c1e9 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Wed, 05 Jun 2024 15:28:30 +0800
Subject: [PATCH] 1
---
src/main/java/com/nq/controller/protol/UserController.java | 30 ++++++++++++++++++++++++++----
1 files changed, 26 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/nq/controller/protol/UserController.java b/src/main/java/com/nq/controller/protol/UserController.java
index b2ac108..bad151f 100644
--- a/src/main/java/com/nq/controller/protol/UserController.java
+++ b/src/main/java/com/nq/controller/protol/UserController.java
@@ -1,15 +1,23 @@
package com.nq.controller.protol;
+import ch.qos.logback.core.util.FileUtil;
import com.google.common.collect.Maps;
import com.nq.common.ServerResponse;
import com.nq.enums.EStockType;
+import com.nq.pojo.ApplyLever;
import com.nq.pojo.StockSubscribe;
import com.nq.pojo.UserStockSubscribe;
import com.nq.service.*;
import com.nq.utils.PropertiesUtil;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
import java.math.BigDecimal;
+import java.util.Arrays;
+import java.util.Base64;
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
@@ -24,6 +32,8 @@
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.multipart.MultipartFile;
+
+import static com.nq.service.impl.SiteNewsServiceImpl.convertBase64ToImage;
@Controller
@RequestMapping({"/user/"})
@@ -56,6 +66,9 @@
@Autowired
IUserRechargeService iUserRechargeService;
+
+ @Autowired
+ IApplyLeverServices iApplyLeverServices;
//添加到自选股
@RequestMapping({"addOption.do"})
@@ -237,10 +250,10 @@
//图片上传
@RequestMapping({"upload.do"})
@ResponseBody
- public ServerResponse upload(HttpSession session, @RequestParam(value = "upload_file", required = false) MultipartFile file, HttpServletRequest request) {
- String path = request.getSession().getServletContext().getRealPath("upload");
+ public ServerResponse upload(HttpSession session, @RequestParam(value = "upload_file", required = false) MultipartFile file, HttpServletRequest request) throws IOException {
+ String path = PropertiesUtil.getProperty("ftp.address")+file.getOriginalFilename();
- ServerResponse serverResponse = this.iFileUploadService.upload(file, path);
+ ServerResponse serverResponse = iFileUploadService.upload(file, path);
if (serverResponse.isSuccess()) {
String targetFileName = serverResponse.getData().toString();
String url = PropertiesUtil.getProperty("ftp.server.http.prefix") + targetFileName;
@@ -252,7 +265,11 @@
return ServerResponse.createBySuccess(fileMap);
}
- return serverResponse;
+// convertBase64ToImage(file.getBytes().toString(),path);
+ Map fileMap = Maps.newHashMap();
+ fileMap.put("uri", file.getOriginalFilename());
+ fileMap.put("url", PropertiesUtil.getProperty("ftp.server.http.prefix")+file.getOriginalFilename());
+ return ServerResponse.createBySuccess(fileMap);
}
@@ -349,5 +366,10 @@
return ServerResponse.createBySuccess(rateServices.currencyRate(EStockType.getEStockTypeByCode(stockCode), EStockType.getEStockTypeByCode(toType)));
}
+ @RequestMapping({"applyLever.do"})
+ @ResponseBody
+ public ServerResponse applyLever(ApplyLever applyLever, HttpServletRequest request) {
+ return iApplyLeverServices.applyLever(applyLever,request);
+ }
}
--
Gitblit v1.9.3