Merge remote-tracking branch 'origin/develop' into develop

dmp-business/dmp-dic/pom.xml

@@ -16,18 +16,6 @@
         <dependency>
             <groupId>com.persagy</groupId>
             <artifactId>integrated-config-client</artifactId>
-            <exclusions>
-                <exclusion>
-                    <artifactId>xstream</artifactId>
-                    <groupId>com.thoughtworks.xstream</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <!-- 阿里云扫描漏洞要求版本需>=1.4.18 -->
-        <dependency>
-            <groupId>com.thoughtworks.xstream</groupId>
-            <artifactId>xstream</artifactId>
-            <version>1.4.18</version>
         </dependency>
         <!-- 项目启动 -->
         <dependency>

dmp-business/dmp-rwd-plus/pom.xml

@@ -16,18 +16,6 @@
         <dependency>
             <groupId>com.persagy</groupId>
             <artifactId>integrated-config-client</artifactId>
-            <exclusions>
-                <exclusion>
-                    <artifactId>xstream</artifactId>
-                    <groupId>com.thoughtworks.xstream</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <!-- 阿里云扫描漏洞要求版本需>=1.4.18 -->
-        <dependency>
-            <groupId>com.thoughtworks.xstream</groupId>
-            <artifactId>xstream</artifactId>
-            <version>1.4.18</version>
         </dependency>
         <!-- 项目启动 -->
         <dependency>

dmp-business/dmp-rwd-version/pom.xml

@@ -16,18 +16,6 @@
         <dependency>
             <groupId>com.persagy</groupId>
             <artifactId>integrated-config-client</artifactId>
-            <exclusions>
-                <exclusion>
-                    <artifactId>xstream</artifactId>
-                    <groupId>com.thoughtworks.xstream</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <!-- 阿里云扫描漏洞要求版本需>=1.4.18 -->
-        <dependency>
-            <groupId>com.thoughtworks.xstream</groupId>
-            <artifactId>xstream</artifactId>
-            <version>1.4.18</version>
         </dependency>
         <!-- 项目启动 -->
         <dependency>

dmp-business/dmp-rwd/pom.xml

@@ -34,18 +34,12 @@
         <dependency>
             <groupId>com.persagy</groupId>
             <artifactId>integrated-config-client</artifactId>
-            <exclusions>
+<!--            <exclusions>
                 <exclusion>
                     <artifactId>xstream</artifactId>
                     <groupId>com.thoughtworks.xstream</groupId>
                 </exclusion>
-            </exclusions>
-        </dependency>
-        <!-- 阿里云扫描漏洞要求版本需>=1.4.18 -->
-        <dependency>
-            <groupId>com.thoughtworks.xstream</groupId>
-            <artifactId>xstream</artifactId>
-            <version>1.4.18</version>
+            </exclusions>-->
         </dependency>
         <!-- 项目启动 -->
         <dependency>

dmp-cloud/dmp-file/pom.xml

@@ -16,18 +16,6 @@
         <dependency>
             <groupId>com.persagy</groupId>
             <artifactId>integrated-config-client</artifactId>
-            <exclusions>
-                <exclusion>
-                    <artifactId>xstream</artifactId>
-                    <groupId>com.thoughtworks.xstream</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <!-- 阿里云扫描漏洞要求版本需>=1.4.18 -->
-        <dependency>
-            <groupId>com.thoughtworks.xstream</groupId>
-            <artifactId>xstream</artifactId>
-            <version>1.4.18</version>
         </dependency>
         <!-- 项目启动 -->
         <dependency>

dmp-cloud/dmp-file/src/main/java/com/persagy/dmp/file/controller/CompatibleOldFileController.java

@@ -8,6 +8,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.persagy.dmp.common.utils.ResourceUtil;
 import com.persagy.dmp.file.constant.FileCommonConst;
 import com.persagy.dmp.file.context.OldFileAppContext;
@@ -336,7 +337,7 @@ public class CompatibleOldFileController {
             FileMd5 fileMd5Create = FileMd5Creator.of(fileInfo.getCreator(), md5, FileCommonConst.UPLOAD_PART);
             fileMd5Create.setFileSize(totalSize);
             fileMd5Create.setCreator(fileInfo.getCreator());
-            fileMd5Service.save(fileMd5);
+            fileMd5Service.save(fileMd5Create);
         }
         Map<Integer,String> okChunkMap = service.mapChunkObjectNames(service.getChuckBucketName(null), md5);
         jsonObj.put("TotalCount", okChunkMap.size());

dmp-cloud/dmp-file/src/main/java/com/persagy/dmp/file/handler/OldFileContextHandler.java

@@ -3,6 +3,7 @@ package com.persagy.dmp.file.handler;
 import cn.hutool.core.util.BooleanUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
+import com.persagy.dmp.common.context.AppContext;
 import com.persagy.dmp.file.context.OldFileAppContext;
 import com.persagy.dmp.file.context.OldFileContext;
 import org.springframework.web.servlet.HandlerInterceptor;
@@ -23,6 +24,7 @@ public class OldFileContextHandler implements HandlerInterceptor {
         context.setWorkOrderId(request.getParameter(OldFileContext.WORK_ORDER_ID));
         context.setProjectId(request.getParameter(OldFileContext.PROJECT_ID));
         context.setOverwrite(BooleanUtil.toBoolean(request.getParameter(OldFileContext.OVERWRITE)));
+        AppContext.getContext().setAccountId(request.getParameter(OldFileContext.SYSTEM_ID));
         return true;
     }
 

dmp-cloud/dmp-file/src/main/java/com/persagy/dmp/file/service/impl/CompatibleOldFileServiceImpl.java

@@ -256,7 +256,7 @@ public class CompatibleOldFileServiceImpl implements CompatibleOldFileService {
         fileInfo.setCreator(OldFileAppContext.getContext().getSystemId());
         fileInfo.setId(OldFileAppContext.getContext().getKey());
         fileService.save(fileInfo);
-        return fileInfo.getFileMd5();
+        return fileInfo.getBusinessId();
     }
 
     /***

dmp-cloud/dmp-message/pom.xml

@@ -16,18 +16,6 @@
         <dependency>
             <groupId>com.persagy</groupId>
             <artifactId>integrated-config-client</artifactId>
-            <exclusions>
-                <exclusion>
-                    <artifactId>xstream</artifactId>
-                    <groupId>com.thoughtworks.xstream</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <!-- 阿里云扫描漏洞要求版本需>=1.4.18 -->
-        <dependency>
-            <groupId>com.thoughtworks.xstream</groupId>
-            <artifactId>xstream</artifactId>
-            <version>1.4.18</version>
         </dependency>
         <!-- 项目启动 -->
         <dependency>

dmp-parent/pom.xml

@@ -60,6 +60,8 @@
         <maven-source-plugin.version>3.0.1</maven-source-plugin.version>
         <maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
         <maven-resources-plugin.version>3.0.2</maven-resources-plugin.version>
+        <xstream.version>1.4.18</xstream.version>
+        <log4j-api.version>2.15.0</log4j-api.version>
     </properties>
 
     <dependencyManagement>
@@ -115,6 +117,11 @@
                 <version>${platform.version}</version>
             </dependency>
             <dependency>
+                <groupId>org.apache.logging.log4j</groupId>
+                <artifactId>log4j-api</artifactId>
+                <version>${log4j-api.version}</version>
+            </dependency>
+            <dependency>
                 <groupId>com.persagy</groupId>
                 <artifactId>integrated-ribbon-spring-boot-starter</artifactId>
                 <version>${platform.version}</version>
@@ -333,6 +340,12 @@
                 <artifactId>kotlin-stdlib-common</artifactId>
                 <version>${kotlin.version}</version>
             </dependency>
+            <!-- 阿里云扫描漏洞要求版本需>=1.4.18 -->
+            <dependency>
+                <groupId>com.thoughtworks.xstream</groupId>
+                <artifactId>xstream</artifactId>
+                <version>${xstream.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>