测试-富文本

yd-api/src/main/java/com/yd/api/agms/AgmsController.java

@@ -19,6 +19,7 @@ import com.yd.api.agms.vo.statistics.FinancialStatisticsResponseVO;
 import com.yd.api.agms.vo.statistics.LeadsStatisticsRequestVO;
 import com.yd.api.agms.vo.statistics.LeadsStatisticsResponseVO;
 import com.yd.api.result.JsonResult;
+import com.yd.util.CommonUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
@@ -297,7 +298,7 @@ public class AgmsController {
     @RequestMapping(value="/controller")
     public Object controller(@RequestParam String action, @RequestParam(required = false) String callback, @RequestParam(value = "upfile",required = false) MultipartFile upfile) {
         ControllerResponseVO responseVO = agmsSharingService.controller(action, upfile);
-        if ("config".equals(action)) {
+        if (!CommonUtil.isNullOrBlank(callback)) {
             return callback +"(" + JSON.toJSONString(responseVO) + ")";
         }
         return responseVO;

yd-api/src/main/java/com/yd/api/agms/service/impl/AgmsSharingServiceImpl.java

@@ -97,7 +97,7 @@ public class AgmsSharingServiceImpl implements AgmsSharingService {
             responseVO.setFileManagerAllowFiles(Arrays.asList(fileAllowFiles));
         } else if ("uploadimage".equals(action)){
             try {
-                String type = upfile.getOriginalFilename().substring(upfile.getOriginalFilename().indexOf(".") + 1);
+                String type = upfile.getOriginalFilename().substring(upfile.getOriginalFilename().indexOf(".") );
                 byte[] bytes = upfile.getBytes();
                 InputStream in = new ByteArrayInputStream(bytes);
                 StringBuilder key = new StringBuilder("sharing/");
@@ -105,17 +105,17 @@ public class AgmsSharingServiceImpl implements AgmsSharingService {
                 Date date = new Date();
                 SimpleDateFormat sd = new SimpleDateFormat("yyyyMMddHHmmssSSS");
                 String nowTime = sd.format(date);
-                if (Arrays.asList(imageAllowFiles).contains("." + type)){
+                if (Arrays.asList(imageAllowFiles).contains(type)){
                     title = nowTime + (int)(Math.random()*1000000);
                     key.append("image/").append(title);
-                }else if (Arrays.asList(videoAllowFiles).contains("." + type)){
+                }else if (Arrays.asList(videoAllowFiles).contains(type)){
                     title = nowTime + (int)(Math.random()*1000000);
                     key.append("video/").append(title);
                 }else {
                     title = nowTime + (int)(Math.random()*1000000);
                     key.append("file/").append(title);
                 }
-                String putFileToOss = ossService.putFileToOss(null, key.toString() + "." + type, in);
+                String putFileToOss = ossService.putFileToOss(null, key.toString() + type, in);
                 responseVO.setState("SUCCESS");
                 responseVO.setUrl(putFileToOss);
                 responseVO.setTitle(title);