token

tall/src/main/java/com/ccsens/tall/service/WpsService.java

@@ -189,7 +189,7 @@ public class WpsService implements IWpsService {
         WpsFile wpsFile = saveWpsFile(token, fileId, file,WebConstant.Wps.USER_OPERATION_NEW);
         String fileName = UploadFileUtil_Servlet3.getFileNameByPart(file);
         String ext = FileUtil.extName(fileName);
-        String url = getUrl(fileId, ext, token);
+        String url = getUrl(String.valueOf(wpsFile.getId()), ext, token);
         WpsVo.FileNew fileNew = new WpsVo.FileNew();
         fileNew.setRedirect_url(url);
         fileNew.setUser_id(String.valueOf(wpsFile.getCreator()));
@@ -207,10 +207,9 @@ public class WpsService implements IWpsService {
         String fileType = WebConstant.Wps.getFileType(ext);
         Map<String, String> paramMap= new HashMap<>();
         paramMap.put("_w_appid", WebConstant.Wps.APPID);
-//        paramMap.put("_w_fname", fileName);
-//        paramMap.put("_w_userid", String.valueOf(wpsFile.getCreator()));
+        paramMap.put("_w_token", token);
         String newSignature = WpsSignature.getSignature(paramMap, WebConstant.Wps.APPKEY);
-        String fileUrl = "http://wwo.wps.cn/office/{}/{}?_w_appid=" + WebConstant.Wps.APPID + "&_w_signature={}&token={}";
+        String fileUrl = "http://wwo.wps.cn/office/{}/{}?_w_appid=" + WebConstant.Wps.APPID + "&_w_signature={}&_w_token={}";
         return StrUtil.format(fileUrl, fileType, fileId, newSignature, token);
     }
 

tall/src/main/java/com/ccsens/tall/web/WpsController.java

@@ -193,7 +193,7 @@ public class WpsController {
             header.setUserAgent(request.getHeader("User-Agent"));
             String token = request.getHeader("x-wps-weboffice-token");
             if (StrUtil.isEmpty(token)) {
-                token = request.getParameter("token");
+                token = request.getParameter("_w_token");
             }
             header.setToken(token);
             header.setFileId(request.getHeader("x-weboffice-file-id"));
@@ -222,6 +222,8 @@ public class WpsController {
         Map<String, String> paramMap = initMap();
         if (StrUtil.isNotEmpty(request.getParameter("_w_url"))) {
             paramMap.put("_w_url", request.getParameter("_w_url"));
+        } else if (StrUtil.isNotEmpty(request.getParameter("_w_token"))) {
+            paramMap.put("_w_token", request.getParameter("_w_token"));
         }
 
         String newSignature = WpsSignature.getSignature(paramMap, WebConstant.Wps.APPKEY);

tall/src/main/resources/application.yml

@@ -1,4 +1,4 @@
 spring:
   profiles:
-    active: dev
-    include: util-dev,common
+    active: test
+    include: util-test,common