|
@@ -26,7 +26,7 @@ import static com.ruoyi.common.utils.file.ImageUtils.imageMethod;
|
|
|
|
|
|
/**
|
|
|
* 通用请求处理
|
|
|
- *
|
|
|
+ *
|
|
|
* @author ruoyi
|
|
|
*/
|
|
|
@RestController
|
|
@@ -39,7 +39,7 @@ public class CommonController
|
|
|
|
|
|
/**
|
|
|
* 通用下载请求
|
|
|
- *
|
|
|
+ *
|
|
|
* @param fileName 文件名称
|
|
|
* @param delete 是否删除
|
|
|
*/
|
|
@@ -91,14 +91,25 @@ public class CommonController
|
|
|
}
|
|
|
// 上传并返回新文件名称
|
|
|
String fileName = FileUploadUtils.upload(filePath, file);
|
|
|
- String url = serverConfig.getUrl() + fileName;
|
|
|
- if (url.indexOf("http")!= -1){
|
|
|
- String replace = url.replace("http", "https");
|
|
|
- url = replace;
|
|
|
+ if (serverConfig.getUrl().contains("qd.dmu.com.cn")){
|
|
|
+ String url = serverConfig.getUrl()+":8443" + fileName;
|
|
|
+ if (url.indexOf("http")!= -1){
|
|
|
+ String replace = url.replace("http", "https");
|
|
|
+ url = replace;
|
|
|
+ }
|
|
|
+ ajax.put("fileName", file.getOriginalFilename());
|
|
|
+ ajax.put("url", url);
|
|
|
+ return ajax;
|
|
|
+ }else{
|
|
|
+ String url = serverConfig.getUrl() + fileName;
|
|
|
+ if (url.indexOf("http")!= -1){
|
|
|
+ String replace = url.replace("http", "https");
|
|
|
+ url = replace;
|
|
|
+ }
|
|
|
+ ajax.put("fileName", file.getOriginalFilename());
|
|
|
+ ajax.put("url", url);
|
|
|
+ return ajax;
|
|
|
}
|
|
|
- ajax.put("fileName", file.getOriginalFilename());
|
|
|
- ajax.put("url", url);
|
|
|
- return ajax;
|
|
|
}
|
|
|
catch (Exception e)
|
|
|
{
|