manager/zyplayer-doc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改包名为 org.dromara

Browse Source
This commit is contained in:
sswiki
2024-12-02 22:20:41 +08:00
parent 4784a8d991
commit cd0651db1b
406 changed files with 1841 additions and 1855 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
zyplayer-doc-wiki/pom.xml
View File

@@ -21,7 +21,7 @@
</developers>
<parent>
<groupId>com.zyplayer</groupId>
<groupId>org.dromara</groupId>
<artifactId>zyplayer-doc</artifactId>
<version>1.0.0</version>
</parent>
@@ -42,11 +42,11 @@
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<dependency>
<groupId>com.zyplayer</groupId>
<groupId>org.dromara</groupId>
<artifactId>zyplayer-doc-data</artifactId>
</dependency>
<dependency>
<groupId>com.zyplayer</groupId>
<groupId>org.dromara</groupId>
<artifactId>zyplayer-doc-core</artifactId>
</dependency>
<dependency>

14
zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/batch/BatchDocImportManager.java → zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/batch/BatchDocImportManager.java
View File

@@ -1,12 +1,12 @@
package com.zyplayer.doc.wiki.batch;
package org.dromara.zyplayer.wiki.batch;
import cn.hutool.core.io.FileUtil;
import com.zyplayer.doc.core.json.DocResponseJson;
import com.zyplayer.doc.data.repository.manage.entity.WikiPageFile;
import com.zyplayer.doc.wiki.batch.entry.DocEntry;
import com.zyplayer.doc.wiki.batch.strategy.ConditionalStrategySelector;
import com.zyplayer.doc.wiki.batch.strategy.comb.ICombDependencyStrategy;
import com.zyplayer.doc.wiki.batch.strategy.file.IFileStrategy;
import org.dromara.zyplayer.core.json.DocResponseJson;
import org.dromara.zyplayer.data.repository.manage.entity.WikiPageFile;
import org.dromara.zyplayer.wiki.batch.entry.DocEntry;
import org.dromara.zyplayer.wiki.batch.strategy.ConditionalStrategySelector;
import org.dromara.zyplayer.wiki.batch.strategy.comb.ICombDependencyStrategy;
import org.dromara.zyplayer.wiki.batch.strategy.file.IFileStrategy;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;

2
zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/batch/entry/DocEntry.java → zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/batch/entry/DocEntry.java
View File

@@ -1,4 +1,4 @@
package com.zyplayer.doc.wiki.batch.entry;
package org.dromara.zyplayer.wiki.batch.entry;
import java.util.LinkedList;

2
zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/batch/entry/MediaEntry.java → zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/batch/entry/MediaEntry.java
View File

@@ -1,4 +1,4 @@
package com.zyplayer.doc.wiki.batch.entry;
package org.dromara.zyplayer.wiki.batch.entry;
/**
* 媒体实体

4
zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/batch/strategy/ConditionalStrategySelector.java → zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/batch/strategy/ConditionalStrategySelector.java
View File

@@ -1,6 +1,6 @@
package com.zyplayer.doc.wiki.batch.strategy;
package org.dromara.zyplayer.wiki.batch.strategy;
import com.zyplayer.doc.wiki.batch.strategy.base.IConditionalStrategy;
import org.dromara.zyplayer.wiki.batch.strategy.base.IConditionalStrategy;
import org.springframework.beans.factory.ObjectProvider;
import org.springframework.stereotype.Component;

2
zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/batch/strategy/base/IConditionalStrategy.java → zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/batch/strategy/base/IConditionalStrategy.java
View File

@@ -1,4 +1,4 @@
package com.zyplayer.doc.wiki.batch.strategy.base;
package org.dromara.zyplayer.wiki.batch.strategy.base;
/**

6
zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/batch/strategy/comb/ICombDependencyStrategy.java → zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/batch/strategy/comb/ICombDependencyStrategy.java
View File

@@ -1,7 +1,7 @@
package com.zyplayer.doc.wiki.batch.strategy.comb;
package org.dromara.zyplayer.wiki.batch.strategy.comb;
import com.zyplayer.doc.wiki.batch.entry.DocEntry;
import com.zyplayer.doc.wiki.batch.strategy.base.IConditionalStrategy;
import org.dromara.zyplayer.wiki.batch.entry.DocEntry;
import org.dromara.zyplayer.wiki.batch.strategy.base.IConditionalStrategy;
import java.io.File;
import java.util.ArrayList;

6
zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/batch/strategy/comb/MDCombDependencyStrategy.java → zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/batch/strategy/comb/MDCombDependencyStrategy.java
View File

@@ -1,8 +1,8 @@
package com.zyplayer.doc.wiki.batch.strategy.comb;
package org.dromara.zyplayer.wiki.batch.strategy.comb;
import cn.hutool.core.io.FileUtil;
import com.zyplayer.doc.wiki.batch.entry.DocEntry;
import com.zyplayer.doc.wiki.batch.entry.MediaEntry;
import org.dromara.zyplayer.wiki.batch.entry.DocEntry;
import org.dromara.zyplayer.wiki.batch.entry.MediaEntry;
import org.springframework.stereotype.Component;
import java.io.File;

6
zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/batch/strategy/file/IFileStrategy.java → zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/batch/strategy/file/IFileStrategy.java
View File

@@ -1,7 +1,7 @@
package com.zyplayer.doc.wiki.batch.strategy.file;
package org.dromara.zyplayer.wiki.batch.strategy.file;
import com.zyplayer.doc.data.repository.manage.entity.WikiPageFile;
import com.zyplayer.doc.wiki.batch.strategy.base.IConditionalStrategy;
import org.dromara.zyplayer.data.repository.manage.entity.WikiPageFile;
import org.dromara.zyplayer.wiki.batch.strategy.base.IConditionalStrategy;
import org.springframework.web.multipart.MultipartFile;
import java.io.IOException;

10
zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/batch/strategy/file/MDFileStrategy.java → zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/batch/strategy/file/MDFileStrategy.java
View File

@@ -1,10 +1,10 @@
package com.zyplayer.doc.wiki.batch.strategy.file;
package org.dromara.zyplayer.wiki.batch.strategy.file;
import cn.hutool.core.io.IoUtil;
import com.zyplayer.doc.data.repository.manage.entity.WikiPage;
import com.zyplayer.doc.data.repository.manage.entity.WikiPageFile;
import com.zyplayer.doc.data.service.manage.WikiPageService;
import com.zyplayer.doc.wiki.service.WikiPageUploadService;
import org.dromara.zyplayer.data.repository.manage.entity.WikiPage;
import org.dromara.zyplayer.data.repository.manage.entity.WikiPageFile;
import org.dromara.zyplayer.data.service.manage.WikiPageService;
import org.dromara.zyplayer.wiki.service.WikiPageUploadService;
import lombok.RequiredArgsConstructor;
import org.apache.commons.codec.Charsets;
import org.apache.commons.lang3.StringUtils;

24
zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/batch/strategy/file/ZIPFileStrategy.java → zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/batch/strategy/file/ZIPFileStrategy.java
View File

@@ -1,21 +1,21 @@
package com.zyplayer.doc.wiki.batch.strategy.file;
package org.dromara.zyplayer.wiki.batch.strategy.file;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.io.FileUtil;
import cn.hutool.core.util.CharsetUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.ZipUtil;
import com.zyplayer.doc.core.exception.ConfirmException;
import com.zyplayer.doc.data.config.security.DocUserDetails;
import com.zyplayer.doc.data.config.security.DocUserUtil;
import com.zyplayer.doc.data.repository.manage.entity.WikiPage;
import com.zyplayer.doc.data.repository.manage.entity.WikiPageFile;
import com.zyplayer.doc.data.service.manage.WikiPageFileService;
import com.zyplayer.doc.data.service.manage.WikiPageService;
import com.zyplayer.doc.wiki.batch.BatchDocImportManager;
import com.zyplayer.doc.wiki.batch.entry.DocEntry;
import com.zyplayer.doc.wiki.batch.entry.MediaEntry;
import com.zyplayer.doc.wiki.service.WikiPageUploadService;
import org.dromara.zyplayer.core.exception.ConfirmException;
import org.dromara.zyplayer.data.config.security.DocUserDetails;
import org.dromara.zyplayer.data.config.security.DocUserUtil;
import org.dromara.zyplayer.data.repository.manage.entity.WikiPage;
import org.dromara.zyplayer.data.repository.manage.entity.WikiPageFile;
import org.dromara.zyplayer.data.service.manage.WikiPageFileService;
import org.dromara.zyplayer.data.service.manage.WikiPageService;
import org.dromara.zyplayer.wiki.batch.BatchDocImportManager;
import org.dromara.zyplayer.wiki.batch.entry.DocEntry;
import org.dromara.zyplayer.wiki.batch.entry.MediaEntry;
import org.dromara.zyplayer.wiki.service.WikiPageUploadService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;

33
zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiCommonController.java → zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/controller/WikiCommonController.java
View File

@@ -1,24 +1,24 @@
package com.zyplayer.doc.wiki.controller;
package org.dromara.zyplayer.wiki.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zyplayer.doc.core.annotation.AuthMan;
import com.zyplayer.doc.core.json.DocResponseJson;
import com.zyplayer.doc.core.json.ResponseJson;
import com.zyplayer.doc.data.config.security.DocUserDetails;
import com.zyplayer.doc.data.config.security.DocUserUtil;
import com.zyplayer.doc.data.repository.manage.entity.UserInfo;
import com.zyplayer.doc.data.repository.manage.entity.WikiPage;
import com.zyplayer.doc.data.repository.manage.entity.WikiPageFile;
import com.zyplayer.doc.data.repository.manage.entity.WikiSpace;
import com.zyplayer.doc.data.repository.manage.mapper.WikiPageFileMapper;
import com.zyplayer.doc.data.service.manage.UserInfoService;
import com.zyplayer.doc.data.service.manage.WikiPageFileService;
import com.zyplayer.doc.data.service.manage.WikiPageService;
import com.zyplayer.doc.data.service.manage.WikiSpaceService;
import com.zyplayer.doc.wiki.framework.consts.Const;
import org.dromara.zyplayer.core.annotation.AuthMan;
import org.dromara.zyplayer.core.json.DocResponseJson;
import org.dromara.zyplayer.core.json.ResponseJson;
import org.dromara.zyplayer.data.config.security.DocUserDetails;
import org.dromara.zyplayer.data.config.security.DocUserUtil;
import org.dromara.zyplayer.data.repository.manage.entity.UserInfo;
import org.dromara.zyplayer.data.repository.manage.entity.WikiPage;
import org.dromara.zyplayer.data.repository.manage.entity.WikiPageFile;
import org.dromara.zyplayer.data.repository.manage.entity.WikiSpace;
import org.dromara.zyplayer.data.repository.manage.mapper.WikiPageFileMapper;
import org.dromara.zyplayer.data.service.manage.UserInfoService;
import org.dromara.zyplayer.data.service.manage.WikiPageFileService;
import org.dromara.zyplayer.data.service.manage.WikiPageService;
import org.dromara.zyplayer.data.service.manage.WikiSpaceService;
import org.dromara.zyplayer.wiki.framework.consts.Const;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
@@ -29,7 +29,6 @@ import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletResponse;
import java.io.File;
import java.io.FileInputStream;
import java.io.InputStream;
import java.io.OutputStream;
import java.net.URLEncoder;

35
zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiOpenApiController.java → zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/controller/WikiOpenApiController.java
View File

@@ -1,24 +1,23 @@
package com.zyplayer.doc.wiki.controller;
package org.dromara.zyplayer.wiki.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.zyplayer.doc.core.enums.PageFileSource;
import com.zyplayer.doc.core.json.DocResponseJson;
import com.zyplayer.doc.core.json.ResponseJson;
import com.zyplayer.doc.data.repository.manage.entity.WikiPage;
import com.zyplayer.doc.data.repository.manage.entity.WikiPageContent;
import com.zyplayer.doc.data.repository.manage.entity.WikiPageFile;
import com.zyplayer.doc.data.repository.manage.entity.WikiSpace;
import com.zyplayer.doc.data.repository.manage.mapper.WikiPageContentMapper;
import com.zyplayer.doc.data.repository.manage.param.SearchByEsParam;
import com.zyplayer.doc.data.repository.manage.vo.SpaceNewsVo;
import com.zyplayer.doc.data.service.manage.WikiPageContentService;
import com.zyplayer.doc.data.service.manage.WikiPageFileService;
import com.zyplayer.doc.data.service.manage.WikiPageService;
import com.zyplayer.doc.data.service.manage.WikiSpaceService;
import com.zyplayer.doc.wiki.controller.vo.WikiPageContentVo;
import com.zyplayer.doc.wiki.controller.vo.WikiPageVo;
import org.dromara.zyplayer.core.enums.PageFileSource;
import org.dromara.zyplayer.core.json.DocResponseJson;
import org.dromara.zyplayer.core.json.ResponseJson;
import org.dromara.zyplayer.data.repository.manage.entity.WikiPage;
import org.dromara.zyplayer.data.repository.manage.entity.WikiPageContent;
import org.dromara.zyplayer.data.repository.manage.entity.WikiPageFile;
import org.dromara.zyplayer.data.repository.manage.entity.WikiSpace;
import org.dromara.zyplayer.data.repository.manage.mapper.WikiPageContentMapper;
import org.dromara.zyplayer.data.repository.manage.param.SearchByEsParam;
import org.dromara.zyplayer.data.repository.manage.vo.SpaceNewsVo;
import org.dromara.zyplayer.data.service.manage.WikiPageContentService;
import org.dromara.zyplayer.data.service.manage.WikiPageFileService;
import org.dromara.zyplayer.data.service.manage.WikiPageService;
import org.dromara.zyplayer.data.service.manage.WikiSpaceService;
import org.dromara.zyplayer.wiki.controller.vo.WikiPageContentVo;
import org.dromara.zyplayer.wiki.controller.vo.WikiPageVo;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.CollectionUtils;

56
zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageAuthController.java → zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/controller/WikiPageAuthController.java
View File

@@ -1,34 +1,34 @@
package com.zyplayer.doc.wiki.controller;
package org.dromara.zyplayer.wiki.controller;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.zyplayer.doc.core.annotation.AuthMan;
import com.zyplayer.doc.core.json.DocResponseJson;
import com.zyplayer.doc.core.json.ResponseJson;
import com.zyplayer.doc.data.config.security.DocUserDetails;
import com.zyplayer.doc.data.config.security.DocUserUtil;
import com.zyplayer.doc.data.config.security.UserAuthInfo;
import com.zyplayer.doc.data.repository.manage.entity.AuthInfo;
import com.zyplayer.doc.data.repository.manage.entity.UserAuth;
import com.zyplayer.doc.data.repository.manage.entity.UserInfo;
import com.zyplayer.doc.data.repository.manage.entity.UserMessage;
import com.zyplayer.doc.data.repository.manage.entity.WikiPage;
import com.zyplayer.doc.data.repository.manage.entity.WikiPageZan;
import com.zyplayer.doc.data.repository.manage.entity.WikiSpace;
import com.zyplayer.doc.data.repository.manage.mapper.UserGroupAuthMapper;
import com.zyplayer.doc.data.repository.support.consts.DocSysModuleType;
import com.zyplayer.doc.data.repository.support.consts.DocSysType;
import com.zyplayer.doc.data.repository.support.consts.UserMsgType;
import com.zyplayer.doc.data.service.manage.AuthInfoService;
import com.zyplayer.doc.data.service.manage.UserAuthService;
import com.zyplayer.doc.data.service.manage.UserInfoService;
import com.zyplayer.doc.data.service.manage.UserMessageService;
import com.zyplayer.doc.data.service.manage.WikiPageService;
import com.zyplayer.doc.data.service.manage.WikiPageZanService;
import com.zyplayer.doc.data.service.manage.WikiSpaceService;
import com.zyplayer.doc.wiki.controller.vo.UserPageAuthVo;
import com.zyplayer.doc.wiki.framework.consts.WikiAuthType;
import com.zyplayer.doc.wiki.service.common.WikiPageAuthService;
import org.dromara.zyplayer.core.annotation.AuthMan;
import org.dromara.zyplayer.core.json.DocResponseJson;
import org.dromara.zyplayer.core.json.ResponseJson;
import org.dromara.zyplayer.data.config.security.DocUserDetails;
import org.dromara.zyplayer.data.config.security.DocUserUtil;
import org.dromara.zyplayer.data.config.security.UserAuthInfo;
import org.dromara.zyplayer.data.repository.manage.entity.AuthInfo;
import org.dromara.zyplayer.data.repository.manage.entity.UserAuth;
import org.dromara.zyplayer.data.repository.manage.entity.UserInfo;
import org.dromara.zyplayer.data.repository.manage.entity.UserMessage;
import org.dromara.zyplayer.data.repository.manage.entity.WikiPage;
import org.dromara.zyplayer.data.repository.manage.entity.WikiPageZan;
import org.dromara.zyplayer.data.repository.manage.entity.WikiSpace;
import org.dromara.zyplayer.data.repository.manage.mapper.UserGroupAuthMapper;
import org.dromara.zyplayer.data.repository.support.consts.DocSysModuleType;
import org.dromara.zyplayer.data.repository.support.consts.DocSysType;
import org.dromara.zyplayer.data.repository.support.consts.UserMsgType;
import org.dromara.zyplayer.data.service.manage.AuthInfoService;
import org.dromara.zyplayer.data.service.manage.UserAuthService;
import org.dromara.zyplayer.data.service.manage.UserInfoService;
import org.dromara.zyplayer.data.service.manage.UserMessageService;
import org.dromara.zyplayer.data.service.manage.WikiPageService;
import org.dromara.zyplayer.data.service.manage.WikiPageZanService;
import org.dromara.zyplayer.data.service.manage.WikiSpaceService;
import org.dromara.zyplayer.wiki.controller.vo.UserPageAuthVo;
import org.dromara.zyplayer.wiki.framework.consts.WikiAuthType;
import org.dromara.zyplayer.wiki.service.common.WikiPageAuthService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.CollectionUtils;

36
zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageCommentController.java → zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/controller/WikiPageCommentController.java
View File

@@ -1,23 +1,23 @@
package com.zyplayer.doc.wiki.controller;
package org.dromara.zyplayer.wiki.controller;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.zyplayer.doc.core.annotation.AuthMan;
import com.zyplayer.doc.core.json.DocResponseJson;
import com.zyplayer.doc.core.json.ResponseJson;
import com.zyplayer.doc.data.config.security.DocUserDetails;
import com.zyplayer.doc.data.config.security.DocUserUtil;
import com.zyplayer.doc.data.repository.manage.entity.UserMessage;
import com.zyplayer.doc.data.repository.manage.entity.WikiPage;
import com.zyplayer.doc.data.repository.manage.entity.WikiPageComment;
import com.zyplayer.doc.data.repository.manage.entity.WikiSpace;
import com.zyplayer.doc.data.repository.support.consts.DocSysType;
import com.zyplayer.doc.data.repository.support.consts.UserMsgType;
import com.zyplayer.doc.data.service.manage.UserMessageService;
import com.zyplayer.doc.data.service.manage.WikiPageCommentService;
import com.zyplayer.doc.data.service.manage.WikiPageService;
import com.zyplayer.doc.data.service.manage.WikiSpaceService;
import com.zyplayer.doc.wiki.controller.vo.WikiPageCommentVo;
import com.zyplayer.doc.wiki.framework.consts.SpaceType;
import org.dromara.zyplayer.core.annotation.AuthMan;
import org.dromara.zyplayer.core.json.DocResponseJson;
import org.dromara.zyplayer.core.json.ResponseJson;
import org.dromara.zyplayer.data.config.security.DocUserDetails;
import org.dromara.zyplayer.data.config.security.DocUserUtil;
import org.dromara.zyplayer.data.repository.manage.entity.UserMessage;
import org.dromara.zyplayer.data.repository.manage.entity.WikiPage;
import org.dromara.zyplayer.data.repository.manage.entity.WikiPageComment;
import org.dromara.zyplayer.data.repository.manage.entity.WikiSpace;
import org.dromara.zyplayer.data.repository.support.consts.DocSysType;
import org.dromara.zyplayer.data.repository.support.consts.UserMsgType;
import org.dromara.zyplayer.data.service.manage.UserMessageService;
import org.dromara.zyplayer.data.service.manage.WikiPageCommentService;
import org.dromara.zyplayer.data.service.manage.WikiPageService;
import org.dromara.zyplayer.data.service.manage.WikiSpaceService;
import org.dromara.zyplayer.wiki.controller.vo.WikiPageCommentVo;
import org.dromara.zyplayer.wiki.framework.consts.SpaceType;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.PostMapping;

67
zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageController.java → zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/controller/WikiPageController.java
View File

@@ -1,60 +1,43 @@
package com.zyplayer.doc.wiki.controller;
package org.dromara.zyplayer.wiki.controller;
import cn.hutool.core.io.FileUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.http.HttpUtil;
import cn.hutool.system.SystemUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.zyplayer.doc.core.annotation.AuthMan;
import com.zyplayer.doc.core.enums.PageFileSource;
import com.zyplayer.doc.core.exception.ConfirmException;
import com.zyplayer.doc.core.json.DocResponseJson;
import com.zyplayer.doc.core.json.ResponseJson;
import com.zyplayer.doc.data.config.security.DocUserDetails;
import com.zyplayer.doc.data.config.security.DocUserUtil;
import com.zyplayer.doc.data.repository.manage.entity.*;
import com.zyplayer.doc.data.repository.manage.mapper.WikiPageContentMapper;
import com.zyplayer.doc.data.repository.manage.mapper.WikiPageMapper;
import com.zyplayer.doc.data.repository.manage.param.SearchByEsParam;
import com.zyplayer.doc.data.repository.manage.vo.SpaceNewsVo;
import com.zyplayer.doc.data.repository.manage.vo.WikiPageTemplateInfoVo;
import com.zyplayer.doc.data.repository.support.consts.DocSysType;
import com.zyplayer.doc.data.repository.support.consts.UserMsgType;
import com.zyplayer.doc.data.service.manage.*;
import com.zyplayer.doc.data.utils.CachePrefix;
import com.zyplayer.doc.data.utils.CacheUtil;
import com.zyplayer.doc.wiki.controller.vo.WikiPageContentVo;
import com.zyplayer.doc.wiki.controller.vo.WikiPageVo;
import com.zyplayer.doc.wiki.framework.consts.SpaceType;
import com.zyplayer.doc.wiki.service.WikiPageUploadService;
import com.zyplayer.doc.wiki.service.WikiPageWebService;
import com.zyplayer.doc.wiki.service.common.WikiPageAuthService;
import org.dromara.zyplayer.core.annotation.AuthMan;
import org.dromara.zyplayer.core.enums.PageFileSource;
import org.dromara.zyplayer.core.exception.ConfirmException;
import org.dromara.zyplayer.core.json.DocResponseJson;
import org.dromara.zyplayer.core.json.ResponseJson;
import org.dromara.zyplayer.data.config.security.DocUserDetails;
import org.dromara.zyplayer.data.config.security.DocUserUtil;
import org.dromara.zyplayer.data.repository.manage.entity.*;
import org.dromara.zyplayer.data.repository.manage.mapper.WikiPageContentMapper;
import org.dromara.zyplayer.data.repository.manage.mapper.WikiPageMapper;
import org.dromara.zyplayer.data.repository.manage.param.SearchByEsParam;
import org.dromara.zyplayer.data.repository.manage.vo.SpaceNewsVo;
import org.dromara.zyplayer.data.repository.manage.vo.WikiPageTemplateInfoVo;
import org.dromara.zyplayer.data.repository.support.consts.DocSysType;
import org.dromara.zyplayer.data.repository.support.consts.UserMsgType;
import org.dromara.zyplayer.data.service.manage.*;
import org.dromara.zyplayer.data.utils.CachePrefix;
import org.dromara.zyplayer.data.utils.CacheUtil;
import org.dromara.zyplayer.wiki.controller.vo.WikiPageContentVo;
import org.dromara.zyplayer.wiki.controller.vo.WikiPageVo;
import org.dromara.zyplayer.wiki.framework.consts.SpaceType;
import org.dromara.zyplayer.wiki.service.WikiPageUploadService;
import org.dromara.zyplayer.wiki.service.WikiPageWebService;
import org.dromara.zyplayer.wiki.service.common.WikiPageAuthService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.RegExUtils;
import org.apache.commons.lang3.StringUtils;
import org.docx4j.XmlUtils;
import org.docx4j.openpackaging.packages.WordprocessingMLPackage;
import org.docx4j.openpackaging.parts.WordprocessingML.AltChunkType;
import org.docx4j.openpackaging.parts.WordprocessingML.MainDocumentPart;
import org.jsoup.Jsoup;
import org.jsoup.nodes.Document;
import org.jsoup.nodes.Element;
import org.jsoup.nodes.Entities;
import org.jsoup.select.Elements;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.File;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
import java.util.*;
import java.util.stream.Collectors;

16
zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageFileController.java → zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/controller/WikiPageFileController.java
View File

@@ -1,13 +1,13 @@
package com.zyplayer.doc.wiki.controller;
package org.dromara.zyplayer.wiki.controller;
import com.alibaba.fastjson.JSONObject;
import com.zyplayer.doc.core.annotation.AuthMan;
import com.zyplayer.doc.core.enums.PageFileSource;
import com.zyplayer.doc.core.json.DocResponseJson;
import com.zyplayer.doc.core.json.ResponseJson;
import com.zyplayer.doc.data.repository.manage.entity.WikiPageFile;
import com.zyplayer.doc.wiki.batch.BatchDocImportManager;
import com.zyplayer.doc.wiki.service.WikiPageFileServiceEx;
import org.dromara.zyplayer.core.annotation.AuthMan;
import org.dromara.zyplayer.core.enums.PageFileSource;
import org.dromara.zyplayer.core.json.DocResponseJson;
import org.dromara.zyplayer.core.json.ResponseJson;
import org.dromara.zyplayer.data.repository.manage.entity.WikiPageFile;
import org.dromara.zyplayer.wiki.batch.BatchDocImportManager;
import org.dromara.zyplayer.wiki.service.WikiPageFileServiceEx;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.PostMapping;

26
zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageHistoryController.java → zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/controller/WikiPageHistoryController.java
View File

@@ -1,21 +1,21 @@
package com.zyplayer.doc.wiki.controller;
package org.dromara.zyplayer.wiki.controller;
import cn.hutool.core.util.ZipUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zyplayer.doc.core.annotation.AuthMan;
import com.zyplayer.doc.core.json.DocResponseJson;
import com.zyplayer.doc.core.json.ResponseJson;
import com.zyplayer.doc.data.config.security.DocUserDetails;
import com.zyplayer.doc.data.config.security.DocUserUtil;
import com.zyplayer.doc.data.repository.manage.entity.WikiPage;
import com.zyplayer.doc.data.repository.manage.entity.WikiPageHistory;
import com.zyplayer.doc.data.repository.manage.entity.WikiSpace;
import com.zyplayer.doc.data.service.manage.WikiPageHistoryService;
import com.zyplayer.doc.data.service.manage.WikiPageService;
import com.zyplayer.doc.data.service.manage.WikiSpaceService;
import com.zyplayer.doc.wiki.framework.consts.SpaceType;
import org.dromara.zyplayer.core.annotation.AuthMan;
import org.dromara.zyplayer.core.json.DocResponseJson;
import org.dromara.zyplayer.core.json.ResponseJson;
import org.dromara.zyplayer.data.config.security.DocUserDetails;
import org.dromara.zyplayer.data.config.security.DocUserUtil;
import org.dromara.zyplayer.data.repository.manage.entity.WikiPage;
import org.dromara.zyplayer.data.repository.manage.entity.WikiPageHistory;
import org.dromara.zyplayer.data.repository.manage.entity.WikiSpace;
import org.dromara.zyplayer.data.service.manage.WikiPageHistoryService;
import org.dromara.zyplayer.data.service.manage.WikiPageService;
import org.dromara.zyplayer.data.service.manage.WikiSpaceService;
import org.dromara.zyplayer.wiki.framework.consts.SpaceType;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.PostMapping;

28
zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageTemplateController.java → zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/controller/WikiPageTemplateController.java
View File

@@ -1,20 +1,26 @@
package com.zyplayer.doc.wiki.controller;
package org.dromara.zyplayer.wiki.controller;
import cn.hutool.core.util.IdUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.zyplayer.doc.core.annotation.AuthMan;
import com.zyplayer.doc.core.json.DocResponseJson;
import com.zyplayer.doc.core.json.ResponseJson;
import com.zyplayer.doc.data.config.security.DocUserDetails;
import com.zyplayer.doc.data.config.security.DocUserUtil;
import com.zyplayer.doc.data.repository.manage.entity.*;
import com.zyplayer.doc.data.repository.manage.vo.WikiPageTemplateInfoVo;
import com.zyplayer.doc.data.repository.manage.vo.WikiTemplateTagVo;
import com.zyplayer.doc.data.service.manage.*;
import com.zyplayer.doc.wiki.service.WikiPageUploadService;
import org.dromara.zyplayer.core.annotation.AuthMan;
import org.dromara.zyplayer.core.json.DocResponseJson;
import org.dromara.zyplayer.core.json.ResponseJson;
import org.dromara.zyplayer.data.config.security.DocUserDetails;
import org.dromara.zyplayer.data.config.security.DocUserUtil;
import org.dromara.zyplayer.data.repository.manage.entity.WikiPage;
import org.dromara.zyplayer.data.repository.manage.entity.WikiPageContent;
import org.dromara.zyplayer.data.repository.manage.entity.WikiPageFile;
import org.dromara.zyplayer.data.repository.manage.entity.WikiPageTemplate;
import org.dromara.zyplayer.data.repository.manage.vo.WikiPageTemplateInfoVo;
import org.dromara.zyplayer.data.repository.manage.vo.WikiTemplateTagVo;
import org.dromara.zyplayer.wiki.service.WikiPageUploadService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.dromara.zyplayer.data.service.manage.WikiPageContentService;
import org.dromara.zyplayer.data.service.manage.WikiPageFileService;
import org.dromara.zyplayer.data.service.manage.WikiPageService;
import org.dromara.zyplayer.data.service.manage.WikiPageTemplateService;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

34
zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageZanController.java → zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/controller/WikiPageZanController.java
View File

@@ -1,22 +1,22 @@
package com.zyplayer.doc.wiki.controller;
package org.dromara.zyplayer.wiki.controller;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.zyplayer.doc.core.annotation.AuthMan;
import com.zyplayer.doc.core.json.DocResponseJson;
import com.zyplayer.doc.core.json.ResponseJson;
import com.zyplayer.doc.data.config.security.DocUserDetails;
import com.zyplayer.doc.data.config.security.DocUserUtil;
import com.zyplayer.doc.data.repository.manage.entity.UserMessage;
import com.zyplayer.doc.data.repository.manage.entity.WikiPage;
import com.zyplayer.doc.data.repository.manage.entity.WikiPageZan;
import com.zyplayer.doc.data.repository.manage.entity.WikiSpace;
import com.zyplayer.doc.data.repository.support.consts.DocSysType;
import com.zyplayer.doc.data.repository.support.consts.UserMsgType;
import com.zyplayer.doc.data.service.manage.UserMessageService;
import com.zyplayer.doc.data.service.manage.WikiPageService;
import com.zyplayer.doc.data.service.manage.WikiPageZanService;
import com.zyplayer.doc.data.service.manage.WikiSpaceService;
import com.zyplayer.doc.wiki.framework.consts.SpaceType;
import org.dromara.zyplayer.core.annotation.AuthMan;
import org.dromara.zyplayer.core.json.DocResponseJson;
import org.dromara.zyplayer.core.json.ResponseJson;
import org.dromara.zyplayer.data.config.security.DocUserDetails;
import org.dromara.zyplayer.data.config.security.DocUserUtil;
import org.dromara.zyplayer.data.repository.manage.entity.UserMessage;
import org.dromara.zyplayer.data.repository.manage.entity.WikiPage;
import org.dromara.zyplayer.data.repository.manage.entity.WikiPageZan;
import org.dromara.zyplayer.data.repository.manage.entity.WikiSpace;
import org.dromara.zyplayer.data.repository.support.consts.DocSysType;
import org.dromara.zyplayer.data.repository.support.consts.UserMsgType;
import org.dromara.zyplayer.data.service.manage.UserMessageService;
import org.dromara.zyplayer.data.service.manage.WikiPageService;
import org.dromara.zyplayer.data.service.manage.WikiPageZanService;
import org.dromara.zyplayer.data.service.manage.WikiSpaceService;
import org.dromara.zyplayer.wiki.framework.consts.SpaceType;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.PostMapping;

38
zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiSpaceController.java → zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/controller/WikiSpaceController.java
View File

@@ -1,4 +1,4 @@
package com.zyplayer.doc.wiki.controller;
package org.dromara.zyplayer.wiki.controller;
import cn.hutool.core.util.IdUtil;
import com.alibaba.fastjson.JSON;
@@ -6,24 +6,24 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zyplayer.doc.core.annotation.AuthMan;
import com.zyplayer.doc.core.json.DocResponseJson;
import com.zyplayer.doc.core.json.ResponseJson;
import com.zyplayer.doc.data.config.security.DocUserDetails;
import com.zyplayer.doc.data.config.security.DocUserUtil;
import com.zyplayer.doc.data.repository.manage.entity.UserGroupAuth;
import com.zyplayer.doc.data.repository.manage.entity.UserSetting;
import com.zyplayer.doc.data.repository.manage.entity.WikiSpace;
import com.zyplayer.doc.data.repository.manage.entity.WikiSpaceFavorite;
import com.zyplayer.doc.data.repository.support.consts.DocSysType;
import com.zyplayer.doc.data.repository.support.consts.UserSettingConst;
import com.zyplayer.doc.data.service.manage.UserGroupAuthService;
import com.zyplayer.doc.data.service.manage.UserSettingService;
import com.zyplayer.doc.data.service.manage.WikiSpaceFavoriteService;
import com.zyplayer.doc.data.service.manage.WikiSpaceService;
import com.zyplayer.doc.wiki.controller.vo.UserSpaceAuthVo;
import com.zyplayer.doc.wiki.controller.vo.WikiSpaceVo;
import com.zyplayer.doc.wiki.framework.consts.WikiAuthType;
import org.dromara.zyplayer.core.annotation.AuthMan;
import org.dromara.zyplayer.core.json.DocResponseJson;
import org.dromara.zyplayer.core.json.ResponseJson;
import org.dromara.zyplayer.data.config.security.DocUserDetails;
import org.dromara.zyplayer.data.config.security.DocUserUtil;
import org.dromara.zyplayer.data.repository.manage.entity.UserGroupAuth;
import org.dromara.zyplayer.data.repository.manage.entity.UserSetting;
import org.dromara.zyplayer.data.repository.manage.entity.WikiSpace;
import org.dromara.zyplayer.data.repository.manage.entity.WikiSpaceFavorite;
import org.dromara.zyplayer.data.repository.support.consts.DocSysType;
import org.dromara.zyplayer.data.repository.support.consts.UserSettingConst;
import org.dromara.zyplayer.data.service.manage.UserGroupAuthService;
import org.dromara.zyplayer.data.service.manage.UserSettingService;
import org.dromara.zyplayer.data.service.manage.WikiSpaceFavoriteService;
import org.dromara.zyplayer.data.service.manage.WikiSpaceService;
import org.dromara.zyplayer.wiki.controller.vo.UserSpaceAuthVo;
import org.dromara.zyplayer.wiki.controller.vo.WikiSpaceVo;
import org.dromara.zyplayer.wiki.framework.consts.WikiAuthType;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.CollectionUtils;

2
zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/vo/UserPageAuthVo.java → zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/controller/vo/UserPageAuthVo.java
View File

@@ -1,4 +1,4 @@
package com.zyplayer.doc.wiki.controller.vo;
package org.dromara.zyplayer.wiki.controller.vo;
import lombok.Data;

2
zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/vo/UserSpaceAuthVo.java → zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/controller/vo/UserSpaceAuthVo.java
View File

@@ -1,4 +1,4 @@
package com.zyplayer.doc.wiki.controller.vo;
package org.dromara.zyplayer.wiki.controller.vo;
import lombok.Data;

4
zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/vo/WikiPageCommentVo.java → zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/controller/vo/WikiPageCommentVo.java
View File

@@ -1,6 +1,6 @@
package com.zyplayer.doc.wiki.controller.vo;
package org.dromara.zyplayer.wiki.controller.vo;
import com.zyplayer.doc.data.repository.manage.entity.WikiPageComment;
import org.dromara.zyplayer.data.repository.manage.entity.WikiPageComment;
import lombok.Data;
import java.util.List;

8
zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/vo/WikiPageContentVo.java → zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/controller/vo/WikiPageContentVo.java
View File

@@ -1,8 +1,8 @@
package com.zyplayer.doc.wiki.controller.vo;
package org.dromara.zyplayer.wiki.controller.vo;
import com.zyplayer.doc.data.repository.manage.entity.WikiPage;
import com.zyplayer.doc.data.repository.manage.entity.WikiPageContent;
import com.zyplayer.doc.data.repository.manage.entity.WikiPageFile;
import org.dromara.zyplayer.data.repository.manage.entity.WikiPage;
import org.dromara.zyplayer.data.repository.manage.entity.WikiPageContent;
import org.dromara.zyplayer.data.repository.manage.entity.WikiPageFile;
import lombok.Data;
import java.util.List;

6
zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/vo/WikiPageVo.java → zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/controller/vo/WikiPageVo.java
View File

@@ -1,7 +1,7 @@
package com.zyplayer.doc.wiki.controller.vo;
package org.dromara.zyplayer.wiki.controller.vo;
import com.zyplayer.doc.data.repository.manage.entity.WikiPage;
import com.zyplayer.doc.data.repository.manage.vo.WikiPageTemplateInfoVo;
import org.dromara.zyplayer.data.repository.manage.entity.WikiPage;
import org.dromara.zyplayer.data.repository.manage.vo.WikiPageTemplateInfoVo;
import lombok.Data;
import java.util.Date;

4
zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/vo/WikiSpaceVo.java → zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/controller/vo/WikiSpaceVo.java
View File

@@ -1,6 +1,6 @@
package com.zyplayer.doc.wiki.controller.vo;
package org.dromara.zyplayer.wiki.controller.vo;
import com.zyplayer.doc.data.repository.manage.entity.WikiSpace;
import org.dromara.zyplayer.data.repository.manage.entity.WikiSpace;
import lombok.Data;
import java.util.Date;

110
zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/framework/common/MDToText.java → zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/framework/common/MDToText.java
View File

@@ -1,55 +1,55 @@
package com.zyplayer.doc.wiki.framework.common;
import org.commonmark.node.Node;
import org.commonmark.parser.Parser;
import org.commonmark.renderer.html.HtmlRenderer;
public class MDToText {
/**
* 去除html代码中含有的标签
* @param htmlStr
* @return
*/
private static String delHtmlTags(String htmlStr) {
//定义script的正则表达式，去除js可以防止注入
String scriptRegex="<script[^>]*?>[\\s\\S]*?<\\/script>";
//定义style的正则表达式，去除style样式，防止css代码过多时只截取到css样式代码
String styleRegex="<style[^>]*?>[\\s\\S]*?<\\/style>";
//定义HTML标签的正则表达式，去除标签，只提取文字内容
String htmlRegex="<[^>]+>";
//定义空格,回车,换行符,制表符
String spaceRegex = "\\s*|\t|\r|\n";
// 过滤script标签
htmlStr = htmlStr.replaceAll(scriptRegex, "");
// 过滤style标签
htmlStr = htmlStr.replaceAll(styleRegex, "");
// 过滤html标签
htmlStr = htmlStr.replaceAll(htmlRegex, "");
// 过滤空格等
htmlStr = htmlStr.replaceAll(spaceRegex, "");
return htmlStr.trim(); // 返回文本字符串
}
/**
* 获取HTML代码里的内容
* @param htmlStr
* @returnMARKDOWN取文本
*/
public static String getTextFromHtml(String htmlStr){
//去除html标签
htmlStr = delHtmlTags(htmlStr);
//去除空格" "
htmlStr = htmlStr.replaceAll(" ","");
return htmlStr;
}
public static String mdToText(String mdContent){
Parser parser = Parser.builder().build();
Node document = parser.parse(mdContent);
HtmlRenderer renderer = HtmlRenderer.builder().build();
String html= renderer.render(document);
return getTextFromHtml(html);
}
}
package org.dromara.zyplayer.wiki.framework.common;
import org.commonmark.node.Node;
import org.commonmark.parser.Parser;
import org.commonmark.renderer.html.HtmlRenderer;
public class MDToText {
/**
* 去除html代码中含有的标签
* @param htmlStr
* @return
*/
private static String delHtmlTags(String htmlStr) {
//定义script的正则表达式，去除js可以防止注入
String scriptRegex="<script[^>]*?>[\\s\\S]*?<\\/script>";
//定义style的正则表达式，去除style样式，防止css代码过多时只截取到css样式代码
String styleRegex="<style[^>]*?>[\\s\\S]*?<\\/style>";
//定义HTML标签的正则表达式，去除标签，只提取文字内容
String htmlRegex="<[^>]+>";
//定义空格,回车,换行符,制表符
String spaceRegex = "\\s*|\t|\r|\n";
// 过滤script标签
htmlStr = htmlStr.replaceAll(scriptRegex, "");
// 过滤style标签
htmlStr = htmlStr.replaceAll(styleRegex, "");
// 过滤html标签
htmlStr = htmlStr.replaceAll(htmlRegex, "");
// 过滤空格等
htmlStr = htmlStr.replaceAll(spaceRegex, "");
return htmlStr.trim(); // 返回文本字符串
}
/**
* 获取HTML代码里的内容
* @param htmlStr
* @returnMARKDOWN取文本
*/
public static String getTextFromHtml(String htmlStr){
//去除html标签
htmlStr = delHtmlTags(htmlStr);
//去除空格" "
htmlStr = htmlStr.replaceAll(" ","");
return htmlStr;
}
public static String mdToText(String mdContent){
Parser parser = Parser.builder().build();
Node document = parser.parse(mdContent);
HtmlRenderer renderer = HtmlRenderer.builder().build();
String html= renderer.render(document);
return getTextFromHtml(html);
}
}

2
zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/framework/config/CheckWikiFileSavePath.java → zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/framework/config/CheckWikiFileSavePath.java
View File

@@ -1,4 +1,4 @@
package com.zyplayer.doc.wiki.framework.config;
package org.dromara.zyplayer.wiki.framework.config;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;

4
zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/framework/config/EnableDocWiki.java → zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/framework/config/EnableDocWiki.java
View File

@@ -1,4 +1,4 @@
package com.zyplayer.doc.wiki.framework.config;
package org.dromara.zyplayer.wiki.framework.config;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
@@ -20,7 +20,7 @@ import java.lang.annotation.Target;
@Documented
@Configuration
@ComponentScan(basePackages = {
"com.zyplayer.doc.wiki",
"org.dromara.zyplayer.wiki",
})
public @interface EnableDocWiki {
}

2
zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/framework/consts/Const.java → zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/framework/consts/Const.java
View File

@@ -1,4 +1,4 @@
package com.zyplayer.doc.wiki.framework.consts;
package org.dromara.zyplayer.wiki.framework.consts;
import java.util.HashMap;
import java.util.Map;

2
zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/framework/consts/SpaceType.java → zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/framework/consts/SpaceType.java
View File

@@ -1,4 +1,4 @@
package com.zyplayer.doc.wiki.framework.consts;
package org.dromara.zyplayer.wiki.framework.consts;
import java.util.Objects;

2
zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/framework/consts/WikiAuthType.java → zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/framework/consts/WikiAuthType.java
View File

@@ -1,4 +1,4 @@
package com.zyplayer.doc.wiki.framework.consts;
package org.dromara.zyplayer.wiki.framework.consts;
/**
* wiki权限类型

30
zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/service/WikiPageFileServiceEx.java → zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/service/WikiPageFileServiceEx.java
View File

@@ -1,22 +1,22 @@
package com.zyplayer.doc.wiki.service;
package org.dromara.zyplayer.wiki.service;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.util.IdUtil;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.zyplayer.doc.core.json.DocResponseJson;
import com.zyplayer.doc.data.config.security.DocUserDetails;
import com.zyplayer.doc.data.config.security.DocUserUtil;
import com.zyplayer.doc.data.repository.manage.entity.UserMessage;
import com.zyplayer.doc.data.repository.manage.entity.WikiPage;
import com.zyplayer.doc.data.repository.manage.entity.WikiPageFile;
import com.zyplayer.doc.data.repository.manage.entity.WikiSpace;
import com.zyplayer.doc.data.repository.support.consts.DocSysType;
import com.zyplayer.doc.data.repository.support.consts.UserMsgType;
import com.zyplayer.doc.data.service.manage.UserMessageService;
import com.zyplayer.doc.data.service.manage.WikiPageFileService;
import com.zyplayer.doc.data.service.manage.WikiPageService;
import com.zyplayer.doc.data.service.manage.WikiSpaceService;
import com.zyplayer.doc.wiki.service.common.WikiPageAuthService;
import org.dromara.zyplayer.core.json.DocResponseJson;
import org.dromara.zyplayer.data.config.security.DocUserDetails;
import org.dromara.zyplayer.data.config.security.DocUserUtil;
import org.dromara.zyplayer.data.repository.manage.entity.UserMessage;
import org.dromara.zyplayer.data.repository.manage.entity.WikiPage;
import org.dromara.zyplayer.data.repository.manage.entity.WikiPageFile;
import org.dromara.zyplayer.data.repository.manage.entity.WikiSpace;
import org.dromara.zyplayer.data.repository.support.consts.DocSysType;
import org.dromara.zyplayer.data.repository.support.consts.UserMsgType;
import org.dromara.zyplayer.data.service.manage.UserMessageService;
import org.dromara.zyplayer.data.service.manage.WikiPageFileService;
import org.dromara.zyplayer.data.service.manage.WikiPageService;
import org.dromara.zyplayer.data.service.manage.WikiSpaceService;
import org.dromara.zyplayer.wiki.service.common.WikiPageAuthService;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;

30
zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/service/WikiPageUploadService.java → zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/service/WikiPageUploadService.java
View File

@@ -1,22 +1,22 @@
package com.zyplayer.doc.wiki.service;
package org.dromara.zyplayer.wiki.service;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.zyplayer.doc.core.exception.ConfirmException;
import com.zyplayer.doc.data.config.security.DocUserDetails;
import com.zyplayer.doc.data.config.security.DocUserUtil;
import com.zyplayer.doc.data.repository.manage.entity.UserMessage;
import com.zyplayer.doc.data.repository.manage.entity.WikiPage;
import com.zyplayer.doc.data.repository.manage.entity.WikiPageContent;
import com.zyplayer.doc.data.repository.manage.entity.WikiSpace;
import com.zyplayer.doc.data.repository.manage.mapper.WikiPageMapper;
import com.zyplayer.doc.data.repository.support.consts.DocSysType;
import com.zyplayer.doc.data.repository.support.consts.UserMsgType;
import com.zyplayer.doc.data.service.manage.*;
import com.zyplayer.doc.wiki.framework.common.MDToText;
import com.zyplayer.doc.wiki.framework.consts.SpaceType;
import com.zyplayer.doc.wiki.service.common.WikiPageAuthService;
import org.dromara.zyplayer.core.exception.ConfirmException;
import org.dromara.zyplayer.data.config.security.DocUserDetails;
import org.dromara.zyplayer.data.config.security.DocUserUtil;
import org.dromara.zyplayer.data.repository.manage.entity.UserMessage;
import org.dromara.zyplayer.data.repository.manage.entity.WikiPage;
import org.dromara.zyplayer.data.repository.manage.entity.WikiPageContent;
import org.dromara.zyplayer.data.repository.manage.entity.WikiSpace;
import org.dromara.zyplayer.data.repository.manage.mapper.WikiPageMapper;
import org.dromara.zyplayer.data.repository.support.consts.DocSysType;
import org.dromara.zyplayer.data.repository.support.consts.UserMsgType;
import org.dromara.zyplayer.wiki.framework.common.MDToText;
import org.dromara.zyplayer.wiki.framework.consts.SpaceType;
import org.dromara.zyplayer.wiki.service.common.WikiPageAuthService;
import lombok.RequiredArgsConstructor;
import org.apache.commons.lang3.StringUtils;
import org.dromara.zyplayer.data.service.manage.*;
import org.springframework.stereotype.Service;
import java.util.Date;

22
zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/service/WikiPageWebService.java → zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/service/WikiPageWebService.java
View File

@@ -1,4 +1,4 @@
package com.zyplayer.doc.wiki.service;
package org.dromara.zyplayer.wiki.service;
import cn.hutool.core.io.FileUtil;
import cn.hutool.core.io.file.FileNameUtil;
@@ -7,16 +7,16 @@ import cn.hutool.core.util.URLUtil;
import cn.hutool.http.HttpResponse;
import cn.hutool.http.HttpUtil;
import cn.hutool.system.SystemUtil;
import com.zyplayer.doc.core.json.DocResponseJson;
import com.zyplayer.doc.core.json.ResponseJson;
import com.zyplayer.doc.data.config.security.DocUserDetails;
import com.zyplayer.doc.data.config.security.DocUserUtil;
import com.zyplayer.doc.data.repository.manage.entity.WikiPage;
import com.zyplayer.doc.data.repository.manage.entity.WikiSpace;
import com.zyplayer.doc.data.service.manage.WikiPageService;
import com.zyplayer.doc.data.service.manage.WikiSpaceService;
import com.zyplayer.doc.data.utils.HtmlUtils;
import com.zyplayer.doc.wiki.framework.consts.SpaceType;
import org.dromara.zyplayer.core.json.DocResponseJson;
import org.dromara.zyplayer.core.json.ResponseJson;
import org.dromara.zyplayer.data.config.security.DocUserDetails;
import org.dromara.zyplayer.data.config.security.DocUserUtil;
import org.dromara.zyplayer.data.repository.manage.entity.WikiPage;
import org.dromara.zyplayer.data.repository.manage.entity.WikiSpace;
import org.dromara.zyplayer.data.service.manage.WikiPageService;
import org.dromara.zyplayer.data.service.manage.WikiSpaceService;
import org.dromara.zyplayer.data.utils.HtmlUtils;
import org.dromara.zyplayer.wiki.framework.consts.SpaceType;
import org.apache.commons.lang3.StringUtils;
import org.docx4j.XmlUtils;
import org.docx4j.openpackaging.packages.WordprocessingMLPackage;

16
zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/service/common/WikiPageAuthService.java → zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/service/common/WikiPageAuthService.java
View File

@@ -1,12 +1,12 @@
package com.zyplayer.doc.wiki.service.common;
package org.dromara.zyplayer.wiki.service.common;
import com.zyplayer.doc.data.config.security.DocUserUtil;
import com.zyplayer.doc.data.repository.manage.entity.WikiSpace;
import com.zyplayer.doc.data.repository.manage.mapper.UserGroupAuthMapper;
import com.zyplayer.doc.data.repository.support.consts.DocSysModuleType;
import com.zyplayer.doc.data.repository.support.consts.DocSysType;
import com.zyplayer.doc.wiki.framework.consts.SpaceType;
import com.zyplayer.doc.wiki.framework.consts.WikiAuthType;
import org.dromara.zyplayer.data.config.security.DocUserUtil;
import org.dromara.zyplayer.data.repository.manage.entity.WikiSpace;
import org.dromara.zyplayer.data.repository.manage.mapper.UserGroupAuthMapper;
import org.dromara.zyplayer.data.repository.support.consts.DocSysModuleType;
import org.dromara.zyplayer.data.repository.support.consts.DocSysType;
import org.dromara.zyplayer.wiki.framework.consts.SpaceType;
import org.dromara.zyplayer.wiki.framework.consts.WikiAuthType;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;