浏览代码

修改回调日志信息

syh 5 年之前
父节点
当前提交
1c7feb175d

+ 4 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/wps/controller/FileCallBackController.java

@@ -11,6 +11,7 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.Map;
 
 /**
@@ -33,7 +34,9 @@ public class FileCallBackController{
      * 获取文件元数据
      */
     @GetMapping("info")
-    public ResponseEntity<Object> getFileInfo(String _w_userid, String _w_filepath, String _w_filetype){
+    public ResponseEntity<Object> getFileInfo(String _w_userid, String _w_filepath, String _w_filetype, HttpServletRequest request){
+        String fileId = request.getHeader("x-weboffice-file-id");
+        log.info("获取文件id:{}",fileId);
         log.info("获取文件元数据userId:{},path:{},type:{}",_w_userid,_w_filepath,_w_filetype);
         try {
             Map<String,Object> map = wpsFileService.getFileInfo(_w_userid,_w_filepath,_w_filetype);

+ 2 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/wps/entity/WpsUserAcl.java

@@ -24,9 +24,9 @@ import org.jeecgframework.poi.excel.annotation.Excel;
 public class WpsUserAcl {
 
 	/**id*/
-	@TableId(type = IdType.UUID)
+	@TableId(type = IdType.AUTO)
     @ApiModelProperty(value = "id")
-	private Integer id;
+	private Long id;
 	/**userId*/
 	@Excel(name = "userId", width = 15)
     @ApiModelProperty(value = "userId")