Merge pull request #89 from gitxiaofeng/master

feature:增加图片功能

case-server/src/main/java/com/xiaoju/framework/controller/UploadController.java

@@ -1,5 +1,8 @@
 package com.xiaoju.framework.controller;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.xiaoju.framework.constants.SystemConstant;
 import com.xiaoju.framework.constants.enums.StatusCode;
 import com.xiaoju.framework.entity.exception.CaseServerException;
@@ -10,15 +13,24 @@
 import org.apache.commons.io.IOUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.constraints.NotNull;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
 import java.net.URLEncoder;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+import java.util.UUID;
 
 /**
  * 文件上传与导出
@@ -64,6 +76,45 @@ public Response<Long> importXmind(@RequestParam MultipartFile file, String creat
         }
     }
 
+    @Value("${web.upload-path}")
+    private String uploadPath;
+
+    @PostMapping(value = "/uploadAttachment", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    public JSONObject uploadAttachment(@RequestParam MultipartFile file, HttpServletRequest request) {
+
+        JSONObject ret = new JSONObject();
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd/");
+        String format = sdf.format(new Date());
+        File folder = new File(uploadPath + format);
+        if (!folder.isDirectory()) {
+            folder.mkdirs();
+        }
+        // 对上传的文件重命名，避免文件重名
+        String oldName = file.getOriginalFilename();
+        String newName = UUID.randomUUID().toString()
+                + oldName.substring(oldName.lastIndexOf("."), oldName.length());
+
+        try {
+            // 文件保存
+            file.transferTo(new File(folder, newName));
+
+            // 返回上传文件的访问路径
+            String filePath = request.getScheme() + "://" + request.getServerName()
+                    + ":" + request.getServerPort() + "/" + format + newName;
+            JSONArray datas = new JSONArray();
+            JSONObject data = new JSONObject();
+            data.put("url", filePath);
+            ret.put("success", 1);
+            datas.add(data);
+            ret.put("data", datas);
+            return ret;
+        } catch (IOException e) {
+            LOGGER.error("上传文件失败, 请重试。", e);
+            ret.put("success", 0);
+            ret.put("data", "");
+            return ret;
+        }
+    }
     /**
      * 根据caseId导出用例
      * response 文件在http响应中输出

case-server/src/main/java/com/xiaoju/framework/controller/WebController.java

@@ -41,4 +41,9 @@ public String tcCase(){
         return "index";
     }
 
+    @RequestMapping(value="/api/file/*")
+    public String file() {
+        System.out.println("pre request");
+        return "index";
+    }
 }

case-server/src/main/resources/application-dev.properties

@@ -4,7 +4,6 @@ spring.datasource.username=root
 spring.datasource.password=brishenhan
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 
-# 数据库ORM配置
 spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
 spring.datasource.druid.initial-size=5
 spring.datasource.druid.min-idle=5
@@ -18,4 +17,18 @@ spring.datasource.druid.testOnBorrow=false
 spring.datasource.druid.testOnReturn=false
 spring.datasource.druid.poolPreparedStatements=true
 spring.datasource.druid.maxPoolPreparedStatementPerConnectionSize=20
-spring.datasource.druid.connectionProperties=druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
+spring.datasource.druid.connectionProperties=druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
+
+logging.config=classpath:log4j2.xml
+
+spring.thymeleaf.servlet.content-type=text/html
+spring.thymeleaf.encoding=utf-8
+spring.thymeleaf.mode=LEGACYHTML5
+spring.thymeleaf.cache=false
+spring.mvc.static-path-pattern=/**
+# 配置本地图片文件保存目录
+web.upload-path=/Users/xxx/Documents/
+spring.resources.static-locations=classpath:/web/dist/,file:${web.upload-path}
+spring.thymeleaf.prefix=classpath:/web/dist/
+spring.thymeleaf.suffix=.html
+

case-server/src/main/resources/web/dist/index.html

@@ -9,6 +9,6 @@
   </head>
   <body>
     <div id="root"></div>
-    <script th:src="@{/umi.f5392ca2.js}"></script>
+    <script th:src="@{/umi.ab5c5558.js}"></script>
   </body>
 </html>

case-server/src/main/resources/web/package.json

@@ -18,7 +18,7 @@
     "rc-scroll-anim": "^2.7.4",
     "rc-texty": "^0.2.0",
     "react": "^16.8.6",
-    "react-agiletc-editor": "0.1.17-beta.9",
+    "react-agiletc-editor": "^0.1.17-beta.10",
     "react-dom": "^16.8.6",
     "react-resize-panel": "^0.3.5"
   },

case-server/src/main/resources/web/src/components/case/casemgt/index.js

@@ -371,13 +371,13 @@ export default class CaseMgt extends React.Component {
             mediaShow={!progressShow}
             editorStyle={{ height: 'calc(100vh - 100px)' }}
             toolbar={{
-              image: false,
+              image: true,
               theme: ['classic-compact', 'fresh-blue', 'fresh-green-compat'],
               template: ['default', 'right', 'fish-bone'],
               noteTemplate: '# test',
             }}
-            baseUrl="/"
-            uploadUrl="/api/projmgr/common/uploadAttachment"
+            baseUrl=""
+            uploadUrl="/api/file/uploadAttachment"
             wsUrl={`ws://${window.location.host}/api/case/${caseId}/${itemid}/${iscore}/${user}`}
             onSave={
               Number(iscore) !== 2