From a93cf2e0cb492c4b8510b541b8a3692d761198de Mon Sep 17 00:00:00 2001
From: zhangye <654600784@qq.com>
Date: Sun, 10 Apr 2022 20:20:57 +0800
Subject: [PATCH] 20220410

---
 ht/src/main/java/com/ccsens/ht/api/FileController.java | 6 +++---
 ht/src/main/resources/application.yml                  | 4 ++--
 util/src/main/java/com/ccsens/util/Base64FileUtil.java | 5 +++--
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/ht/src/main/java/com/ccsens/ht/api/FileController.java b/ht/src/main/java/com/ccsens/ht/api/FileController.java
index 82e56af6..ddc08425 100644
--- a/ht/src/main/java/com/ccsens/ht/api/FileController.java
+++ b/ht/src/main/java/com/ccsens/ht/api/FileController.java
@@ -27,13 +27,13 @@ import javax.validation.Valid;
 @RestController
 public class FileController {
     @MustLogin
-    @ApiOperation(value = "测评试题查询",notes = "测评试题查询")
+    @ApiOperation(value = "文件上传",notes = "文件上传")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "json", value = "测评试题查询信息", required = true)
+            @ApiImplicitParam(name = "json", value = "文件上传", required = true)
     })
     @RequestMapping(value="/saveFile", method = RequestMethod.POST)
     public JsonResponse<FileVo.Save> saveFile(@RequestBody @ApiParam @Valid QueryDto<FileDto.Save> queryDto) throws Exception {
-        String path = Base64FileUtil.base64ToFile(queryDto.getParam().getBase64(), PropUtil.path, "/file/" + DateUtil.today() + "/");
+        String path = Base64FileUtil.base64ToFile(queryDto.getParam().getBase64(), PropUtil.path, "/file/" + DateUtil.today() + "/","jpg");
         FileVo.Save save = new FileVo.Save();
         save.setPath(PropUtil.imgDomain + path);
         return JsonResponse.newInstance().ok(save);
diff --git a/ht/src/main/resources/application.yml b/ht/src/main/resources/application.yml
index b9b264a7..4ecd13fd 100644
--- a/ht/src/main/resources/application.yml
+++ b/ht/src/main/resources/application.yml
@@ -1,5 +1,5 @@
 spring:
   profiles:
-    active: prod
-    include: common, util-prod
+    active: dev
+    include: common, util-dev
 
diff --git a/util/src/main/java/com/ccsens/util/Base64FileUtil.java b/util/src/main/java/com/ccsens/util/Base64FileUtil.java
index cf06e56f..6434e5f7 100644
--- a/util/src/main/java/com/ccsens/util/Base64FileUtil.java
+++ b/util/src/main/java/com/ccsens/util/Base64FileUtil.java
@@ -22,9 +22,10 @@ public class Base64FileUtil {
      * @return 返回文件访问路径（无域名）
      * @throws Exception
      */
-    public static String base64ToFile(String base64, String path, String visitPath) throws Exception {
+    public static String base64ToFile(String base64, String path, String visitPath,String suffix) throws Exception {
         //获取后缀  data:image/png;base64,xxxxxx
-        String suffix = base64.substring(base64.indexOf("/")+1, base64.indexOf(";"));
+        suffix = suffix == null ? base64.substring(base64.indexOf("/")+1, base64.indexOf(";")) : suffix;
+//        String suffix = base64.substring(base64.indexOf("/")+1, base64.indexOf(";"));
         Random random = new Random();
         String randomStr = String.valueOf(System.currentTimeMillis())  + random.nextInt(100) + "." + suffix;
         String fileName = visitPath + randomStr;