onlyoffice 优化

ibps-basic-root/modules/basic-response/src/main/java/com/lc/ibps/cloud/config/AuthorizationConfig.java

@@ -210,6 +210,9 @@ public class AuthorizationConfig {
 		ignoreUrls.add("/prometheus");
 		ignoreUrls.add("/favicon.ico");
 		ignoreUrls.add("/cat/s/router");
+
+		ignoreUrls.add("/**/onlyOffice/**");
+		ignoreUrls.add("/onlyOffice/**");
 		
 		//---------------------------
 		// 权限忽略地址

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/config/IntegrationConfiguration.java

@@ -33,7 +33,7 @@ import org.springframework.context.annotation.Configuration;
 
 import javax.annotation.PostConstruct;
 
-@Configuration
+@Configuration("onlyofficeInitialConfigure")
 @ComponentScan(basePackages = {"com.onlyoffice.integration"})
 public class IntegrationConfiguration {
 
@@ -61,10 +61,6 @@ public class IntegrationConfiguration {
         return mapper;
     }
 
-    @Bean
-    public JSONParser jsonParser() {  // create JSON parser
-        return new JSONParser();
-    }
 
     @PostConstruct
     public void init() {  // initialize the storage path builder
@@ -82,8 +78,4 @@ public class IntegrationConfiguration {
         }
     }
 
-    @Bean
-    public ObjectMapper objectMapper() {  // create the object mapper
-        return new ObjectMapper();
-    }
 }

ibps-provider-root/modules/provider-business/src/main/java/com/onlyoffice/integration/controllers/EditorController.java

@@ -75,7 +75,7 @@ public class EditorController {
 
     @GetMapping(path = "${url.editor}")
     // process request to open the editor page
-    public EditModel index(@RequestParam("fileName") final String fileName,
+    public FileModel index(@RequestParam("fileName") final String fileName,
                         @RequestParam(value = "action", required = false) final String actionParam,
                         @RequestParam(value = "type", required = false) final String typeParam,
                         @RequestParam(value = "actionLink", required = false) final String actionLink,
@@ -127,24 +127,24 @@ public class EditorController {
 
         // get a document for comparison and add it to the model
 //        model.addAttribute("dataDocument",  getCompareFile(directUrl));
-        model.setDataDocument(getCompareFile(directUrl));
+//        model.setDataDocument(getCompareFile(directUrl));
 
         // get recipients data for mail merging and add it to the model
 //        model.addAttribute("dataSpreadsheet", getSpreadsheet(directUrl));
-        model.setDataSpreadsheet(getSpreadsheet(directUrl));
+//        model.setDataSpreadsheet(getSpreadsheet(directUrl));
 
         // get user data for mentions and add it to the model
 //        model.addAttribute("usersForMentions", getUserMentions(uid));
-        model.setUsersForMentions(getUserMentions(uid));
+//        model.setUsersForMentions(getUserMentions(uid));
 
 //        model.addAttribute("usersInfo", getUsersInfo(uid));
-        model.setUsersInfo(getUsersInfo(uid));
+//        model.setUsersInfo(getUsersInfo(uid));
 
         // get user data for protect and add it to the model
 //        model.addAttribute("usersForProtect", getUserProtect(uid));
-        model.setUsersForProtect(getUserProtect(uid));
+//        model.setUsersForProtect(getUserProtect(uid));
 
-        return model;
+        return fileModel;
     }
 
     private List<Mentions> getUserMentions(final String uid) {  // get user data for mentions

ibps-provider-root/modules/provider-business/src/main/java/com/onlyoffice/integration/controllers/FileController.java

@@ -97,8 +97,7 @@ public class FileController {
     private UserServices userService;
     @Autowired
     private CallbackHandler callbackHandler;
-    @Autowired
-    private ObjectMapper objectMapper;
+    private ObjectMapper objectMapper = new ObjectMapper();
     @Autowired
     private ServiceConverter serviceConverter;
     @Autowired

ibps-provider-root/modules/provider-business/src/main/java/com/onlyoffice/integration/documentserver/managers/callback/DefaultCallbackManager.java

@@ -30,6 +30,7 @@ import com.onlyoffice.integration.dto.Track;
 import lombok.SneakyThrows;
 import org.apache.commons.io.IOUtils;
 import org.json.simple.JSONObject;
+import org.json.simple.parser.JSONParser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Primary;
@@ -73,8 +74,7 @@ public class DefaultCallbackManager implements CallbackManager {
     private FileStorageMutator storageMutator;
     @Autowired
     private FileStoragePathBuilder storagePathBuilder;
-    @Autowired
-    private ObjectMapper objectMapper;
+    private ObjectMapper objectMapper = new ObjectMapper();
     @Autowired
     private ServiceConverter serviceConverter;
 

ibps-provider-root/modules/provider-business/src/main/java/com/onlyoffice/integration/documentserver/managers/history/DefaultHistoryManager.java

@@ -54,11 +54,8 @@ public class DefaultHistoryManager implements HistoryManager {
     @Autowired
     private FileUtility fileUtility;
 
-    @Autowired
-    private JSONParser parser;
-
-    @Autowired
-    private ObjectMapper objectMapper;
+    private ObjectMapper objectMapper = new ObjectMapper();
+    private JSONParser parser = new JSONParser();
 
     @Autowired
     private ServiceConverter serviceConverter;

ibps-provider-root/modules/provider-business/src/main/java/com/onlyoffice/integration/documentserver/managers/jwt/DefaultJwtManager.java

@@ -40,10 +40,8 @@ public class DefaultJwtManager implements JwtManager {
     private String tokenSecret;
     @Value("${files.docservice.token-use-for-request}")
     private String tokenUseForRequest;
-    @Autowired
-    private ObjectMapper objectMapper;
-    @Autowired
-    private JSONParser parser;
+    private ObjectMapper objectMapper = new ObjectMapper();
+    private JSONParser parser = new JSONParser();
 
     // create document token
     public String createToken(final Map<String, Object> payloadClaims) {

ibps-provider-root/modules/provider-business/src/main/java/com/onlyoffice/integration/documentserver/storage/LocalFileStorage.java

@@ -61,8 +61,8 @@ public class LocalFileStorage implements FileStorageMutator, FileStoragePathBuil
     @Value("${files.storage.folder}")
     private String storageFolder;
 
-    @Value("${files.docservice.url.example}")
-    private String docserviceUrlExample;
+    @Value("${files.docservice.url.business}")
+    private String docserviceUrlBusiness;
 
     @Value("${files.docservice.history.postfix}")
     private String historyPostfix;
@@ -70,8 +70,6 @@ public class LocalFileStorage implements FileStorageMutator, FileStoragePathBuil
     @Autowired
     private FileUtility fileUtility;
 
-    @Autowired
-    private HttpServletRequest request;
 
     /*
         This Storage configuration method should be called whenever a new storage folder is required
@@ -346,12 +344,7 @@ public class LocalFileStorage implements FileStorageMutator, FileStoragePathBuil
 
     // get the server URL
     public String getServerUrl(final Boolean forDocumentServer) {
-        if (forDocumentServer && !docserviceUrlExample.equals("")) {
-            return docserviceUrlExample;
-        } else {
-            return request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort()
-                    + request.getContextPath();
-        }
+        return docserviceUrlBusiness;
     }
 
     // get the history directory

ibps-provider-root/modules/provider-business/src/main/java/com/onlyoffice/integration/documentserver/util/service/DefaultServiceConverter.java

@@ -63,10 +63,8 @@ public class DefaultServiceConverter implements ServiceConverter {
     private JwtManager jwtManager;
     @Autowired
     private FileUtility fileUtility;
-    @Autowired
-    private JSONParser parser;
-    @Autowired
-    private ObjectMapper objectMapper;
+    private JSONParser parser = new JSONParser();
+    private ObjectMapper objectMapper = new ObjectMapper();
 
     @PostConstruct
     public void init() {

ibps-provider-root/modules/provider-business/src/main/java/com/onlyoffice/integration/mappers/AbstractMapper.java

@@ -28,7 +28,7 @@ import java.util.Objects;
 
 public abstract class AbstractMapper<E extends AbstractEntity, M extends AbstractModel> implements Mapper<E, M> {
     @Autowired
-    private ModelMapper mapper;
+    private ModelMapper mapper ;
 
     private Class<M> modelClass;
 

ibps-provider-root/modules/provider-business/src/main/java/com/onlyoffice/integration/services/UserServices.java

@@ -39,7 +39,7 @@ public class UserServices {
 
     // get a list of all users
     public List<User> findAll() {
-        return new ArrayList<>();
+        return data;
     }
 
     // get a user by their ID
@@ -87,6 +87,7 @@ public class UserServices {
         newUser.setPermissions(permission);
 
 //        userRepository.save(newUser); // save a new user
+        newUser.setId(data.size()+1);
         data.add(newUser);
         return newUser;
     }

ibps-provider-root/modules/provider-business/src/main/java/com/onlyoffice/integration/services/configurers/implementations/DefaultEditorConfigConfigurer.java

@@ -48,8 +48,7 @@ public class DefaultEditorConfigConfigurer implements EditorConfigConfigurer<Def
     @Autowired
     private Mapper<User, com.onlyoffice.integration.documentserver.models.filemodel.User> mapper;
 
-    @Autowired
-    private ObjectMapper objectMapper;
+    private ObjectMapper objectMapper = new ObjectMapper();
 
     @Autowired
     private DocumentManager documentManager;
@@ -106,7 +105,7 @@ public class DefaultEditorConfigConfigurer implements EditorConfigConfigurer<Def
                 .fileName(fileName)
                 .build());
 
-        config.getPlugins().getAutostart().add("asc.{0616AE85-5DBE-4B6B-A0A9-455C4F1503AD}");
-        config.getPlugins().getPluginsData().add("http://192.168.56.164:9999/8.1.3-4/sdkjs-plugins/helloworld/config.json");
+//        config.getPlugins().getAutostart().add("asc.{0616AE85-5DBE-4B6B-A0A9-455C4F1503AD}");
+//        config.getPlugins().getPluginsData().add("http://192.168.56.164:9999/8.1.3-4/sdkjs-plugins/helloworld/config.json");
     }
 }

ibps-provider-root/modules/provider-business/src/main/resources/config/application-office.yml

@@ -12,7 +12,7 @@ files:
       api: web-apps/apps/api/documents/api.js
       command: coauthoring/CommandService.ashx
       converter: ConvertService.ashx
-      example: ''
+      business: http://localhost:5100/ibps/business/v3/onlyOffice
       preloader: web-apps/apps/api/documents/cache-scripts.html
       site: http://192.168.56.164:9999/
     verify-peer-off: true