Skip to content

G
gdtel-gztel-school-center
Commit 9a5b435d by 陈浩建
Options

修复高危：路径遍历 

关闭临时开启的代理170
parent 4c818f64
Showing with 42 additions and 148 deletions
apply-net/src/main/java/com/winsun/controller/DankuanController.java
...@@ -73,8 +73,6 @@ public class DankuanController { ...@@ -73,8 +73,6 @@ public class DankuanController {
@Resource @Resource
private RedisLockUtil redisLockUtil; private RedisLockUtil redisLockUtil;
@Autowired
private Base64ToImgUtils base64ToImgUtils;
@Autowired @Autowired
private IntelligenceSendOrder intelligenceSendOrder; private IntelligenceSendOrder intelligenceSendOrder;
...@@ -534,7 +532,7 @@ public class DankuanController { ...@@ -534,7 +532,7 @@ public class DankuanController {
// 新环境正式地址 https://gzctpay.mini189.cn/pay/orderPay/order-pay // 新环境正式地址 https://gzctpay.mini189.cn/pay/orderPay/order-pay
doc = doc =
Jsoup.connect("https://gzctpay.mini189.cn/pay/orderPay/order-pay") Jsoup.connect("https://gzctpay.mini189.cn/pay/orderPay/order-pay")
.proxy("172.18.101.170", 3128) // .proxy("172.18.101.170", 3128)
.data(map) .data(map)
.timeout(20000) .timeout(20000)
.ignoreContentType(true) .ignoreContentType(true)
......
apply-net/src/main/java/com/winsun/controller/RongHeController.java
...@@ -76,8 +76,6 @@ public class RongHeController { ...@@ -76,8 +76,6 @@ public class RongHeController {
@Resource @Resource
private RedisLockUtil redisLockUtil; private RedisLockUtil redisLockUtil;
@Autowired
private Base64ToImgUtils base64ToImgUtils;
/** /**
* 跟据合伙人id查找融合套餐信息 * 跟据合伙人id查找融合套餐信息
* *
...@@ -527,7 +525,7 @@ public class RongHeController { ...@@ -527,7 +525,7 @@ public class RongHeController {
// 新环境正式地址 https://gzctpay.mini189.cn/pay/orderPay/order-pay // 新环境正式地址 https://gzctpay.mini189.cn/pay/orderPay/order-pay
doc = doc =
Jsoup.connect("https://gzctpay.mini189.cn/pay/orderPay/order-pay") Jsoup.connect("https://gzctpay.mini189.cn/pay/orderPay/order-pay")
.proxy("172.18.101.170", 3128) // .proxy("172.18.101.170", 3128)
.data(map) .data(map)
.timeout(20000) .timeout(20000)
.ignoreContentType(true) .ignoreContentType(true)
......
apply-net/src/main/java/com/winsun/controller/SingleBroadToIntegrateController.java
...@@ -3,26 +3,21 @@ package com.winsun.controller; ...@@ -3,26 +3,21 @@ package com.winsun.controller;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper; import com.baomidou.mybatisplus.mapper.Wrapper;
import com.netflix.discovery.converters.Auto;
import com.winsun.auth.core.annotion.Permission;
import com.winsun.auth.core.common.model.ResponseData; import com.winsun.auth.core.common.model.ResponseData;
import com.winsun.bean.*; import com.winsun.bean.*;
import com.winsun.constant.FilePath;
import com.winsun.constant.OrderStatus; import com.winsun.constant.OrderStatus;
import com.winsun.mapper.*; import com.winsun.mapper.*;
import com.winsun.outSideSystem.IntelligenceSendOrder; import com.winsun.outSideSystem.IntelligenceSendOrder;
import com.winsun.smsUtils.SendSmsAndMail; import com.winsun.smsUtils.SendSmsAndMail;
import com.winsun.utils.Base64ToImgUtils; import com.winsun.utils.PicturesUtil;
import com.winsun.utils.RandomUtil; import com.winsun.utils.RandomUtil;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import java.sql.Time;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.*; import java.util.*;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
...@@ -261,13 +256,12 @@ public class SingleBroadToIntegrateController { ...@@ -261,13 +256,12 @@ public class SingleBroadToIntegrateController {
orderView.setExpenses(universityInfo.getExpenses()); // 套餐 orderView.setExpenses(universityInfo.getExpenses()); // 套餐
orderViewMapper.insert(orderView); orderViewMapper.insert(orderView);
Base64ToImgUtils base64ToImgUtils = new Base64ToImgUtils();
// 获取签名图片地址 // 获取签名图片地址
if(StringUtils.isBlank(toIntegrateOrderParam.getImgUrl())){ if(StringUtils.isBlank(toIntegrateOrderParam.getImgUrl())){
return ResponseData.error("签名失败！"); return ResponseData.error("签名失败！");
} }
if(StringUtils.isNotBlank(toIntegrateOrderParam.getImgUrl())){ if(StringUtils.isNotBlank(toIntegrateOrderParam.getImgUrl())){
imgFilePath = base64ToImgUtils.base64ToImg(toIntegrateOrderParam.getImgUrl(), FilePath.PATH.getValue()+FilePath.IMGURLPATH.getValue()); imgFilePath = PicturesUtil.uploadPictures(toIntegrateOrderParam.getImgUrl(), orderView.getOrderSeq(),"signImg");
} }
// 保存到hhr_order // 保存到hhr_order
Order order = new Order(); Order order = new Order();
......
common/src/main/java/com/winsun/outSideSystem/IntelligenceSendOrder.java
...@@ -266,13 +266,13 @@ public class IntelligenceSendOrder { ...@@ -266,13 +266,13 @@ public class IntelligenceSendOrder {
private JSONObject getQueryOrderInfo( private JSONObject getQueryOrderInfo(
String orderNum, String currentTimeStr, int count) throws Exception { String orderNum, String currentTimeStr, int count) throws Exception {
List<NameValuePair> qParams = new ArrayList<NameValuePair>(); List<NameValuePair> qParams = new ArrayList<NameValuePair>();
HttpHost proxy = new HttpHost("172.18.101.170", 3128); // HttpHost proxy = new HttpHost("172.18.101.170", 3128);
RequestConfig defaultRequestConfig = RequestConfig defaultRequestConfig =
RequestConfig.custom() RequestConfig.custom()
.setSocketTimeout(50000) .setSocketTimeout(50000)
.setConnectTimeout(50000) .setConnectTimeout(50000)
.setConnectionRequestTimeout(50000) .setConnectionRequestTimeout(50000)
.setProxy(proxy) // .setProxy(proxy)
.build(); .build();
CloseableHttpClient httpclient = CloseableHttpClient httpclient =
HttpClients.custom().setDefaultRequestConfig(defaultRequestConfig).build(); HttpClients.custom().setDefaultRequestConfig(defaultRequestConfig).build();
...@@ -359,7 +359,7 @@ public class IntelligenceSendOrder { ...@@ -359,7 +359,7 @@ public class IntelligenceSendOrder {
int count) int count)
throws Exception { throws Exception {
List<NameValuePair> qParams = new ArrayList<NameValuePair>(); List<NameValuePair> qParams = new ArrayList<NameValuePair>();
HttpHost proxy = new HttpHost("172.18.101.170", 3128); // HttpHost proxy = new HttpHost("172.18.101.170", 3128);
RequestConfig defaultRequestConfig = RequestConfig defaultRequestConfig =
RequestConfig.custom() RequestConfig.custom()
.setSocketTimeout(50000) .setSocketTimeout(50000)
...@@ -722,13 +722,13 @@ public class IntelligenceSendOrder { ...@@ -722,13 +722,13 @@ public class IntelligenceSendOrder {
private JSONObject getProductId(String currentTimeStr, int count) throws Exception { private JSONObject getProductId(String currentTimeStr, int count) throws Exception {
List<NameValuePair> qParams = new ArrayList<NameValuePair>(); List<NameValuePair> qParams = new ArrayList<NameValuePair>();
Map<String, String> signMap = new HashMap<String, String>(); // 待签名参数 Map<String, String> signMap = new HashMap<String, String>(); // 待签名参数
HttpHost proxy = new HttpHost("172.18.101.170", 3128); // HttpHost proxy = new HttpHost("172.18.101.170", 3128);
RequestConfig defaultRequestConfig = RequestConfig defaultRequestConfig =
RequestConfig.custom() RequestConfig.custom()
.setSocketTimeout(50000) .setSocketTimeout(50000)
.setConnectTimeout(50000) .setConnectTimeout(50000)
.setConnectionRequestTimeout(50000) .setConnectionRequestTimeout(50000)
.setProxy(proxy) // .setProxy(proxy)
.build(); .build();
CloseableHttpClient httpclient = CloseableHttpClient httpclient =
HttpClients.custom().setDefaultRequestConfig(defaultRequestConfig).build(); HttpClients.custom().setDefaultRequestConfig(defaultRequestConfig).build();
...@@ -806,13 +806,13 @@ public class IntelligenceSendOrder { ...@@ -806,13 +806,13 @@ public class IntelligenceSendOrder {
throws Exception { throws Exception {
List<NameValuePair> qParams = new ArrayList<NameValuePair>(); List<NameValuePair> qParams = new ArrayList<NameValuePair>();
Map<String, String> signMap = new HashMap<String, String>(); // 待签名参数 Map<String, String> signMap = new HashMap<String, String>(); // 待签名参数
HttpHost proxy = new HttpHost("172.18.101.170", 3128); // HttpHost proxy = new HttpHost("172.18.101.170", 3128);
RequestConfig defaultRequestConfig = RequestConfig defaultRequestConfig =
RequestConfig.custom() RequestConfig.custom()
.setSocketTimeout(500000) .setSocketTimeout(500000)
.setConnectTimeout(500000) .setConnectTimeout(500000)
.setConnectionRequestTimeout(500000) .setConnectionRequestTimeout(500000)
.setProxy(proxy) // .setProxy(proxy)
.build(); .build();
CloseableHttpClient httpclient = CloseableHttpClient httpclient =
HttpClients.custom().setDefaultRequestConfig(defaultRequestConfig).build(); HttpClients.custom().setDefaultRequestConfig(defaultRequestConfig).build();
...@@ -1050,13 +1050,13 @@ public class IntelligenceSendOrder { ...@@ -1050,13 +1050,13 @@ public class IntelligenceSendOrder {
} }
} }
List<NameValuePair> qParams = new ArrayList<NameValuePair>(); List<NameValuePair> qParams = new ArrayList<NameValuePair>();
HttpHost proxy = new HttpHost("172.18.101.170", 3128); // HttpHost proxy = new HttpHost("172.18.101.170", 3128);
RequestConfig defaultRequestConfig = RequestConfig defaultRequestConfig =
RequestConfig.custom() RequestConfig.custom()
.setSocketTimeout(500000) .setSocketTimeout(500000)
.setConnectTimeout(500000) .setConnectTimeout(500000)
.setConnectionRequestTimeout(500000) .setConnectionRequestTimeout(500000)
.setProxy(proxy) // .setProxy(proxy)
.build(); .build();
CloseableHttpClient httpclient = CloseableHttpClient httpclient =
HttpClients.custom().setDefaultRequestConfig(defaultRequestConfig).build(); HttpClients.custom().setDefaultRequestConfig(defaultRequestConfig).build();
...@@ -1581,13 +1581,13 @@ public class IntelligenceSendOrder { ...@@ -1581,13 +1581,13 @@ public class IntelligenceSendOrder {
} }
// 3、提交订单到智能平台 // 3、提交订单到智能平台
List<NameValuePair> qParams = new ArrayList<NameValuePair>(); List<NameValuePair> qParams = new ArrayList<NameValuePair>();
HttpHost proxy = new HttpHost("172.18.101.170", 3128); // HttpHost proxy = new HttpHost("172.18.101.170", 3128);
RequestConfig defaultRequestConfig = RequestConfig defaultRequestConfig =
RequestConfig.custom() RequestConfig.custom()
.setSocketTimeout(500000) .setSocketTimeout(500000)
.setConnectTimeout(500000) .setConnectTimeout(500000)
.setConnectionRequestTimeout(500000) .setConnectionRequestTimeout(500000)
.setProxy(proxy) // .setProxy(proxy)
.build(); .build();
CloseableHttpClient httpclient = CloseableHttpClient httpclient =
HttpClients.custom().setDefaultRequestConfig(defaultRequestConfig).build(); HttpClients.custom().setDefaultRequestConfig(defaultRequestConfig).build();
......
common/src/main/java/com/winsun/smsUtils/HttpUtil.java
...@@ -79,11 +79,11 @@ public class HttpUtil { ...@@ -79,11 +79,11 @@ public class HttpUtil {
} }
request.setEntity(new UrlEncodedFormEntity(nvps, "UTF-8")); request.setEntity(new UrlEncodedFormEntity(nvps, "UTF-8"));
/** 超时时间 5s 重试次数 3 */ /** 超时时间 5s 重试次数 3 */
HttpHost proxy = new HttpHost("172.18.101.170", 3128); // HttpHost proxy = new HttpHost("172.18.101.170", 3128);
// RequestConfig requestConfig = RequestConfig.custom().setConnectTimeout(20000).setSocketTimeout(20000)
// .build();
RequestConfig requestConfig = RequestConfig.custom().setConnectTimeout(20000).setSocketTimeout(20000) RequestConfig requestConfig = RequestConfig.custom().setConnectTimeout(20000).setSocketTimeout(20000)
.setProxy(proxy).build(); .build();
// RequestConfig requestConfig = RequestConfig.custom().setConnectTimeout(20000).setSocketTimeout(20000)
// .setProxy(proxy).build();
request.setConfig(requestConfig); request.setConfig(requestConfig);
// 发�?�请�? // 发�?�请�?
log.info(request.getMethod()); log.info(request.getMethod());
......
common/src/main/java/com/winsun/utils/Base64ToImgUtils.java deleted 100644 → 0
package com.winsun.utils;
import org.springframework.stereotype.Component;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.UUID;
/**
* Base64流转图片工具类
* @author calvin
*/
@Component
public class Base64ToImgUtils {
public String base64ToImg(String imgData, String hhr_img){
String filePath = "";
String uuid = UUID.randomUUID().toString().replaceAll("-", "");
uuid = uuid.substring(1, 12);
SimpleDateFormat sd = new SimpleDateFormat("yyyyMMdd");
SimpleDateFormat sd2 = new SimpleDateFormat("yyyyMM");
String orderNumber = "YRYM" + sd.format(new Date()) + uuid;
Date date = new Date();
String createdate = sd2.format(date);
File file = new File(hhr_img + createdate+ "/" + sd.format(date) + "/"+ orderNumber);
if (!file.exists() && !file.isDirectory()) {
file.mkdirs();
}
if (!imgData.isEmpty()) {
String name = orderNumber;
String base64Data = imgData.split(",")[1];
String houzhui = imgData.split(",")[0].split("/")[1].split(";")[0];
/**
* 2.解码成字节数组
*/
filePath = hhr_img + "/" + createdate+ "/" + sd.format(date) + "/"+ orderNumber +"/" + "O" + name +"."+ houzhui;
java.util.Base64.Decoder decoder = java.util.Base64.getDecoder();
byte[] bytes = decoder.decode(base64Data);
FileOutputStream fos = null;
try {
fos = new FileOutputStream(filePath);
fos.write(bytes);
} catch (IOException e) {
e.printStackTrace();
} finally {
if (fos != null){
try {
fos.close();
} catch (IOException e) {
e.printStackTrace();
}
}
}
}
return filePath;
}
//path 为图片在服务器的绝对路径
public String imgToBase64(String url) {
try {
File file = new File(url);
FileInputStream fis;
fis = new FileInputStream(file);
long size = file.length();
byte[] temp = new byte[(int) size];
fis.read(temp, 0, (int) size);
fis.close();
byte[] data = temp;
return new String(org.apache.commons.codec.binary.Base64.encodeBase64(data));
} catch (IOException e) {
e.printStackTrace();
return null;
}
}
}
common/src/main/java/com/winsun/utils/HTTPSClient.java
...@@ -108,11 +108,11 @@ public class HTTPSClient { ...@@ -108,11 +108,11 @@ public class HTTPSClient {
HttpResponse res; HttpResponse res;
try { try {
HttpHost proxy = new HttpHost("172.18.101.170", 3128); // HttpHost proxy = new HttpHost("172.18.101.170", 3128);
RequestConfig requestConfig = RequestConfig.custom(). RequestConfig requestConfig = RequestConfig.custom().
setSocketTimeout(200000). setSocketTimeout(200000).
setConnectTimeout(200000) setConnectTimeout(200000)
.setProxy(proxy) // .setProxy(proxy)
.build(); .build();
httpPost.setConfig(requestConfig); httpPost.setConfig(requestConfig);
...@@ -159,11 +159,11 @@ public class HTTPSClient { ...@@ -159,11 +159,11 @@ public class HTTPSClient {
httpPost.setEntity(s); httpPost.setEntity(s);
HttpResponse res; HttpResponse res;
try { try {
HttpHost proxy = new HttpHost("172.18.101.170", 3128); // HttpHost proxy = new HttpHost("172.18.101.170", 3128);
RequestConfig requestConfig = RequestConfig.custom() RequestConfig requestConfig = RequestConfig.custom()
.setSocketTimeout(200000) .setSocketTimeout(200000)
.setConnectTimeout(200000) .setConnectTimeout(200000)
.setProxy(proxy) // .setProxy(proxy)
.build(); .build();
httpPost.setConfig(requestConfig); httpPost.setConfig(requestConfig);
...@@ -335,11 +335,11 @@ public class HTTPSClient { ...@@ -335,11 +335,11 @@ public class HTTPSClient {
CloseableHttpClient httpClient = HttpClients.createDefault(); CloseableHttpClient httpClient = HttpClients.createDefault();
HttpPost httpPost = new HttpPost(url); HttpPost httpPost = new HttpPost(url);
try { try {
HttpHost proxy = new HttpHost("172.18.101.170", 3128); // HttpHost proxy = new HttpHost("172.18.101.170", 3128);
RequestConfig requestConfig = RequestConfig.custom() RequestConfig requestConfig = RequestConfig.custom()
.setSocketTimeout(200000) .setSocketTimeout(200000)
.setConnectTimeout(200000) .setConnectTimeout(200000)
.setProxy(proxy) // .setProxy(proxy)
.build(); .build();
httpPost.setConfig(requestConfig); httpPost.setConfig(requestConfig);
CloseableHttpResponse result = httpClient.execute(httpPost); CloseableHttpResponse result = httpClient.execute(httpPost);
......
common/src/main/java/com/winsun/utils/HttpHelper.java
...@@ -174,11 +174,11 @@ public class HttpHelper { ...@@ -174,11 +174,11 @@ public class HttpHelper {
HttpPost httpPost = new HttpPost(url); HttpPost httpPost = new HttpPost(url);
try { try {
HttpHost proxy = new HttpHost("172.18.101.170", 3128); // HttpHost proxy = new HttpHost("172.18.101.170", 3128);
RequestConfig requestConfig = RequestConfig.custom() RequestConfig requestConfig = RequestConfig.custom()
.setSocketTimeout(200000). .setSocketTimeout(200000).
setConnectTimeout(200000) setConnectTimeout(200000)
.setProxy(proxy) // .setProxy(proxy)
.build(); .build();
httpPost.setConfig(requestConfig); httpPost.setConfig(requestConfig);
...@@ -218,11 +218,11 @@ public class HttpHelper { ...@@ -218,11 +218,11 @@ public class HttpHelper {
HttpResponse res; HttpResponse res;
try { try {
HttpHost proxy = new HttpHost("172.18.101.170", 3128); // HttpHost proxy = new HttpHost("172.18.101.170", 3128);
RequestConfig requestConfig = RequestConfig RequestConfig requestConfig = RequestConfig
.custom().setSocketTimeout(200000) .custom().setSocketTimeout(200000)
.setConnectTimeout(200000) .setConnectTimeout(200000)
.setProxy(proxy) // .setProxy(proxy)
.build(); .build();
httpPost.setConfig(requestConfig); httpPost.setConfig(requestConfig);
......
service-manager/src/main/java/com/winsun/controller/ActivityRecordController.java
...@@ -6,6 +6,8 @@ import java.util.*; ...@@ -6,6 +6,8 @@ import java.util.*;
import javax.servlet.ServletOutputStream; import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import com.winsun.item.core.shiro.ShiroKit;
import com.winsun.utils.PicturesUtil;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -394,13 +396,17 @@ public class ActivityRecordController extends BaseController { ...@@ -394,13 +396,17 @@ public class ActivityRecordController extends BaseController {
*/ */
@ResponseBody @ResponseBody
@RequestMapping(value = "addActivityRecord", method = RequestMethod.POST) @RequestMapping(value = "addActivityRecord", method = RequestMethod.POST)
public ResponseData<String> getActivityInfo(String id,String message,String imageUrl) { public ResponseData<String> getActivityInfo(String activityId,String message,String imageUrl) {
ShiroUser user = getShiroUser(); ShiroUser user = ShiroKit.getUser();
String filePath = "";
if(StringUtils.isNotBlank(imageUrl)){
filePath = PicturesUtil.uploadPictures(imageUrl, activityId,"activity");
}
HhrActivityRecord activityRecord = new HhrActivityRecord(); HhrActivityRecord activityRecord = new HhrActivityRecord();
activityRecord.setActivityId(id); activityRecord.setActivityId(activityId);
activityRecord.setStatus("1");
activityRecord.setMessage(message); activityRecord.setMessage(message);
activityRecord.setImageUrl(imageUrl); activityRecord.setImageUrl(filePath);
activityRecord.setCreateId(Integer.toString(user.getId())); activityRecord.setCreateId(Integer.toString(user.getId()));
activityRecord.setCreator(user.getName()); activityRecord.setCreator(user.getName());
activityRecord.setCreateTime(new Date()); activityRecord.setCreateTime(new Date());
......
service-manager/src/main/java/com/winsun/controller/OrderController.java
...@@ -1780,10 +1780,10 @@ public class OrderController extends BaseController { ...@@ -1780,10 +1780,10 @@ public class OrderController extends BaseController {
// 保存卡品认证信息 // 保存卡品认证信息
public String sendAitransOrder(Map<String, Object> map, int count) throws NoSuchAlgorithmException, UnsupportedEncodingException { public String sendAitransOrder(Map<String, Object> map, int count) throws NoSuchAlgorithmException, UnsupportedEncodingException {
HttpHost proxy = new HttpHost("172.18.101.170", 3128); // HttpHost proxy = new HttpHost("172.18.101.170", 3128);
RequestConfig defaultRequestConfig = RequestConfig.custom().setSocketTimeout(600000).setConnectTimeout(600000) RequestConfig defaultRequestConfig = RequestConfig.custom().setSocketTimeout(600000).setConnectTimeout(600000)
.setConnectionRequestTimeout(600000) .setConnectionRequestTimeout(600000)
.setProxy(proxy) // .setProxy(proxy)
.build(); .build();
CloseableHttpClient httpclient = HttpClients.custom().setDefaultRequestConfig(defaultRequestConfig).build(); CloseableHttpClient httpclient = HttpClients.custom().setDefaultRequestConfig(defaultRequestConfig).build();
...@@ -2075,25 +2075,6 @@ public class OrderController extends BaseController { ...@@ -2075,25 +2075,6 @@ public class OrderController extends BaseController {
return resultStr; return resultStr;
} }
//path 为图片在服务器的绝对路径
public String getPhoto(String url) {
try {
File file = new File(url);
FileInputStream fis;
fis = new FileInputStream(file);
long size = file.length();
byte[] temp = new byte[(int) size];
fis.read(temp, 0, (int) size);
fis.close();
byte[] data = temp;
return new String(org.apache.commons.codec.binary.Base64.encodeBase64(data));
} catch (IOException e) {
e.printStackTrace();
return null;
}
}
@Permission(menuname = "更新存量升级订单状态", value = "setUpgradeStatus", method = RequestMethod.POST) @Permission(menuname = "更新存量升级订单状态", value = "setUpgradeStatus", method = RequestMethod.POST)
public ResponseData setUpgradeStatus(@RequestParam("orderId")String orderId,@RequestParam("auditType")String auditType,@RequestParam("contentMsg")String contentMsg){ public ResponseData setUpgradeStatus(@RequestParam("orderId")String orderId,@RequestParam("auditType")String auditType,@RequestParam("contentMsg")String contentMsg){
ShiroUser user = getShiroUser(); ShiroUser user = getShiroUser();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment