[CMT]提交

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/common/FileUploadController.java

@@ -34,8 +34,6 @@ public class FileUploadController extends EnvelopRestEndpoint {
    @Value("${fastDFS.fastdfs_file_url}")
    private String fastdfs_file_url;
    @Value("${testPattern.sign}")
    private String isClose;
    @Autowired
    FileUploadService fileUploadService;
@@ -65,15 +63,11 @@ public class FileUploadController extends EnvelopRestEndpoint {
    @ApiOperation(value = "文件流上传文件", notes = "文件流上传文件")
    public ObjEnvelop<UploadVO> uploadStream(@ApiParam(value = "文件", required = true)
                                                 @RequestParam(value = "file", required = true) MultipartFile file) throws Exception{
        UploadVO uploadVO = new UploadVO();
        if (isClose.equalsIgnoreCase("1")){
            fileUploadService.uploadImg(file);
        }else {
            // 得到文件的完整名称  xxx.txt
            String originalFilename = file.getOriginalFilename();
            InputStream inputStream = file.getInputStream();
            uploadVO = fileUploadService.uploadStream(inputStream,originalFilename,fastdfs_file_url);
        }
        // 得到文件的完整名称  xxx.txt
        String originalFilename = file.getOriginalFilename();
        InputStream inputStream = file.getInputStream();
        UploadVO uploadVO = fileUploadService.uploadStream(inputStream,originalFilename,fastdfs_file_url);
        return success("上传成功", uploadVO);
    }

svr/svr-base/src/main/resources/application.yml

@@ -111,11 +111,7 @@ hospital:
  mqPwd: 123456
  SourceSysCode: S60
  TargetSysCode: S01
#是否开启i健康接口 0关闭，1开启
testPattern:
  sign: 1
wlyy:
  url: http://www.xmtyw.cn/wlyytest/
---
spring:
  profiles: jwtest
@@ -151,11 +147,7 @@ hospital:
  mqPwd: 123456
  SourceSysCode: S60
  TargetSysCode: S01
#是否开启i健康接口 0关闭，1开启
testPattern:
  sign: 1
wlyy:
  url: http://www.xmtyw.cn/wlyytest/
---
spring:
  profiles: jwprod
@@ -188,9 +180,4 @@ hospital:
  mqUser: JKZL
  mqPwd: 123456
  SourceSysCode: S60
  TargetSysCode: S01
#是否开启i健康接口 0关闭，1开启
testPattern:
  sign: 1
wlyy:
  url: http://www.xmtyw.cn/wlyytest/
  TargetSysCode: S01

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/file_upload/FileUploadEndpoint.java

@@ -27,6 +27,8 @@ public class FileUploadEndpoint extends EnvelopRestEndpoint {
    private String fastdfs_file_url;
    @Autowired
    FileUploadService fileUploadService;
    @Value("${testPattern.sign}")
    private String isClose;
    @PostMapping(value = BaseRequestMapping.FileUpload.UPLOAD_STREAM_IMG)
    @ApiOperation(value = "文件流上传图片", notes = "文件流上传图片")
@@ -54,10 +56,15 @@ public class FileUploadEndpoint extends EnvelopRestEndpoint {
    @ApiOperation(value = "文件流上传文件", notes = "文件流上传文件")
    public ObjEnvelop<UploadVO> uploadStream(@ApiParam(value = "文件", required = true)
                                                 @RequestParam(value = "file", required = true) MultipartFile file) throws Exception{
        // 得到文件的完整名称  xxx.txt
        String originalFilename = file.getOriginalFilename();
        InputStream inputStream = file.getInputStream();
        UploadVO uploadVO = fileUploadService.uploadStream(inputStream,originalFilename,fastdfs_file_url);
        UploadVO uploadVO = new UploadVO();
        if (isClose.equalsIgnoreCase("1")){
            fileUploadService.uploadImg(file);
        }else {
            // 得到文件的完整名称  xxx.txt
            String originalFilename = file.getOriginalFilename();
            InputStream inputStream = file.getInputStream();
            uploadVO = fileUploadService.uploadStream(inputStream,originalFilename,fastdfs_file_url);
        }
        return success("上传成功", uploadVO);
    }

svr/svr-internet-hospital/src/main/resources/application.yml

@@ -211,7 +211,11 @@ FileTempPath:
  image_path : /var/local/upload/images
  voice_path : /var/local/upload/voice
  chat_file_path : /var/local/upload/chat
#是否开启i健康接口 0关闭，1开启
testPattern:
  sign: 1
wlyy:
  url: http://www.xmtyw.cn/wlyytest/
---
spring:
  profiles: jwprod
@@ -277,7 +281,11 @@ FileTempPath:
  voice_path : /var/local/upload/voice
  chat_file_path : /var/local/upload/chat
#是否开启i健康接口 0关闭，1开启
testPattern:
  sign: 1
wlyy:
  url: http://www.xmtyw.cn/wlyytest/
---
spring:
  profiles: jwOracleTest
@@ -348,6 +356,11 @@ es:
  host:  http://172.26.0.112:9200
  tHost: 172.26.0.112:9300
  clusterName: jkzl
#是否开启i健康接口 0关闭，1开启
testPattern:
  sign: 1
wlyy:
  url: http://www.xmtyw.cn/wlyytest/
---
spring:
  profiles: jwOracleProd
@@ -418,6 +431,12 @@ es:
  clusterName: jkzl
  securityUser: elastic:elastic
#是否开启i健康接口 0关闭，1开启
testPattern:
  sign: 0
wlyy:
  url: http://www.xmtyw.cn/wlyytest/
---
##==心脏中心 ===============================================================================
spring:
@@ -482,6 +501,11 @@ es:
  tHost: 192.168.103.153:9300
  clusterName: jkzl
  securityUser: lion:jkzlehr
#是否开启i健康接口 0关闭，1开启
testPattern:
  sign: 0
wlyy:
  url: http://www.xmtyw.cn/wlyytest/
---
##==心脏中心外 ===============================================================================
spring:
@@ -545,4 +569,10 @@ es:
  host:  http://172.16.100.240:9200
  tHost: 172.16.100.240:9300
  clusterName: jkzl
  securityUser: lion:jkzlehr
  securityUser: lion:jkzlehr
#是否开启i健康接口 0关闭，1开启
testPattern:
  sign: 1
wlyy:
  url: http://www.xmtyw.cn/wlyytest/