修改两天图片上传提交

src/main/java/com/rf/AIquantum/dialogue/rest/DialogueController.java

@@ -16,6 +16,7 @@ import com.rf.AIquantum.utils.JWTUtil;
 import com.rf.AIquantum.utils.Result;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpResponse;
@@ -27,9 +28,13 @@ import org.apache.http.impl.client.HttpClients;
 import org.apache.http.util.EntityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
+import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
+import java.io.File;
+import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;
@@ -57,8 +62,8 @@ public class DialogueController extends BaseController {
 
     @PostMapping("/saveChat")
     @ApiOperation(value = "保存对话",notes = "参数包括：phone:手机号, dialogueId:对话id（为空时是新建对话）, content:消息内容,image：图片（Base64格式，可以为空）")
-    public Result saveChat(@RequestBody String jsonParam) throws UnsupportedEncodingException {
-        JSONObject jsonObject =JSONObject.parseObject(jsonParam);
+    public Result saveChat(MultipartFile image, String phone, String dialogueId, String content) throws UnsupportedEncodingException {
+        /*JSONObject jsonObject =JSONObject.parseObject(jsonParam);
         if (!jsonObject.containsKey("phone")) {
             return fail("", "缺少参数：phone");
         }
@@ -71,15 +76,34 @@ public class DialogueController extends BaseController {
         if (!jsonObject.containsKey("image")) {
             return fail("", "缺少参数：image");
         }
-        String phone = jsonObject.getString("phone");
+        String phone = jsonObject.getString("phone");*/
         UserEntity user = this.userService.findUserByPhone(phone);
         if (user == null){
             return fail(null,"用户不存在");
         }
-        String content = jsonObject.getString("content");
+        /*String content = jsonObject.getString("content");
         String image = jsonObject.getString("image");
-        String dialogueId = jsonObject.getString("dialogueId");
-        if (dialogueId.equals("") || dialogueId == null){
+        String dialogueId = jsonObject.getString("dialogueId");*/
+        String imageUrl = "";
+        if (image != null) {
+            if (!image.isEmpty()) {
+                String FILEDIR = "./uploadFile/";
+                String fileName = phone + "-=-" + System.currentTimeMillis() + "-=-" + image.getOriginalFilename();
+                try {
+                    File temp = new File(FILEDIR);
+                    if (!temp.exists()) {
+                        temp.mkdirs();
+                    }
+                    File fileLocal = new File(FILEDIR, fileName);
+                    FileUtils.copyInputStreamToFile(image.getInputStream(), fileLocal);
+                    imageUrl = Constant.CHAT_IMAGE_URL + FILEDIR + fileName;
+                } catch (Exception e) {
+                    e.printStackTrace();
+                    return fail("文件上传失败");
+                }
+            }
+        }
+        if (dialogueId == null || dialogueId.equals("")){
             if (content.length() > 50){
                 content = content.substring(0,50);
             }
@@ -97,7 +121,7 @@ public class DialogueController extends BaseController {
         chatHistoryEntity.setDialogueId(dialogueId);
         chatHistoryEntity.setRole("user");
         chatHistoryEntity.setContent(content);
-        chatHistoryEntity.setImage(image);
+        chatHistoryEntity.setImage(imageUrl);
         chatHistoryEntity.setStatus(1);
         chatHistoryEntity.setCreateTime(DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss.SSS"));
         chatHistoryEntity.setUpdateTime(DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss.SSS"));

src/main/java/com/rf/AIquantum/filter/JWTInterceptorConfig.java

@@ -25,7 +25,7 @@ public class JWTInterceptorConfig implements WebMvcConfigurer {
     @Override
     public void addInterceptors(InterceptorRegistry registry) {
         String[] swaggerExcludes = new String[]{"/swagger-ui.html", "/swagger-resources/**", "/csrf", "/webjars/**"};
-        String[] systemApi = new String[]{"/user/addUser","/user/login"};
+        String[] systemApi = new String[]{"/user/addUser","/user/login","/user/show"};
         registry.addInterceptor(new AuthenticationInterceptor())
                 .addPathPatterns("/**")
                 .excludePathPatterns("/", "/index**", "/error")

src/main/java/com/rf/AIquantum/user/rest/UserController.java

@@ -12,10 +12,13 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
 import org.springframework.util.DigestUtils;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
+import java.io.File;
+import java.io.FileInputStream;
 import java.nio.charset.StandardCharsets;
 import java.util.Date;
 import java.util.List;
@@ -123,6 +126,23 @@ public class UserController extends BaseController {
         }
     }
 
+    @GetMapping(value = "/show",produces = MediaType.IMAGE_JPEG_VALUE )
+    @ResponseBody
+    @ApiOperation(value = "图片展示",notes = "filePath：相对路径")
+    public byte[] showPhoto(String filePath) throws Exception {
+        try{
+            File file = new File(filePath);
+            if(file.exists()){
+                FileInputStream inputStream = new FileInputStream(file);
+                byte [] bytes = new byte[inputStream.available()];
+                inputStream.read(bytes,0,inputStream.available());
+                return bytes;
+            }
+            return null;
+        }catch(Exception e){
+            throw new Exception("未找到图片");
+        }
+    }
     /**
      * 登出
      * @param userNo 账号

src/main/java/com/rf/AIquantum/utils/Constant.java

@@ -28,6 +28,8 @@ public class Constant {
     public static final String INVOKE_IP_PROT = "https://u439933-9915-1c8b14ad.bjc1.seetacloud.com:8443";
     //聊天功能接口路径
     public static final String CHAT_PATH = "/chat";
+    //聊天图片下载链接
+    public static final String CHAT_IMAGE_URL = "http://49.232.26.44:8062/user/show?filePath=";