公告 插入图片功能完成

Api/src/main/java/com/java110/api/listener/file/GetFileListener.java

@@ -49,7 +49,7 @@ public class GetFileListener extends AbstractServiceApiListener {
     protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
         Assert.hasKeyAndValue(reqJson,"fileId", "未包含文件ID");
         Assert.hasKeyAndValue(reqJson,"communityId", "未包含小区ID");
-        super.validatePageInfo(reqJson);
+        //super.validatePageInfo(reqJson);
     }
 
     @Override

CommonService/src/main/java/com/java110/common/CommonServiceApplicationStart.java

@@ -28,10 +28,10 @@ import java.nio.charset.Charset;
  * @date 2016年8月6日
  * @tag
  */
-@SpringBootApplication(scanBasePackages = {"com.java110.service", "com.java110.utils", "com.java110.core", "com.java110.cache", "com.java110.db"})
+@SpringBootApplication(scanBasePackages = {"com.java110.service", "com.java110.common", "com.java110.core", "com.java110.cache", "com.java110.db"})
 @EnableDiscoveryClient
 @Java110ListenerDiscovery(listenerPublishClass = BusinessServiceDataFlowEventPublishing.class,
-        basePackages = {"com.java110.service.utils.listener"})
+        basePackages = {"com.java110.service.common.listener"})
 @EnableFeignClients(basePackages = {"com.java110.core.smo.user"})
 public class CommonServiceApplicationStart {
 

CommonService/src/main/java/com/java110/common/smo/impl/FileInnerServiceSMOImpl.java

@@ -6,6 +6,7 @@ import com.java110.core.smo.file.IFileInnerServiceSMO;
 import com.java110.dto.file.FileDto;
 import com.java110.utils.util.BeanConvertUtil;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
@@ -17,7 +18,7 @@ public class FileInnerServiceSMOImpl extends BaseServiceSMO implements IFileInne
     private IFileServiceDao fileServiceDaoImpl;
 
     @Override
-    public int saveFile(FileDto fileDto) {
+    public int saveFile(@RequestBody FileDto fileDto) {
 
         int saveFileFlag = fileServiceDaoImpl.saveFile(BeanConvertUtil.beanCovertMap(fileDto));
 
@@ -25,7 +26,7 @@ public class FileInnerServiceSMOImpl extends BaseServiceSMO implements IFileInne
     }
 
     @Override
-    public List<FileDto> queryFiles(FileDto fileDto) {
+    public List<FileDto> queryFiles(@RequestBody FileDto fileDto) {
         return BeanConvertUtil.covertBeanList(fileServiceDaoImpl.getFiles(BeanConvertUtil.beanCovertMap(fileDto)), FileDto.class);
     }
 

CommonService/src/main/resources/application-dev.yml

@@ -33,7 +33,7 @@ spring:
       enabled: true
       force: true
   application:
-    name: utils-service
+    name: common-service
   redis:
     database: 0
     host: dev.redis.java110.com

CommonService/src/main/resources/application-prod.yml

@@ -31,7 +31,7 @@ spring:
       enabled: true
       force: true
   application:
-    name: utils-service
+    name: common-service
   redis:
     database: 0
     host: prod.redis.java110.com

CommonService/src/main/resources/application-test.yml

@@ -31,7 +31,7 @@ spring:
       enabled: true
       force: true
   application:
-    name: utils-service
+    name: common-service
   redis:
     database: 0
     host: test.redis.java110.com

WebService/src/main/java/com/java110/web/smo/file/impl/AddFileSMOImpl.java

@@ -46,7 +46,7 @@ public class AddFileSMOImpl extends BaseComponentSMO implements IAddFileSMO {
         ComponentValidateResult result = this.validateStoreStaffCommunityRelationship(pd, restTemplate);
         InputStream is = uploadFile.getInputStream();
         String fileContext = Base64Convert.ioToBase64(is);
-        paramIn.put("file", fileContext);
+        paramIn.put("context", fileContext);
         paramIn.put("fileName", uploadFile.getOriginalFilename());
 
 

WebService/src/main/java/com/java110/web/smo/file/impl/GetFileSMOImpl.java

@@ -37,8 +37,6 @@ public class GetFileSMOImpl extends BaseComponentSMO implements IGetFileSMO {
     public ResponseEntity<Object> getFile(IPageData pd) throws SMOException,IOException {
         JSONObject paramIn = JSONObject.parseObject(pd.getReqData());
 
-        super.validatePageInfo(pd);
-
         Assert.hasKeyAndValue(paramIn, "communityId", "请求报文中未包含小区ID");
         Assert.hasKeyAndValue(paramIn, "fileId", "请求报文中未包含文件ID");
 
@@ -49,7 +47,7 @@ public class GetFileSMOImpl extends BaseComponentSMO implements IGetFileSMO {
         Map paramMap = BeanConvertUtil.beanCovertMap(result);
         paramIn.putAll(paramMap);
 
-        String apiUrl = ServiceConstant.SERVICE_API_URL + "/api/file.getFile";
+        String apiUrl = ServiceConstant.SERVICE_API_URL + "/api/file.getFile"+mapToUrlParam(paramIn);
 
 
         ResponseEntity<String> responseEntity = this.callCenterService(restTemplate, pd, paramIn.toJSONString(),
@@ -68,7 +66,8 @@ public class GetFileSMOImpl extends BaseComponentSMO implements IGetFileSMO {
         } else {
             headers.add("content-type", "application/octet-stream");
         }
-        headers.add("Content-Disposition", "attachment; filename=" + outParam.getString("fileName"));
+        //headers.add("Content-Disposition", "attachment; filename=" + outParam.getString("fileName"));
+        headers.add("Accept-Ranges", "bytes");
 
         byte[] context = Base64Convert.base64ToByte(outParam.getString("context"));
 

WebService/src/main/resources/components/noticePackage/addNoticeView/addNoticeView.js

@@ -199,7 +199,7 @@
                 console.log('上传图片',files);
 
                 var param = new FormData();
-                param.append("uploadFile", files);
+                param.append("uploadFile", files[0]);
                 param.append('communityId',vc.getCurrentCommunity().communityId);
 
                 vc.http.upload(
@@ -218,9 +218,7 @@
                         if(res.status == 200){
                             var data = JSON.parse(json);
                             //关闭model
-                            $summernote.summernote('insertImage', data, function ($image) {
-                                  $image.attr('src', "/callComponent/download/getFile/file?fileId="+data.fileId +"&communityId="+vc.getCurrentCommunity().communityId);
-                            });
+                            $summernote.summernote('insertImage', "/callComponent/download/getFile/file?fileId="+data.fileId +"&communityId="+vc.getCurrentCommunity().communityId);
                             return ;
                         }
                         vc.message(json);

java110-core/src/main/java/com/java110/core/feign/UserErrorDecoder.java

@@ -39,7 +39,7 @@ public class UserErrorDecoder implements ErrorDecoder {
         }
         // 这里只封装4开头的请求异常ß && response.status() < 500
         if (HTTP_STATUS_400 <= response.status()) {
-            exception = new HystrixBadRequestException("请求参数错误：", exception);
+            exception = new HystrixBadRequestException("请求参数错误："+response.body(), exception);
         } else {
             logger.error(exception.getMessage(), exception);
         }

java110-core/src/main/java/com/java110/core/smo/file/IFileInnerServiceSMO.java

@@ -3,6 +3,7 @@ package com.java110.core.smo.file;
 import com.java110.core.feign.FeignConfiguration;
 import com.java110.dto.file.FileDto;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 
@@ -21,7 +22,7 @@ public interface IFileInnerServiceSMO {
      * @return true 成功 false 失败
      */
     @RequestMapping(value = "/saveFile", method = RequestMethod.POST)
-    int saveFile(FileDto fileDto);
+    int saveFile(@RequestBody FileDto fileDto);
 
     /**
      * 查询文件信息
@@ -29,5 +30,5 @@ public interface IFileInnerServiceSMO {
      * @return 文件数据对象
      */
     @RequestMapping(value = "/queryFiles", method = RequestMethod.POST)
-    List<FileDto> queryFiles(FileDto fileDto);
+    List<FileDto> queryFiles(@RequestBody FileDto fileDto);
 }