Merge remote-tracking branch 'origin/dev_20230209_xuhd'

governance/pom.xml

@@ -102,6 +102,12 @@
             <version>0.0.1</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.hungraim.ltc</groupId>
+            <artifactId>account-api</artifactId>
+            <version>0.0.1</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>

system/system-admin-service/src/main/java/com/hungraim/ltc/system/controller/FileUploadController.java

@@ -44,7 +44,7 @@ public class FileUploadController {
         String fileType = originalFilename.substring(file.getOriginalFilename().lastIndexOf("."));
         List<String> fileTypes = fileUploadConfig.getType();
         log.info("支持图片类型：" + fileTypes+",上传的图片类型："+fileType);
-        if(!fileTypes.contains(fileType)){
+        if(!fileTypes.stream().anyMatch(e->e.equalsIgnoreCase(fileType))){
             log.info("上传文件错误");
             return Result.failed(ResultCode.FILE_TYPE_ERROR);
         }

system/system-admin-service/src/main/resources/bootstrap.yml

@@ -36,9 +36,19 @@ file:
   upload:
     path: E:/workspace/upload
     type:
-      - .JPG
-      - .JPEG
+      - .png
+      - .gif
       - .jpg
       - .jpeg
-      - .png
-      - .PNG
+      - .bmp
+      - .zip
+      - .rar
+      - .7z
+      - .gz
+      - .doc
+      - .docx
+      - .xls
+      - .xlsx
+      - .pdf
+      - .txt
+      - .csv