|
@@ -5,12 +5,10 @@ import com.alibaba.fastjson.JSONObject;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import org.jeecg.common.api.vo.Result;
|
|
import org.jeecg.common.api.vo.Result;
|
|
import org.jeecg.common.constant.CommonConstant;
|
|
import org.jeecg.common.constant.CommonConstant;
|
|
-import org.jeecg.common.system.api.ISysBaseApi;
|
|
|
|
import org.jeecg.common.util.CommonUtils;
|
|
import org.jeecg.common.util.CommonUtils;
|
|
import org.jeecg.common.util.RestUtil;
|
|
import org.jeecg.common.util.RestUtil;
|
|
import org.jeecg.common.util.TokenUtils;
|
|
import org.jeecg.common.util.TokenUtils;
|
|
import org.jeecg.common.util.oConvertUtils;
|
|
import org.jeecg.common.util.oConvertUtils;
|
|
-import org.springframework.beans.factory.annotation.Autowired;
|
|
|
|
import org.springframework.beans.factory.annotation.Value;
|
|
import org.springframework.beans.factory.annotation.Value;
|
|
import org.springframework.http.HttpHeaders;
|
|
import org.springframework.http.HttpHeaders;
|
|
import org.springframework.http.HttpMethod;
|
|
import org.springframework.http.HttpMethod;
|
|
@@ -41,10 +39,6 @@ import java.net.URLDecoder;
|
|
@RestController
|
|
@RestController
|
|
@RequestMapping("/sys/common")
|
|
@RequestMapping("/sys/common")
|
|
public class CommonController {
|
|
public class CommonController {
|
|
-
|
|
|
|
- @Autowired
|
|
|
|
- private ISysBaseApi sysBaseAPI;
|
|
|
|
-
|
|
|
|
@Value(value = "${jeecg.path.upload}")
|
|
@Value(value = "${jeecg.path.upload}")
|
|
private String uploadpath;
|
|
private String uploadpath;
|
|
|
|
|
|
@@ -98,7 +92,7 @@ public class CommonController {
|
|
savePath = this.uploadLocal(file,bizPath);
|
|
savePath = this.uploadLocal(file,bizPath);
|
|
}
|
|
}
|
|
}else{
|
|
}else{
|
|
- savePath = sysBaseAPI.upload(file,bizPath,uploadType);
|
|
|
|
|
|
+// savePath = sysBaseApi.upload(file,bizPath,uploadType);
|
|
}
|
|
}
|
|
if(oConvertUtils.isNotEmpty(savePath)){
|
|
if(oConvertUtils.isNotEmpty(savePath)){
|
|
result.setMessage(savePath);
|
|
result.setMessage(savePath);
|