Merge branch 'dev_project_branch' into dev_temp

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/HttpClientManager.java

@@ -250,8 +250,8 @@ public class HttpClientManager {
 	 */
 	public Result<String> sendAlarmMsg(String content) {
 		Long timestamp = System.currentTimeMillis();
-		String url = "https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c";
-		String secret = "SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19";
+		String url = "https://oapi.dingtalk.com/robot/send?access_token=c40055ed85e45fdaafea00f3218928794262ff15163e09ad5c89764433b69806";
+		String secret = "SEC220eafdcb39ab5dd6cffa9f11b0e5de7178ddac9812d40fdceb6b1dda2963186";
 
 		try {
 			String stringToSign = timestamp + "\n" + secret;

epmet-gateway/deploy/docker-compose-prod.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-gateway-server:
     container_name: epmet-gateway-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-gateway:0.3.42
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-gateway:0.3.43
     ports:
       - "8080:8080"
     network_mode: host # 使用现有网络

epmet-gateway/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.42</version>
+    <version>0.3.43</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-cloud</artifactId>

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govissue/result/IssueListResultDTO.java

@@ -101,6 +101,8 @@ public class IssueListResultDTO implements Serializable {
      */
     private List<String> currentDepartment;
 
+    private String issueApplicationId;
+
     @JsonIgnore
     private Long operationTime;
 
@@ -123,5 +125,6 @@ public class IssueListResultDTO implements Serializable {
         this.currentDepartment = new ArrayList<>();
         this.projectId = "";
         this.issueClosedTime = 0L;
+        this.issueApplicationId = "";
     }
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govissue/IssueApplicationDao.xml

@@ -6,6 +6,7 @@
     <!-- 查询被拒绝的议题 -->
     <select id="issueStatusRejected" resultType="com.epmet.dataaggre.dto.govissue.result.IssueListResultDTO">
         SELECT
+            ia.ID AS issueApplicationId,
             UNIX_TIMESTAMP(iah.CREATED_TIME) AS rejectedTime,
             ia.ISSUE_TITLE,
             ia.TOPIC_ID,

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/PublicPartExtractServiceImpl.java

@@ -94,7 +94,7 @@ public class PublicPartExtractServiceImpl implements PublicPartExtractService {
     private void extractGridUserJoin(ExtractScreenFormDTO formDTO) {
         List<DimGridEntity> orgList = dimGridService.getGridListByCustomerId(formDTO.getCustomerId());
         if (CollectionUtils.isEmpty(orgList)) {
-            log.warn("抽取【公众参与-人均议题】，获取组织数据失败");
+            log.warn("抽取【公众参与-人均议题】，获取组织数据失败,客户Id:{}", formDTO.getCustomerId());
             return;
         }
         //构建组织数据
@@ -103,12 +103,12 @@ public class PublicPartExtractServiceImpl implements PublicPartExtractService {
         //获取议题月份增量
         List<FactIssueGridMonthlyEntity> issueTotal = factIssueGridMonthlyService.getIssueIncCountAndTotalByMonthId(formDTO.getCustomerId(), formDTO.getMonthId());
         if (CollectionUtils.isEmpty(issueTotal)) {
-            log.error("抽取【公众参与-人均议题】，获取议题增量为空");
+            log.error("抽取【公众参与-人均议题】，获取议题增量为空,客户Id:{}", formDTO.getCustomerId());
             return;
         }
         List<GridUserCountResultDTO> userCountList = factRegUserGridMonthlyService.selectGridUserCount(formDTO.getCustomerId(), formDTO.getMonthId());
         if (CollectionUtils.isEmpty(userCountList)) {
-            log.error("抽取【公众参与-人均议题】，获取注册用户数为空");
+            log.error("抽取【公众参与-人均议题】，获取注册用户数为空,客户Id:{}", formDTO.getCustomerId());
             return;
         }
         Map<String, GridUserCountResultDTO> userCountMap = userCountList.stream().collect(Collectors.toMap(GridUserCountResultDTO::getOrgId, o -> o));
@@ -143,7 +143,7 @@ public class PublicPartExtractServiceImpl implements PublicPartExtractService {
             //获取每个网格的应表决人数
             List<GridGroupUserCountResultDTO> memberCountList = factOriginGroupMainDailyService.selectDistinctGroupMemberCount(formDTO.getCustomerId(), ProjectConstant.AGENCY_ID);
             if (CollectionUtils.isEmpty(memberCountList)) {
-                log.warn("抽取【公众参与-人均议题】，获取应表决人数为空");
+                log.warn("抽取【公众参与-人均议题】，获取应表决人数为空,客户Id:{}", formDTO.getCustomerId());
                 return;
             }
             gridMemberCount = memberCountList.stream().collect(Collectors.toMap(GridGroupUserCountResultDTO::getOrgId, o -> o.getMemberCount()));
@@ -184,7 +184,7 @@ public class PublicPartExtractServiceImpl implements PublicPartExtractService {
     private void extractAgencyUserJoin(ExtractScreenFormDTO formDTO) {
         List<DimAgencyEntity> orgList = dimAgencyService.getAgencyListByCustomerId(formDTO.getCustomerId());
         if (CollectionUtils.isEmpty(orgList)) {
-            log.warn("抽取【公众参与-人均议题】，获取组织数据失败");
+            log.warn("抽取【公众参与-人均议题】，获取组织数据失败,客户Id:{}", formDTO.getCustomerId());
             return;
         }
         //构建组织数据
@@ -196,7 +196,7 @@ public class PublicPartExtractServiceImpl implements PublicPartExtractService {
         Map<String, GridUserCountResultDTO> userCountMap = userCountList.stream().collect(Collectors.toMap(GridUserCountResultDTO::getOrgId, o -> o));
         Set<String> agencyIdSet = new HashSet<>();
         if (!CollectionUtils.isEmpty(issueTotal)) {
-            log.error("抽取【公众参与-人均议题】，获取注册用户数为空");
+            log.error("抽取【公众参与-人均议题】，获取注册用户数为空,客户Id:{}", formDTO.getCustomerId());
             issueTotal.forEach(issue -> {
                 String agencyId = issue.getAgencyId();
                 agencyIdSet.add(agencyId);
@@ -219,7 +219,7 @@ public class PublicPartExtractServiceImpl implements PublicPartExtractService {
                     //获取每个网格的应表决人数
                     List<GridGroupUserCountResultDTO> memberCountList = factOriginGroupMainDailyService.selectDistinctGroupMemberCount(formDTO.getCustomerId(), ProjectConstant.AGENCY_ID);
                     if (CollectionUtils.isEmpty(memberCountList)) {
-                        log.warn("抽取【公众参与-人均议题】，获取应表决人数为空");
+                        log.warn("抽取【公众参与-人均议题】，获取应表决人数为空,客户Id:{}", formDTO.getCustomerId());
                         return;
                     }
                     orgMemberCount = memberCountList.stream().collect(Collectors.toMap(GridGroupUserCountResultDTO::getOrgId, o -> o.getMemberCount()));

epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-prod.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   common-service-server:
     container_name: common-service-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/common-service-server:0.3.25
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/common-service-server:0.3.26
     ports:
       - "8103:8103"
     network_mode: host # 使用现有网络

epmet-module/epmet-common-service/common-service-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.25</version>
+    <version>0.3.26</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-common-service</artifactId>

epmet-module/epmet-oss/epmet-oss-client/src/main/java/com/epmet/constants/PrivacyType.java

@@ -0,0 +1,9 @@
+package com.epmet.constants;
+
+/**
+ * 隐私类型
+ */
+public interface PrivacyType {
+    String INTERNAL = "internal";
+    String EXTERNAL = "external";
+}

epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/cloud/AbstractCloudStorageService.java

@@ -9,6 +9,7 @@
 package com.epmet.cloud;
 
 import com.epmet.commons.tools.utils.DateUtils;
+import com.epmet.constants.PrivacyType;
 import org.apache.commons.lang3.StringUtils;
 
 import java.io.IOException;
@@ -31,34 +32,48 @@ public abstract class AbstractCloudStorageService {
      * @param suffix 后缀
      * @return 返回上传路径
      */
-    public String getPath(String prefix, String suffix) {
+    public String getPath(String prefix, String suffix, String privacy) {
         //生成uuid
         String uuid = UUID.randomUUID().toString().replaceAll("-", "");
         //文件路径
         String path = DateUtils.format(new Date(), "yyyyMMdd") + "/" + uuid;
 
         if(StringUtils.isNotBlank(prefix)){
-            path = prefix + "/" + path;
+            path = prefix + "/" + getPrivacyPath(privacy) + path;
         }
 
         return path + "." + suffix;
     }
 
+    /**
+     * @Description 根据隐私级别获取隐私文件夹(在epmet-cloud-internal这个bucket正式启用之前生效)
+     * @return
+     * @author wxz
+     * @date 2021.01.04 16:55
+    */
+    private String getPrivacyPath(String privacy) {
+        if (PrivacyType.INTERNAL.equalsIgnoreCase(privacy)) {
+            return "internal/";
+        }
+        return "";
+    }
+
     /**
      * 文件上传
      * @param data    文件字节数组
      * @param path    文件路径，包含文件名
      * @return        返回http地址
      */
-    public abstract String upload(byte[] data, String path);
+    public abstract String upload(byte[] data, String path, String privacyType);
 
     /**
      * 文件上传
      * @param data     文件字节数组
      * @param suffix   后缀
+     * @param privacyType  隐私类型，默认external，外部
      * @return         返回http地址
      */
-    public abstract String uploadSuffix(byte[] data, String suffix);
+    public abstract String uploadSuffix(byte[] data, String suffix, String privacyType);
 
     /**
      * 文件上传
@@ -66,7 +81,7 @@ public abstract class AbstractCloudStorageService {
      * @param path          文件路径，包含文件名
      * @return              返回http地址
      */
-    public abstract String upload(InputStream inputStream, String path);
+    public abstract String upload(InputStream inputStream, String path, String privacyType);
 
     /**
      * 文件上传
@@ -74,12 +89,12 @@ public abstract class AbstractCloudStorageService {
      * @param suffix       后缀
      * @return             返回http地址
      */
-    public abstract String uploadSuffix(InputStream inputStream, String suffix);
+    public abstract String uploadSuffix(InputStream inputStream, String suffix, String privacyType);
 
     /**
      * 文件下载
      * sun
      */
-    public abstract void down() throws IOException;
+    public abstract void down(String privacyType) throws IOException;
 
 }

epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/cloud/AliyunCloudStorageService.java

@@ -12,6 +12,7 @@ import com.aliyun.oss.OSSClient;
 import com.aliyun.oss.model.DownloadFileRequest;
 import com.aliyun.oss.model.DownloadFileResult;
 import com.epmet.commons.tools.exception.RenException;
+import com.epmet.constants.PrivacyType;
 import com.epmet.exception.ModuleErrorCode;
 
 import java.io.ByteArrayInputStream;
@@ -29,39 +30,57 @@ public class AliyunCloudStorageService extends AbstractCloudStorageService {
         this.config = config;
     }
 
+    /**
+     * @Description 根据隐私类型获取属性。传递internal的时候会返回内部的，否则返回外部的，即公开的
+     * @return
+     * @author wxz
+     * @date 2021.01.04 13:49
+    */
+    private CloudStorageConfig.AliyunCloudStorageConfigProps getPropsByprivacyType(String privacyType) {
+        if (PrivacyType.INTERNAL.equalsIgnoreCase(privacyType)) {
+            return config.getAliyun().getInternal();
+        } else {
+            return config.getAliyun().getExternal();
+        }
+    }
+
     @Override
-    public String upload(byte[] data, String path) {
-        return upload(new ByteArrayInputStream(data), path);
+    public String upload(byte[] data, String path, String privacyType) {
+        return upload(new ByteArrayInputStream(data), path, privacyType);
     }
 
     @Override
-    public String upload(InputStream inputStream, String path) {
-        OSSClient client = new OSSClient(config.getAliyunEndPoint(), config.getAliyunAccessKeyId(),
-                config.getAliyunAccessKeySecret());
+    public String upload(InputStream inputStream, String path, String privacyType) {
+        CloudStorageConfig.AliyunCloudStorageConfigProps props = getPropsByprivacyType(privacyType);
+        OSSClient client = new OSSClient(props.getAliyunEndPoint(), props.getAliyunAccessKeyId(),
+                props.getAliyunAccessKeySecret());
         try {
-            client.putObject(config.getAliyunBucketName(), path, inputStream);
+            client.putObject(props.getAliyunBucketName(), path, inputStream);
             client.shutdown();
         } catch (Exception e){
             throw new RenException(ModuleErrorCode.OSS_UPLOAD_FILE_ERROR, e, "");
         }
 
-        return config.getAliyunDomain() + "/" + path;
+        return props.getAliyunDomain() + "/" + path;
     }
 
     @Override
-    public String uploadSuffix(byte[] data, String suffix) {
-        return upload(data, getPath(config.getAliyunPrefix(), suffix));
+    public String uploadSuffix(byte[] data, String suffix, String privacyType) {
+        CloudStorageConfig.AliyunCloudStorageConfigProps props = getPropsByprivacyType(privacyType);
+        return upload(data, getPath(props.getAliyunPrefix(), suffix, privacyType), privacyType);
     }
 
     @Override
-    public String uploadSuffix(InputStream inputStream, String suffix) {
-        return upload(inputStream, getPath(config.getAliyunPrefix(), suffix));
+    public String uploadSuffix(InputStream inputStream, String suffix, String privacyType) {
+        CloudStorageConfig.AliyunCloudStorageConfigProps props = getPropsByprivacyType(privacyType);
+        return upload(inputStream, getPath(props.getAliyunPrefix(), suffix, privacyType), privacyType);
     }
 
     @Override
-    public void down() throws IOException {
-        OSSClient client = new OSSClient(config.getAliyunEndPoint(), config.getAliyunAccessKeyId(),
-                config.getAliyunAccessKeySecret());
+    public void down(String privacyType) throws IOException {
+        CloudStorageConfig.AliyunCloudStorageConfigProps props = getPropsByprivacyType(privacyType);
+        OSSClient client = new OSSClient(props.getAliyunEndPoint(), props.getAliyunAccessKeyId(),
+                props.getAliyunAccessKeySecret());
         try {
 
             /*
@@ -88,7 +107,7 @@ public class AliyunCloudStorageService extends AbstractCloudStorageService {
             }*/
 
             //方式三
-            DownloadFileRequest downloadFileRequest = new DownloadFileRequest(config.getAliyunBucketName(), "epmet/test/20201103/198f3c11490a44eb964c5c8e9989a507.jpg");
+            DownloadFileRequest downloadFileRequest = new DownloadFileRequest(props.getAliyunBucketName(), "epmet/test/20201103/198f3c11490a44eb964c5c8e9989a507.jpg");
             downloadFileRequest.setDownloadFile("C:/Users/Administrator/Desktop/dd/4.jpg");// 本地下载文件名称
             downloadFileRequest.setPartSize(1 * 1024 * 1024);// 分片大小，取值范围为1B~5GB。
             downloadFileRequest.setTaskNum(10);//10个任务并发下载，默认值为1

epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/cloud/CloudStorageConfig.java

@@ -56,29 +56,29 @@ public class CloudStorageConfig implements Serializable {
     @NotBlank(message="{qiniu.bucketname.require}", groups = QiniuGroup.class)
     private String qiniuBucketName;
 
-    @ApiModelProperty(value = "阿里云绑定的域名")
-    @NotBlank(message="{aliyun.domain.require}", groups = AliyunGroup.class)
-    @URL(message = "{aliyun.domain.url}", groups = AliyunGroup.class)
-    private String aliyunDomain;
-
-    @ApiModelProperty(value = "阿里云路径前缀")
-    private String aliyunPrefix;
-
-    @ApiModelProperty(value = "阿里云EndPoint")
-    @NotBlank(message="{aliyun.endPoint.require}", groups = AliyunGroup.class)
-    private String aliyunEndPoint;
-
-    @ApiModelProperty(value = "阿里云AccessKeyId")
-    @NotBlank(message="{aliyun.accesskeyid.require}", groups = AliyunGroup.class)
-    private String aliyunAccessKeyId;
-
-    @ApiModelProperty(value = "阿里云AccessKeySecret")
-    @NotBlank(message="{aliyun.accesskeysecret.require}", groups = AliyunGroup.class)
-    private String aliyunAccessKeySecret;
-
-    @ApiModelProperty(value = "阿里云BucketName")
-    @NotBlank(message="{aliyun.bucketname.require}", groups = AliyunGroup.class)
-    private String aliyunBucketName;
+    //@ApiModelProperty(value = "阿里云绑定的域名")
+    //@NotBlank(message="{aliyun.domain.require}", groups = AliyunGroup.class)
+    //@URL(message = "{aliyun.domain.url}", groups = AliyunGroup.class)
+    //private String aliyunDomain;
+    //
+    //@ApiModelProperty(value = "阿里云路径前缀")
+    //private String aliyunPrefix;
+    //
+    //@ApiModelProperty(value = "阿里云EndPoint")
+    //@NotBlank(message="{aliyun.endPoint.require}", groups = AliyunGroup.class)
+    //private String aliyunEndPoint;
+    //
+    //@ApiModelProperty(value = "阿里云AccessKeyId")
+    //@NotBlank(message="{aliyun.accesskeyid.require}", groups = AliyunGroup.class)
+    //private String aliyunAccessKeyId;
+    //
+    //@ApiModelProperty(value = "阿里云AccessKeySecret")
+    //@NotBlank(message="{aliyun.accesskeysecret.require}", groups = AliyunGroup.class)
+    //private String aliyunAccessKeySecret;
+    //
+    //@ApiModelProperty(value = "阿里云BucketName")
+    //@NotBlank(message="{aliyun.bucketname.require}", groups = AliyunGroup.class)
+    //private String aliyunBucketName;
 
     @ApiModelProperty(value = "腾讯云绑定的域名")
     @NotBlank(message="{qcloud.domain.require}", groups = QcloudGroup.class)
@@ -125,4 +125,44 @@ public class CloudStorageConfig implements Serializable {
     @NotBlank(message="{local.path.url}", groups = LocalGroup.class)
     private String localPath;
 
+    private AliyunCloudStorageConfig aliyun;
+    /**
+     * 阿里云存储配置
+     */
+    @Data
+    public static class AliyunCloudStorageConfig {
+        private AliyunCloudStorageConfigProps internal;
+        private AliyunCloudStorageConfigProps external;
+    }
+
+    /**
+     * 阿里云存储配置属性
+     */
+    @Data
+    public static class AliyunCloudStorageConfigProps {
+        @ApiModelProperty(value = "阿里云绑定的域名")
+        @NotBlank(message="{aliyun.domain.require}", groups = AliyunGroup.class)
+        @URL(message = "{aliyun.domain.url}", groups = AliyunGroup.class)
+        private String aliyunDomain;
+
+        @ApiModelProperty(value = "阿里云路径前缀")
+        private String aliyunPrefix;
+
+        @ApiModelProperty(value = "阿里云EndPoint")
+        @NotBlank(message="{aliyun.endPoint.require}", groups = AliyunGroup.class)
+        private String aliyunEndPoint;
+
+        @ApiModelProperty(value = "阿里云AccessKeyId")
+        @NotBlank(message="{aliyun.accesskeyid.require}", groups = AliyunGroup.class)
+        private String aliyunAccessKeyId;
+
+        @ApiModelProperty(value = "阿里云AccessKeySecret")
+        @NotBlank(message="{aliyun.accesskeysecret.require}", groups = AliyunGroup.class)
+        private String aliyunAccessKeySecret;
+
+        @ApiModelProperty(value = "阿里云BucketName")
+        @NotBlank(message="{aliyun.bucketname.require}", groups = AliyunGroup.class)
+        private String aliyunBucketName;
+    }
+
 }

epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/cloud/FastDFSCloudStorageService.java

@@ -35,12 +35,12 @@ public class FastDFSCloudStorageService extends AbstractCloudStorageService {
     }
 
     @Override
-    public String upload(byte[] data, String path) {
-        return upload(new ByteArrayInputStream(data), path);
+    public String upload(byte[] data, String path, String privacyType) {
+        return upload(new ByteArrayInputStream(data), path, privacyType);
     }
 
     @Override
-    public String upload(InputStream inputStream, String suffix) {
+    public String upload(InputStream inputStream, String suffix, String privacyType) {
         StorePath storePath;
         try {
             storePath = defaultGenerateStorageClient.uploadFile("group1", inputStream, inputStream.available(), suffix);
@@ -52,17 +52,17 @@ public class FastDFSCloudStorageService extends AbstractCloudStorageService {
     }
 
     @Override
-    public String uploadSuffix(byte[] data, String suffix) {
-        return upload(data, suffix);
+    public String uploadSuffix(byte[] data, String suffix, String privacyType) {
+        return upload(data, suffix, privacyType);
     }
 
     @Override
-    public String uploadSuffix(InputStream inputStream, String suffix) {
-        return upload(inputStream, suffix);
+    public String uploadSuffix(InputStream inputStream, String suffix, String privacyType) {
+        return upload(inputStream, suffix, privacyType);
     }
 
     @Override
-    public void down() throws IOException {
+    public void down(String privacyType) throws IOException {
 
     }
 }

epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/cloud/LocalCloudStorageService.java

@@ -29,12 +29,12 @@ public class LocalCloudStorageService extends AbstractCloudStorageService {
     }
 
     @Override
-    public String upload(byte[] data, String path) {
-        return upload(new ByteArrayInputStream(data), path);
+    public String upload(byte[] data, String path, String privacyType) {
+        return upload(new ByteArrayInputStream(data), path, privacyType);
     }
 
     @Override
-    public String upload(InputStream inputStream, String path) {
+    public String upload(InputStream inputStream, String path, String privacyType) {
         File file = new File(config.getLocalPath() + File.separator + path);
         try {
             FileUtils.copyToFile(inputStream, file);
@@ -45,17 +45,17 @@ public class LocalCloudStorageService extends AbstractCloudStorageService {
     }
 
     @Override
-    public String uploadSuffix(byte[] data, String suffix) {
-        return upload(data, getPath(config.getLocalPrefix(), suffix));
+    public String uploadSuffix(byte[] data, String suffix, String privacyType) {
+        return upload(data, getPath(config.getLocalPrefix(), suffix, privacyType), privacyType);
     }
 
     @Override
-    public String uploadSuffix(InputStream inputStream, String suffix) {
-        return upload(inputStream, getPath(config.getLocalPrefix(), suffix));
+    public String uploadSuffix(InputStream inputStream, String suffix, String privacyType) {
+        return upload(inputStream, getPath(config.getLocalPrefix(), suffix, privacyType), privacyType);
     }
 
     @Override
-    public void down() throws IOException {
+    public void down(String privacyType) throws IOException {
 
     }
 }

epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/cloud/QcloudCloudStorageService.java

@@ -48,12 +48,12 @@ public class QcloudCloudStorageService extends AbstractCloudStorageService {
     }
 
     @Override
-    public String upload(byte[] data, String path) {
-        return upload(new ByteArrayInputStream(data), path);
+    public String upload(byte[] data, String path, String privacyType) {
+        return upload(new ByteArrayInputStream(data), path, privacyType);
     }
 
     @Override
-    public String upload(InputStream inputStream, String path) {
+    public String upload(InputStream inputStream, String path, String privacyType) {
     	try {
             COSClient client = new COSClient(credentials, clientConfig);
 
@@ -75,17 +75,17 @@ public class QcloudCloudStorageService extends AbstractCloudStorageService {
     }
 
     @Override
-    public String uploadSuffix(byte[] data, String suffix) {
-        return upload(data, getPath(config.getQcloudPrefix(), suffix));
+    public String uploadSuffix(byte[] data, String suffix, String privacyType) {
+        return upload(data, getPath(config.getQcloudPrefix(), suffix, privacyType), privacyType);
     }
 
     @Override
-    public String uploadSuffix(InputStream inputStream, String suffix) {
-        return upload(inputStream, getPath(config.getQcloudPrefix(), suffix));
+    public String uploadSuffix(InputStream inputStream, String suffix, String privacyType) {
+        return upload(inputStream, getPath(config.getQcloudPrefix(), suffix, privacyType), privacyType);
     }
 
     @Override
-    public void down() throws IOException {
+    public void down(String privacyType) throws IOException {
 
     }
 }

epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/cloud/QiniuCloudStorageService.java

@@ -45,7 +45,7 @@ public class QiniuCloudStorageService extends AbstractCloudStorageService {
     }
 
     @Override
-    public String upload(byte[] data, String path) {
+    public String upload(byte[] data, String path, String privacyType) {
         try {
             Response res = uploadManager.put(data, path, token);
             if (!res.isOK()) {
@@ -59,27 +59,27 @@ public class QiniuCloudStorageService extends AbstractCloudStorageService {
     }
 
     @Override
-    public String upload(InputStream inputStream, String path) {
+    public String upload(InputStream inputStream, String path, String privacyType) {
         try {
             byte[] data = IOUtils.toByteArray(inputStream);
-            return this.upload(data, path);
+            return this.upload(data, path, privacyType);
         } catch (IOException e) {
             throw new RenException(ModuleErrorCode.OSS_UPLOAD_FILE_ERROR, e, "");
         }
     }
 
     @Override
-    public String uploadSuffix(byte[] data, String suffix) {
-        return upload(data, getPath(config.getQiniuPrefix(), suffix));
+    public String uploadSuffix(byte[] data, String suffix, String privacyType) {
+        return upload(data, getPath(config.getQiniuPrefix(), suffix, privacyType), privacyType);
     }
 
     @Override
-    public String uploadSuffix(InputStream inputStream, String suffix) {
-        return upload(inputStream, getPath(config.getQiniuPrefix(), suffix));
+    public String uploadSuffix(InputStream inputStream, String suffix, String privacyType) {
+        return upload(inputStream, getPath(config.getQiniuPrefix(), suffix, privacyType), privacyType);
     }
 
     @Override
-    public void down() throws IOException {
+    public void down(String privacyType) throws IOException {
 
     }
 }

epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/OssController.java

@@ -114,7 +114,7 @@ public class OssController {
 
 		//上传文件
 		String extension = FilenameUtils.getExtension(file.getOriginalFilename());
-		String url = OssFactory.build().uploadSuffix(file.getBytes(), extension);
+		String url = OssFactory.build().uploadSuffix(file.getBytes(), extension, null);
 
 		//保存文件信息
 		OssEntity ossEntity = new OssEntity();
@@ -147,17 +147,17 @@ public class OssController {
 	 **/
 	@PostMapping("uploadimg")
 	public Result<UploadImgResultDTO> uploadImg(@RequestParam("file") MultipartFile file) {
-		return ossService.uploadImg(file);
+		return ossService.uploadImg(file, null);
 	}
 
 	@PostMapping("uploadwximg")
 	public Result<UploadImgResultDTO> uploadWxImg(@RequestPart("media") MultipartFile media) {
-		return ossService.uploadImg(media);
+		return ossService.uploadImg(media, null);
 	}
 
 	@PostMapping("uploadqrcode")
 	public Result<UploadImgResultDTO> uploadQrCode(@RequestPart(value = "file") MultipartFile file) {
-		return ossService.uploadImg(file);
+		return ossService.uploadImg(file, null);
 	}
 
 	/**
@@ -183,7 +183,7 @@ public class OssController {
 					, EpmetErrorCode.OPER_UPLOAD_FILE_OVER_SIZE.getMsg());
 		}
 
-		return ossService.uploadImg(file);
+		return ossService.uploadImg(file, null);
 	}
 
 	@PostMapping("function/upload")
@@ -203,7 +203,7 @@ public class OssController {
 					, EpmetErrorCode.OPER_UPLOAD_FILE_OVER_SIZE.getMsg());
 		}
 
-		return ossService.uploadImg(file);
+		return ossService.uploadImg(file, null);
 	}
 
 	@PostMapping("article/upload")
@@ -225,7 +225,7 @@ public class OssController {
 					, EpmetErrorCode.OPER_UPLOAD_FILE_OVER_SIZE.getMsg());
 		}
 
-		return ossService.uploadImg(file);
+		return ossService.uploadImg(file, null);
 	}
 
 
@@ -255,7 +255,7 @@ public class OssController {
 					, EpmetErrorCode.OPER_UPLOAD_IMG_SIZE_ERROR.getMsg());
 
 		}
-		return ossService.uploadImg(file);
+		return ossService.uploadImg(file, null);
 	}
 
 	/**
@@ -269,12 +269,12 @@ public class OssController {
 		//byte[] byteFile = file.getBytes();
 		InputStream inputStream = new ByteArrayInputStream(byteFile);
 		MultipartFile filse = new MockMultipartFile(ContentType.APPLICATION_OCTET_STREAM.toString(), inputStream);
-		return ossService.extUpload(filse,fileName);
+		return ossService.extUpload(filse,fileName, null);
 	}
 
 	/**
 	 * @param file
-	 * @Description 外挂-文件上传
+	 * @Description 项目附件上传
 	 * @Author sun
 	 **/
 	@PostMapping("uploadvariedfile")

epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/service/OssService.java

@@ -28,9 +28,9 @@ public interface OssService extends BaseService<OssEntity> {
 
 	int insertOssEntity(OssEntity ossEntity);
 
-	Result<UploadImgResultDTO> uploadImg(MultipartFile file);
+	Result<UploadImgResultDTO> uploadImg(MultipartFile file, String privacy);
 
-	Result<UploadImgResultDTO> extUpload(MultipartFile file, String fileName);
+	Result<UploadImgResultDTO> extUpload(MultipartFile file, String fileName, String privacy);
 
 	Result<UploadImgResultDTO> uploadVariedFile(MultipartFile file);
 

epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/service/impl/OssServiceImpl.java

@@ -16,6 +16,7 @@ import com.epmet.commons.tools.constant.Constant;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.constants.PrivacyType;
 import com.epmet.dao.OssDao;
 import com.epmet.dto.result.UploadImgResultDTO;
 import com.epmet.entity.OssEntity;
@@ -48,7 +49,7 @@ public class OssServiceImpl extends BaseServiceImpl<OssDao, OssEntity> implement
 	}
 
 	@Override
-	public Result<UploadImgResultDTO> uploadImg(MultipartFile file) {
+	public Result<UploadImgResultDTO> uploadImg(MultipartFile file, String privacy) {
 		if (file.isEmpty()) {
 			return new Result<UploadImgResultDTO>().error(ModuleErrorCode.UPLOAD_FILE_EMPTY);
 		}
@@ -56,7 +57,7 @@ public class OssServiceImpl extends BaseServiceImpl<OssDao, OssEntity> implement
 		String extension = FilenameUtils.getExtension(file.getOriginalFilename());
 		String url = null;
 		try {
-			url = OssFactory.build().uploadSuffix(file.getBytes(), extension);
+			url = OssFactory.build().uploadSuffix(file.getBytes(), extension, privacy);
 		} catch (IOException e) {
 			e.printStackTrace();
 			logger.error("图片上传异常");
@@ -74,9 +75,9 @@ public class OssServiceImpl extends BaseServiceImpl<OssDao, OssEntity> implement
 	}
 
 	@Override
-	public Result<UploadImgResultDTO> extUpload(MultipartFile file, String fileName) {
+	public Result<UploadImgResultDTO> extUpload(MultipartFile file, String fileName, String privacy) {
 		try {
-			OssFactory.build().down();
+			OssFactory.build().down(privacy);
 		} catch (IOException e) {
 			e.printStackTrace();
 		}
@@ -88,7 +89,7 @@ public class OssServiceImpl extends BaseServiceImpl<OssDao, OssEntity> implement
 		String extension = FilenameUtils.getExtension(fileName);
 		String url = null;
 		try {
-			url = OssFactory.build().uploadSuffix(file.getBytes(), extension);
+			url = OssFactory.build().uploadSuffix(file.getBytes(), extension, privacy);
 		} catch (IOException e) {
 			e.printStackTrace();
 			logger.error("图片上传异常");
@@ -114,7 +115,7 @@ public class OssServiceImpl extends BaseServiceImpl<OssDao, OssEntity> implement
 		String extension = FilenameUtils.getExtension(file.getOriginalFilename());
 		String url = null;
 		try {
-			url = OssFactory.build().uploadSuffix(file.getBytes(), extension);
+			url = OssFactory.build().uploadSuffix(file.getBytes(), extension, PrivacyType.INTERNAL);
 		} catch (IOException e) {
 			e.printStackTrace();
 			logger.error("文件上传异常");
@@ -145,7 +146,7 @@ public class OssServiceImpl extends BaseServiceImpl<OssDao, OssEntity> implement
 		String extension = FilenameUtils.getExtension(file.getOriginalFilename());
 		String url = null;
 		try {
-			url = OssFactory.build().uploadSuffix(file.getBytes(), extension);
+			url = OssFactory.build().uploadSuffix(file.getBytes(), extension, null);
 		} catch (IOException e) {
 			e.printStackTrace();
 			logger.error("语音上传异常");

epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/deploy/docker-compose-prod.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-openapi-adv-server:
     container_name: epmet-openapi-adv-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-openapi-adv-server:0.3.2
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-openapi-adv-server:0.3.3
     ports:
       - "8015:8015"
     network_mode: host # 不会创建新的网络

epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/pom.xml

@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
-    <version>0.3.2</version>
+    <version>0.3.3</version>
     <parent>
         <artifactId>epmet-openapi-adv</artifactId>
         <groupId>com.epmet</groupId>

epmet-openapi/epmet-openapi-scan/src/main/java/com/epmet/openapi/scan/service/impl/ScanServiceImpl.java

@@ -12,6 +12,7 @@ import com.aliyuncs.http.FormatType;
 import com.aliyuncs.http.HttpResponse;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.utils.ConvertUtils;
+import com.aliyuncs.http.MethodType;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.openapi.scan.common.constant.SysConstant;
 import com.epmet.openapi.scan.common.enu.*;