SH-Arbitrate/OnlyOffice-Backend
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

优化回调保存接口（若传递文件id则每次保存只更新文件） #3

Merged
bgy merged 3 commits from bgy into dev 2024-05-11 08:41:49 +00:00
Conversation 0 Commits 3 Files Changed 10
+45 -15
3 changed files with 45 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit bbfb6ea88d - Show all commits
src/main/java/com/oo/onlyoffice/api/impl/OnlyServiceAPIImpl.java
+17 -7
View File
@@ -81,29 +81,39 @@ public class OnlyServiceAPIImpl implements OnlyServiceAPI {
return documentEdit(map, collaborativeEditing, clientType);
}
if (VIEW.equals(mode)) {
return documentView(map, clientType);
return documentView(map, collaborativeEditing, clientType);
}
// if (VIEW.equals(mode)) {
// return documentView(map, clientType);
// }
return null;
}
private Map documentEdit(Map<String, Object> map, boolean collaborativeEditing, String clientType) {
FileConfig fileConfigDTO = openEditConfig(map, "edit", collaborativeEditing,clientType);
FileConfig fileConfigDTO = openEditConfig(map, "edit", collaborativeEditing, clientType);
String json = JSON.toJSONString(fileConfigDTO);
Map<String, Object> config = JSON.parseObject(json, Map.class);
config.put("type", clientType);
return config;
}
private Map documentView(Map<String, Object> map,String clientType) {
FileConfig fileConfigDTO = openEditConfig(map, "view", false,clientType);
private Map documentView(Map<String, Object> map, boolean collaborativeEditing, String clientType) {
FileConfig fileConfigDTO = openEditConfig(map, "view", collaborativeEditing, clientType);
String json = JSON.toJSONString(fileConfigDTO);
Map<String, Object> config = JSON.parseObject(json, Map.class);
config.put("type", clientType);
return config;
}
private FileConfig openEditConfig(Map<String, Object> map, String mode, boolean collaborativeEditing,String clientType) {
private Map documentView(Map<String, Object> map, String clientType) {
FileConfig fileConfigDTO = openEditConfig(map, "view", false, clientType);
String json = JSON.toJSONString(fileConfigDTO);
Map<String, Object> config = JSON.parseObject(json, Map.class);
config.put("type", clientType);
return config;
}
private FileConfig openEditConfig(Map<String, Object> map, String mode, boolean collaborativeEditing, String clientType) {
try {
map.put("mode", mode);
log.info("开始生成文件信息");
@@ -111,7 +121,7 @@ public class OnlyServiceAPIImpl implements OnlyServiceAPI {
FileMetadata tempFileInfo = fileHandler.handlerFile(map, collaborativeEditing);
//生成配置文件 TODO: 控制文件权限
log.info("开始生成编辑器配置信息");
FileConfig fileConfigDTO = onlyOfficeConfigFactory.buildInitConfig(tempFileInfo.getUrl(), mode, tempFileInfo.getKey(), tempFileInfo.getOldName(),clientType);
FileConfig fileConfigDTO = onlyOfficeConfigFactory.buildInitConfig(tempFileInfo.getUrl(), mode, tempFileInfo.getKey(), tempFileInfo.getOldName(), clientType);
log.info("生成编辑器配置信息结束");
// TODO: 添加更多详细的自定义信息
return fileConfigDTO;
src/main/java/com/oo/onlyoffice/core/FileConfigFactory.java
+11 -6
View File
@@ -1,6 +1,7 @@
package com.oo.onlyoffice.core;
import cn.hutool.core.date.DateUtil;
import com.alibaba.fastjson2.JSONObject;
import com.oo.onlyoffice.config.OnlyProperties;
import com.oo.onlyoffice.dto.DocumentConfig;
import com.oo.onlyoffice.dto.EditorConfig;
@@ -43,7 +44,7 @@ public class FileConfigFactory implements OnlyOfficeConfigFactory {
* @return 配置信息
*/
@Override
public FileConfig buildInitConfig(String fileUrl, String mode, String key, String fileName,String clientType) {
public FileConfig buildInitConfig(String fileUrl, String mode, String key, String fileName, String clientType) {
Map<String, Object> map = new HashMap<>();
@@ -74,11 +75,15 @@ public class FileConfigFactory implements OnlyOfficeConfigFactory {
String callBackUrl = onlyProperties.getLocalhostAddress() + onlyProperties.getCallBackUrl();
EditorConfig editorConfig = new EditorConfig(callBackUrl, mode);
editorConfig.setFileCustomization(getFileCustomization(mode,clientType));
editorConfig.setFileCustomization(getFileCustomization(mode, clientType));
editorConfig.setFileUser(user);
editorConfig.setPlugins(getPlugins());
//共同编辑"coEditing"配置：
// "coEditing": { "mode": "fast","change": true}
JSONObject coEditing = new JSONObject();
coEditing.put("mode", "fast");
coEditing.put("change", "true");
editorConfig.setCoEditing(coEditing);
fileConfigDTO.setEditorConfig(editorConfig);
map.put("editorConfig", editorConfig);
@@ -112,13 +117,13 @@ public class FileConfigFactory implements OnlyOfficeConfigFactory {
return LoadConfigUtil.getCustomization();
}
private FileCustomization getFileCustomization(String mode,String clientType) {
private FileCustomization getFileCustomization(String mode, String clientType) {
FileCustomization customization = LoadConfigUtil.getCustomization();
if (mode != null && !(mode.trim()).equals("") && mode.equals("edit")) {
customization.setAutosave(true);
}
customization.setMobileForceView(false);
if(clientType!=null&&clientType!=""&&"mobile".equals(clientType)){
if (clientType != null && clientType != "" && "mobile".equals(clientType)) {
customization.setMobileForceView(true);
}
return customization;
src/main/java/com/oo/onlyoffice/core/handler/FileHandlerImpl.java
+17 -2
View File
@@ -77,8 +77,23 @@ public class FileHandlerImpl implements FileHandler {
cache.set(user.getId() + "_" + id, key);
cache.set("getID_" + key, id);
}
} else {//查看模式
key = id;
} else {
//查看模式
if (collaborativeEditing) {
if (cache.get("collaborativeEditing_" + id) != null) {
key = (String) cache.get("collaborativeEditing_" + id);
} else {
key = IdUtil.simpleUUID();
cache.set("collaborativeEditing_" + id, key);
cache.set("getID_" + key, id);
}
} else {
key = IdUtil.simpleUUID();
FileUser user = SecurityUtils.getUserSession();
cache.set(user.getId() + "_" + id, key);
cache.set("getID_" + key, id);
}
// key = id;
}