diff --git a/README.md b/README.md index ae6a37c6..66321345 100644 --- a/README.md +++ b/README.md @@ -47,7 +47,7 @@ create database zyplayer_doc; ## Main方法启动 1. 修改`zyplayer-doc-manage/src/main/resources/application.yml`配置文件里面的数据库账号密码 -2. 执行`com.zyplayer.doc.manage.Application.main`方法启动项目 +2. 执行`org.dromara.zyplayer.manage.Application.main`方法启动项目 ## JAR方式启动 1. 直接下载：直接下载编译好的jar打包文件，编译后的最新版可到 [发行版下载处](https://gitee.com/dromara/zyplayer-doc/releases) 去下载 diff --git a/pom.xml b/pom.xml index 6662c33b..d991871d 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - com.zyplayer + org.dromara zyplayer-doc 1.0.0 pom @@ -172,27 +172,27 @@ 1.17.2 - com.zyplayer + org.dromara zyplayer-doc-core ${zyplayer.doc.version} - com.zyplayer + org.dromara zyplayer-doc-data ${zyplayer.doc.version} - com.zyplayer + org.dromara zyplayer-doc-db ${zyplayer.doc.version} - com.zyplayer + org.dromara zyplayer-doc-api ${zyplayer.doc.version} - com.zyplayer + org.dromara zyplayer-doc-wiki ${zyplayer.doc.version} diff --git a/zyplayer-doc-api/pom.xml b/zyplayer-doc-api/pom.xml index e9493193..ded57335 100644 --- a/zyplayer-doc-api/pom.xml +++ b/zyplayer-doc-api/pom.xml @@ -22,7 +22,7 @@ - com.zyplayer + org.dromara zyplayer-doc 1.0.0 @@ -49,11 +49,11 @@ commons-fileupload - com.zyplayer + org.dromara zyplayer-doc-core - com.zyplayer + org.dromara zyplayer-doc-data diff --git a/zyplayer-doc-api/src/main/java/com/zyplayer/doc/api/controller/ApiCustomNodeController.java b/zyplayer-doc-api/src/main/java/org/dromara/zyplayer/api/controller/ApiCustomNodeController.java similarity index 88% rename from zyplayer-doc-api/src/main/java/com/zyplayer/doc/api/controller/ApiCustomNodeController.java rename to zyplayer-doc-api/src/main/java/org/dromara/zyplayer/api/controller/ApiCustomNodeController.java index 4ce90dcc..9e203264 100644 --- a/zyplayer-doc-api/src/main/java/com/zyplayer/doc/api/controller/ApiCustomNodeController.java +++ b/zyplayer-doc-api/src/main/java/org/dromara/zyplayer/api/controller/ApiCustomNodeController.java @@ -1,15 +1,16 @@ -package com.zyplayer.doc.api.controller; +package org.dromara.zyplayer.api.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.zyplayer.doc.api.controller.vo.ApiCustomParamsVo; -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.repository.manage.entity.*; -import com.zyplayer.doc.data.service.common.ApiDocAuthJudgeService; -import com.zyplayer.doc.data.service.manage.ApiCustomNodeService; -import com.zyplayer.doc.data.service.manage.ApiCustomParamsService; +import org.dromara.zyplayer.api.controller.vo.ApiCustomParamsVo; +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.repository.manage.entity.ApiCustomNode; +import org.dromara.zyplayer.data.repository.manage.entity.ApiCustomParams; +import org.dromara.zyplayer.data.service.common.ApiDocAuthJudgeService; +import org.dromara.zyplayer.data.service.manage.ApiCustomNodeService; +import org.dromara.zyplayer.data.service.manage.ApiCustomParamsService; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.PostMapping; diff --git a/zyplayer-doc-api/src/main/java/com/zyplayer/doc/api/controller/ApiDocAuthController.java b/zyplayer-doc-api/src/main/java/org/dromara/zyplayer/api/controller/ApiDocAuthController.java similarity index 79% rename from zyplayer-doc-api/src/main/java/com/zyplayer/doc/api/controller/ApiDocAuthController.java rename to zyplayer-doc-api/src/main/java/org/dromara/zyplayer/api/controller/ApiDocAuthController.java index 39f06937..7ae866c3 100644 --- a/zyplayer-doc-api/src/main/java/com/zyplayer/doc/api/controller/ApiDocAuthController.java +++ b/zyplayer-doc-api/src/main/java/org/dromara/zyplayer/api/controller/ApiDocAuthController.java @@ -1,20 +1,22 @@ -package com.zyplayer.doc.api.controller; +package org.dromara.zyplayer.api.controller; -import com.zyplayer.doc.api.controller.vo.DocUserAuthVo; -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.support.consts.ApiAuthType; -import com.zyplayer.doc.data.repository.support.consts.DocSysModuleType; -import com.zyplayer.doc.data.repository.support.consts.DocSysType; -import com.zyplayer.doc.data.service.common.ApiDocAuthJudgeService; -import com.zyplayer.doc.data.service.manage.ApiDocService; -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 org.dromara.zyplayer.api.controller.vo.DocUserAuthVo; +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.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.support.consts.ApiAuthType; +import org.dromara.zyplayer.data.repository.support.consts.DocSysModuleType; +import org.dromara.zyplayer.data.repository.support.consts.DocSysType; +import org.dromara.zyplayer.data.service.common.ApiDocAuthJudgeService; +import org.dromara.zyplayer.data.service.manage.ApiDocService; +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.apache.commons.collections.CollectionUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/zyplayer-doc-api/src/main/java/com/zyplayer/doc/api/controller/ApiDocumentController.java b/zyplayer-doc-api/src/main/java/org/dromara/zyplayer/api/controller/ApiDocumentController.java similarity index 88% rename from zyplayer-doc-api/src/main/java/com/zyplayer/doc/api/controller/ApiDocumentController.java rename to zyplayer-doc-api/src/main/java/org/dromara/zyplayer/api/controller/ApiDocumentController.java index 8487f507..313d9809 100644 --- a/zyplayer-doc-api/src/main/java/com/zyplayer/doc/api/controller/ApiDocumentController.java +++ b/zyplayer-doc-api/src/main/java/org/dromara/zyplayer/api/controller/ApiDocumentController.java @@ -1,23 +1,23 @@ -package com.zyplayer.doc.api.controller; +package org.dromara.zyplayer.api.controller; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.IdUtil; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.zyplayer.doc.api.framework.utils.SwaggerDocUtil; -import com.zyplayer.doc.api.service.SwaggerHttpRequestService; -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.ApiDoc; -import com.zyplayer.doc.data.repository.manage.vo.ApiCustomDocVo; -import com.zyplayer.doc.data.repository.manage.vo.ApiDocVo; -import com.zyplayer.doc.data.repository.support.consts.ApiAuthType; -import com.zyplayer.doc.data.service.common.ApiDocAuthJudgeService; -import com.zyplayer.doc.data.service.manage.ApiCustomNodeService; -import com.zyplayer.doc.data.service.manage.ApiDocService; +import org.dromara.zyplayer.api.framework.utils.SwaggerDocUtil; +import org.dromara.zyplayer.api.service.SwaggerHttpRequestService; +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.ApiDoc; +import org.dromara.zyplayer.data.repository.manage.vo.ApiCustomDocVo; +import org.dromara.zyplayer.data.repository.manage.vo.ApiDocVo; +import org.dromara.zyplayer.data.repository.support.consts.ApiAuthType; +import org.dromara.zyplayer.data.service.common.ApiDocAuthJudgeService; +import org.dromara.zyplayer.data.service.manage.ApiCustomNodeService; +import org.dromara.zyplayer.data.service.manage.ApiDocService; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/zyplayer-doc-api/src/main/java/com/zyplayer/doc/api/controller/ApiGlobalParamController.java b/zyplayer-doc-api/src/main/java/org/dromara/zyplayer/api/controller/ApiGlobalParamController.java similarity index 86% rename from zyplayer-doc-api/src/main/java/com/zyplayer/doc/api/controller/ApiGlobalParamController.java rename to zyplayer-doc-api/src/main/java/org/dromara/zyplayer/api/controller/ApiGlobalParamController.java index 5b2190b5..a2f25128 100644 --- a/zyplayer-doc-api/src/main/java/com/zyplayer/doc/api/controller/ApiGlobalParamController.java +++ b/zyplayer-doc-api/src/main/java/org/dromara/zyplayer/api/controller/ApiGlobalParamController.java @@ -1,15 +1,15 @@ -package com.zyplayer.doc.api.controller; +package org.dromara.zyplayer.api.controller; 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.repository.manage.entity.ApiDoc; -import com.zyplayer.doc.data.repository.manage.entity.ApiGlobalParam; -import com.zyplayer.doc.data.service.common.ApiDocAuthJudgeService; -import com.zyplayer.doc.data.service.manage.ApiGlobalParamService; +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.ApiDoc; +import org.dromara.zyplayer.data.repository.manage.entity.ApiGlobalParam; +import org.dromara.zyplayer.data.service.common.ApiDocAuthJudgeService; +import org.dromara.zyplayer.data.service.manage.ApiGlobalParamService; import org.apache.commons.collections.CollectionUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/zyplayer-doc-api/src/main/java/com/zyplayer/doc/api/controller/ApiPoxyRequestController.java b/zyplayer-doc-api/src/main/java/org/dromara/zyplayer/api/controller/ApiPoxyRequestController.java similarity index 80% rename from zyplayer-doc-api/src/main/java/com/zyplayer/doc/api/controller/ApiPoxyRequestController.java rename to zyplayer-doc-api/src/main/java/org/dromara/zyplayer/api/controller/ApiPoxyRequestController.java index 3bcb2ef5..7d0e6eb3 100644 --- a/zyplayer-doc-api/src/main/java/com/zyplayer/doc/api/controller/ApiPoxyRequestController.java +++ b/zyplayer-doc-api/src/main/java/org/dromara/zyplayer/api/controller/ApiPoxyRequestController.java @@ -1,14 +1,14 @@ -package com.zyplayer.doc.api.controller; +package org.dromara.zyplayer.api.controller; -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.api.controller.param.ProxyRequestParam; -import com.zyplayer.doc.api.controller.vo.ProxyRequestResultVo; -import com.zyplayer.doc.api.service.SwaggerHttpRequestService; -import com.zyplayer.doc.data.repository.manage.entity.ApiCustomNode; -import com.zyplayer.doc.data.repository.manage.entity.ApiCustomParams; -import com.zyplayer.doc.data.service.manage.ApiCustomNodeService; +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.api.controller.param.ProxyRequestParam; +import org.dromara.zyplayer.api.controller.vo.ProxyRequestResultVo; +import org.dromara.zyplayer.api.service.SwaggerHttpRequestService; +import org.dromara.zyplayer.data.repository.manage.entity.ApiCustomNode; +import org.dromara.zyplayer.data.repository.manage.entity.ApiCustomParams; +import org.dromara.zyplayer.data.service.manage.ApiCustomNodeService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.web.bind.annotation.PostMapping; diff --git a/zyplayer-doc-api/src/main/java/com/zyplayer/doc/api/controller/ApiRequestParamController.java b/zyplayer-doc-api/src/main/java/org/dromara/zyplayer/api/controller/ApiRequestParamController.java similarity index 79% rename from zyplayer-doc-api/src/main/java/com/zyplayer/doc/api/controller/ApiRequestParamController.java rename to zyplayer-doc-api/src/main/java/org/dromara/zyplayer/api/controller/ApiRequestParamController.java index cca4e46f..22e6c259 100644 --- a/zyplayer-doc-api/src/main/java/com/zyplayer/doc/api/controller/ApiRequestParamController.java +++ b/zyplayer-doc-api/src/main/java/org/dromara/zyplayer/api/controller/ApiRequestParamController.java @@ -1,14 +1,14 @@ -package com.zyplayer.doc.api.controller; +package org.dromara.zyplayer.api.controller; 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.repository.manage.entity.ApiDoc; -import com.zyplayer.doc.data.repository.manage.entity.ApiRequestParam; -import com.zyplayer.doc.data.service.manage.ApiRequestParamService; +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.ApiDoc; +import org.dromara.zyplayer.data.repository.manage.entity.ApiRequestParam; +import org.dromara.zyplayer.data.service.manage.ApiRequestParamService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.web.bind.annotation.PostMapping; diff --git a/zyplayer-doc-api/src/main/java/com/zyplayer/doc/api/controller/ApiShareDocumentController.java b/zyplayer-doc-api/src/main/java/org/dromara/zyplayer/api/controller/ApiShareDocumentController.java similarity index 84% rename from zyplayer-doc-api/src/main/java/com/zyplayer/doc/api/controller/ApiShareDocumentController.java rename to zyplayer-doc-api/src/main/java/org/dromara/zyplayer/api/controller/ApiShareDocumentController.java index b7e2a435..513c90dc 100644 --- a/zyplayer-doc-api/src/main/java/com/zyplayer/doc/api/controller/ApiShareDocumentController.java +++ b/zyplayer-doc-api/src/main/java/org/dromara/zyplayer/api/controller/ApiShareDocumentController.java @@ -1,11 +1,11 @@ -package com.zyplayer.doc.api.controller; +package org.dromara.zyplayer.api.controller; -import com.zyplayer.doc.api.framework.utils.SwaggerDocUtil; -import com.zyplayer.doc.api.service.SwaggerHttpRequestService; -import com.zyplayer.doc.core.json.DocResponseJson; -import com.zyplayer.doc.core.json.ResponseJson; -import com.zyplayer.doc.data.repository.manage.entity.ApiDoc; -import com.zyplayer.doc.data.service.manage.ApiDocService; +import org.dromara.zyplayer.api.framework.utils.SwaggerDocUtil; +import org.dromara.zyplayer.api.service.SwaggerHttpRequestService; +import org.dromara.zyplayer.core.json.DocResponseJson; +import org.dromara.zyplayer.core.json.ResponseJson; +import org.dromara.zyplayer.data.repository.manage.entity.ApiDoc; +import org.dromara.zyplayer.data.service.manage.ApiDocService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.web.bind.annotation.PostMapping; diff --git a/zyplayer-doc-api/src/main/java/com/zyplayer/doc/api/controller/ApiSwaggerProxyController.java b/zyplayer-doc-api/src/main/java/org/dromara/zyplayer/api/controller/ApiSwaggerProxyController.java similarity index 86% rename from zyplayer-doc-api/src/main/java/com/zyplayer/doc/api/controller/ApiSwaggerProxyController.java rename to zyplayer-doc-api/src/main/java/org/dromara/zyplayer/api/controller/ApiSwaggerProxyController.java index 5b1e1a8e..60818bd8 100644 --- a/zyplayer-doc-api/src/main/java/com/zyplayer/doc/api/controller/ApiSwaggerProxyController.java +++ b/zyplayer-doc-api/src/main/java/org/dromara/zyplayer/api/controller/ApiSwaggerProxyController.java @@ -1,14 +1,14 @@ -package com.zyplayer.doc.api.controller; +package org.dromara.zyplayer.api.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.zyplayer.doc.core.annotation.AuthMan; -import com.zyplayer.doc.core.exception.ConfirmException; -import com.zyplayer.doc.core.json.DocResponseJson; -import com.zyplayer.doc.data.repository.manage.entity.ApiDoc; -import com.zyplayer.doc.data.service.manage.ApiDocService; -import com.zyplayer.doc.api.controller.vo.SwaggerResourceVo; -import com.zyplayer.doc.api.framework.utils.SwaggerDocUtil; -import com.zyplayer.doc.api.service.SwaggerHttpRequestService; +import org.dromara.zyplayer.core.annotation.AuthMan; +import org.dromara.zyplayer.core.exception.ConfirmException; +import org.dromara.zyplayer.core.json.DocResponseJson; +import org.dromara.zyplayer.data.repository.manage.entity.ApiDoc; +import org.dromara.zyplayer.data.service.manage.ApiDocService; +import org.dromara.zyplayer.api.controller.vo.SwaggerResourceVo; +import org.dromara.zyplayer.api.framework.utils.SwaggerDocUtil; +import org.dromara.zyplayer.api.service.SwaggerHttpRequestService; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.util.MimeTypeUtils; diff --git a/zyplayer-doc-api/src/main/java/com/zyplayer/doc/api/controller/param/ParamData.java b/zyplayer-doc-api/src/main/java/org/dromara/zyplayer/api/controller/param/ParamData.java similarity index 77% rename from zyplayer-doc-api/src/main/java/com/zyplayer/doc/api/controller/param/ParamData.java rename to zyplayer-doc-api/src/main/java/org/dromara/zyplayer/api/controller/param/ParamData.java index f587f021..9eb19648 100644 --- a/zyplayer-doc-api/src/main/java/com/zyplayer/doc/api/controller/param/ParamData.java +++ b/zyplayer-doc-api/src/main/java/org/dromara/zyplayer/api/controller/param/ParamData.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.api.controller.param; +package org.dromara.zyplayer.api.controller.param; import lombok.Data; diff --git a/zyplayer-doc-api/src/main/java/com/zyplayer/doc/api/controller/param/ProxyRequestParam.java b/zyplayer-doc-api/src/main/java/org/dromara/zyplayer/api/controller/param/ProxyRequestParam.java similarity index 94% rename from zyplayer-doc-api/src/main/java/com/zyplayer/doc/api/controller/param/ProxyRequestParam.java rename to zyplayer-doc-api/src/main/java/org/dromara/zyplayer/api/controller/param/ProxyRequestParam.java index a7c8510e..546b5f7b 100644 --- a/zyplayer-doc-api/src/main/java/com/zyplayer/doc/api/controller/param/ProxyRequestParam.java +++ b/zyplayer-doc-api/src/main/java/org/dromara/zyplayer/api/controller/param/ProxyRequestParam.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.api.controller.param; +package org.dromara.zyplayer.api.controller.param; import com.alibaba.fastjson.JSON; import lombok.Data; diff --git a/zyplayer-doc-api/src/main/java/com/zyplayer/doc/api/controller/vo/ApiCustomParamsVo.java b/zyplayer-doc-api/src/main/java/org/dromara/zyplayer/api/controller/vo/ApiCustomParamsVo.java similarity index 94% rename from zyplayer-doc-api/src/main/java/com/zyplayer/doc/api/controller/vo/ApiCustomParamsVo.java rename to zyplayer-doc-api/src/main/java/org/dromara/zyplayer/api/controller/vo/ApiCustomParamsVo.java index 49431f1b..790a1252 100644 --- a/zyplayer-doc-api/src/main/java/com/zyplayer/doc/api/controller/vo/ApiCustomParamsVo.java +++ b/zyplayer-doc-api/src/main/java/org/dromara/zyplayer/api/controller/vo/ApiCustomParamsVo.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.api.controller.vo; +package org.dromara.zyplayer.api.controller.vo; import lombok.Data; diff --git a/zyplayer-doc-api/src/main/java/com/zyplayer/doc/api/controller/vo/ApiDocVo.java b/zyplayer-doc-api/src/main/java/org/dromara/zyplayer/api/controller/vo/ApiDocVo.java similarity index 95% rename from zyplayer-doc-api/src/main/java/com/zyplayer/doc/api/controller/vo/ApiDocVo.java rename to zyplayer-doc-api/src/main/java/org/dromara/zyplayer/api/controller/vo/ApiDocVo.java index 48a3953c..63e05839 100644 --- a/zyplayer-doc-api/src/main/java/com/zyplayer/doc/api/controller/vo/ApiDocVo.java +++ b/zyplayer-doc-api/src/main/java/org/dromara/zyplayer/api/controller/vo/ApiDocVo.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.api.controller.vo; +package org.dromara.zyplayer.api.controller.vo; import lombok.Data; diff --git a/zyplayer-doc-api/src/main/java/com/zyplayer/doc/api/controller/vo/DocUserAuthVo.java b/zyplayer-doc-api/src/main/java/org/dromara/zyplayer/api/controller/vo/DocUserAuthVo.java similarity index 91% rename from zyplayer-doc-api/src/main/java/com/zyplayer/doc/api/controller/vo/DocUserAuthVo.java rename to zyplayer-doc-api/src/main/java/org/dromara/zyplayer/api/controller/vo/DocUserAuthVo.java index ce4cde02..e38c62a4 100644 --- a/zyplayer-doc-api/src/main/java/com/zyplayer/doc/api/controller/vo/DocUserAuthVo.java +++ b/zyplayer-doc-api/src/main/java/org/dromara/zyplayer/api/controller/vo/DocUserAuthVo.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.api.controller.vo; +package org.dromara.zyplayer.api.controller.vo; import lombok.Data; diff --git a/zyplayer-doc-api/src/main/java/com/zyplayer/doc/api/controller/vo/HttpCookieVo.java b/zyplayer-doc-api/src/main/java/org/dromara/zyplayer/api/controller/vo/HttpCookieVo.java similarity index 86% rename from zyplayer-doc-api/src/main/java/com/zyplayer/doc/api/controller/vo/HttpCookieVo.java rename to zyplayer-doc-api/src/main/java/org/dromara/zyplayer/api/controller/vo/HttpCookieVo.java index cae33b5d..eafaf4d9 100644 --- a/zyplayer-doc-api/src/main/java/com/zyplayer/doc/api/controller/vo/HttpCookieVo.java +++ b/zyplayer-doc-api/src/main/java/org/dromara/zyplayer/api/controller/vo/HttpCookieVo.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.api.controller.vo; +package org.dromara.zyplayer.api.controller.vo; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/zyplayer-doc-api/src/main/java/com/zyplayer/doc/api/controller/vo/HttpHeaderVo.java b/zyplayer-doc-api/src/main/java/org/dromara/zyplayer/api/controller/vo/HttpHeaderVo.java similarity index 80% rename from zyplayer-doc-api/src/main/java/com/zyplayer/doc/api/controller/vo/HttpHeaderVo.java rename to zyplayer-doc-api/src/main/java/org/dromara/zyplayer/api/controller/vo/HttpHeaderVo.java index 87ec2806..7a1da100 100644 --- a/zyplayer-doc-api/src/main/java/com/zyplayer/doc/api/controller/vo/HttpHeaderVo.java +++ b/zyplayer-doc-api/src/main/java/org/dromara/zyplayer/api/controller/vo/HttpHeaderVo.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.api.controller.vo; +package org.dromara.zyplayer.api.controller.vo; import lombok.Data; diff --git a/zyplayer-doc-api/src/main/java/com/zyplayer/doc/api/controller/vo/ProxyRequestResultVo.java b/zyplayer-doc-api/src/main/java/org/dromara/zyplayer/api/controller/vo/ProxyRequestResultVo.java similarity index 88% rename from zyplayer-doc-api/src/main/java/com/zyplayer/doc/api/controller/vo/ProxyRequestResultVo.java rename to zyplayer-doc-api/src/main/java/org/dromara/zyplayer/api/controller/vo/ProxyRequestResultVo.java index 5d4e7a4a..caaebef2 100644 --- a/zyplayer-doc-api/src/main/java/com/zyplayer/doc/api/controller/vo/ProxyRequestResultVo.java +++ b/zyplayer-doc-api/src/main/java/org/dromara/zyplayer/api/controller/vo/ProxyRequestResultVo.java @@ -1,5 +1,5 @@ -package com.zyplayer.doc.api.controller.vo; +package org.dromara.zyplayer.api.controller.vo; import lombok.Data; diff --git a/zyplayer-doc-api/src/main/java/com/zyplayer/doc/api/controller/vo/SwaggerResourceVo.java b/zyplayer-doc-api/src/main/java/org/dromara/zyplayer/api/controller/vo/SwaggerResourceVo.java similarity index 92% rename from zyplayer-doc-api/src/main/java/com/zyplayer/doc/api/controller/vo/SwaggerResourceVo.java rename to zyplayer-doc-api/src/main/java/org/dromara/zyplayer/api/controller/vo/SwaggerResourceVo.java index c5ad8671..e5d7d6b2 100644 --- a/zyplayer-doc-api/src/main/java/com/zyplayer/doc/api/controller/vo/SwaggerResourceVo.java +++ b/zyplayer-doc-api/src/main/java/org/dromara/zyplayer/api/controller/vo/SwaggerResourceVo.java @@ -1,5 +1,5 @@ -package com.zyplayer.doc.api.controller.vo; +package org.dromara.zyplayer.api.controller.vo; import com.google.common.collect.ComparisonChain; import lombok.Data; diff --git a/zyplayer-doc-api/src/main/java/com/zyplayer/doc/api/framework/config/EnableDocApi.java b/zyplayer-doc-api/src/main/java/org/dromara/zyplayer/api/framework/config/EnableDocApi.java similarity index 83% rename from zyplayer-doc-api/src/main/java/com/zyplayer/doc/api/framework/config/EnableDocApi.java rename to zyplayer-doc-api/src/main/java/org/dromara/zyplayer/api/framework/config/EnableDocApi.java index 8a3a5efd..867c4163 100644 --- a/zyplayer-doc-api/src/main/java/com/zyplayer/doc/api/framework/config/EnableDocApi.java +++ b/zyplayer-doc-api/src/main/java/org/dromara/zyplayer/api/framework/config/EnableDocApi.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.api.framework.config; +package org.dromara.zyplayer.api.framework.config; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; @@ -16,7 +16,7 @@ import java.lang.annotation.*; @Documented @Configuration @ComponentScan(basePackages = { - "com.zyplayer.doc.api", + "org.dromara.zyplayer.api", }) public @interface EnableDocApi { diff --git a/zyplayer-doc-api/src/main/java/com/zyplayer/doc/api/framework/utils/SwaggerDocUtil.java b/zyplayer-doc-api/src/main/java/org/dromara/zyplayer/api/framework/utils/SwaggerDocUtil.java similarity index 96% rename from zyplayer-doc-api/src/main/java/com/zyplayer/doc/api/framework/utils/SwaggerDocUtil.java rename to zyplayer-doc-api/src/main/java/org/dromara/zyplayer/api/framework/utils/SwaggerDocUtil.java index 2e7fa78f..02af2597 100644 --- a/zyplayer-doc-api/src/main/java/com/zyplayer/doc/api/framework/utils/SwaggerDocUtil.java +++ b/zyplayer-doc-api/src/main/java/org/dromara/zyplayer/api/framework/utils/SwaggerDocUtil.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.api.framework.utils; +package org.dromara.zyplayer.api.framework.utils; /** * swagger文档工具类 diff --git a/zyplayer-doc-api/src/main/java/com/zyplayer/doc/api/service/SwaggerHttpRequestService.java b/zyplayer-doc-api/src/main/java/org/dromara/zyplayer/api/service/SwaggerHttpRequestService.java similarity index 94% rename from zyplayer-doc-api/src/main/java/com/zyplayer/doc/api/service/SwaggerHttpRequestService.java rename to zyplayer-doc-api/src/main/java/org/dromara/zyplayer/api/service/SwaggerHttpRequestService.java index 376f3b46..9ddd6440 100644 --- a/zyplayer-doc-api/src/main/java/com/zyplayer/doc/api/service/SwaggerHttpRequestService.java +++ b/zyplayer-doc-api/src/main/java/org/dromara/zyplayer/api/service/SwaggerHttpRequestService.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.api.service; +package org.dromara.zyplayer.api.service; import cn.hutool.core.io.resource.BytesResource; import cn.hutool.core.io.resource.MultiResource; @@ -6,14 +6,14 @@ import cn.hutool.http.HttpRequest; import cn.hutool.http.HttpResponse; import cn.hutool.http.HttpUtil; import cn.hutool.http.Method; -import com.zyplayer.doc.api.controller.param.ProxyRequestParam; -import com.zyplayer.doc.api.controller.vo.HttpCookieVo; -import com.zyplayer.doc.api.controller.vo.HttpHeaderVo; -import com.zyplayer.doc.api.controller.vo.ProxyRequestResultVo; -import com.zyplayer.doc.api.framework.utils.SwaggerDocUtil; -import com.zyplayer.doc.core.exception.ConfirmException; -import com.zyplayer.doc.data.repository.manage.entity.ApiGlobalParam; -import com.zyplayer.doc.data.service.manage.ApiGlobalParamService; +import org.dromara.zyplayer.api.controller.param.ProxyRequestParam; +import org.dromara.zyplayer.api.controller.vo.HttpCookieVo; +import org.dromara.zyplayer.api.controller.vo.HttpHeaderVo; +import org.dromara.zyplayer.api.controller.vo.ProxyRequestResultVo; +import org.dromara.zyplayer.api.framework.utils.SwaggerDocUtil; +import org.dromara.zyplayer.core.exception.ConfirmException; +import org.dromara.zyplayer.data.repository.manage.entity.ApiGlobalParam; +import org.dromara.zyplayer.data.service.manage.ApiGlobalParamService; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.MapUtils; import org.apache.commons.lang3.ArrayUtils; diff --git a/zyplayer-doc-core/pom.xml b/zyplayer-doc-core/pom.xml index 46df66fd..d5fdeb14 100644 --- a/zyplayer-doc-core/pom.xml +++ b/zyplayer-doc-core/pom.xml @@ -7,7 +7,7 @@ zyplayer-doc-core - com.zyplayer + org.dromara zyplayer-doc 1.0.0 diff --git a/zyplayer-doc-core/src/main/java/com/zyplayer/doc/core/annotation/AuthMan.java b/zyplayer-doc-core/src/main/java/org/dromara/zyplayer/core/annotation/AuthMan.java similarity index 87% rename from zyplayer-doc-core/src/main/java/com/zyplayer/doc/core/annotation/AuthMan.java rename to zyplayer-doc-core/src/main/java/org/dromara/zyplayer/core/annotation/AuthMan.java index 2ac3917e..030bc0bb 100644 --- a/zyplayer-doc-core/src/main/java/com/zyplayer/doc/core/annotation/AuthMan.java +++ b/zyplayer-doc-core/src/main/java/org/dromara/zyplayer/core/annotation/AuthMan.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.core.annotation; +package org.dromara.zyplayer.core.annotation; import java.lang.annotation.*; diff --git a/zyplayer-doc-core/src/main/java/com/zyplayer/doc/core/enums/PageFileSource.java b/zyplayer-doc-core/src/main/java/org/dromara/zyplayer/core/enums/PageFileSource.java similarity index 90% rename from zyplayer-doc-core/src/main/java/com/zyplayer/doc/core/enums/PageFileSource.java rename to zyplayer-doc-core/src/main/java/org/dromara/zyplayer/core/enums/PageFileSource.java index 965455cf..899a0d14 100644 --- a/zyplayer-doc-core/src/main/java/com/zyplayer/doc/core/enums/PageFileSource.java +++ b/zyplayer-doc-core/src/main/java/org/dromara/zyplayer/core/enums/PageFileSource.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.core.enums; +package org.dromara.zyplayer.core.enums; import lombok.Getter; diff --git a/zyplayer-doc-core/src/main/java/com/zyplayer/doc/core/enums/SystemConfigEnum.java b/zyplayer-doc-core/src/main/java/org/dromara/zyplayer/core/enums/SystemConfigEnum.java similarity index 95% rename from zyplayer-doc-core/src/main/java/com/zyplayer/doc/core/enums/SystemConfigEnum.java rename to zyplayer-doc-core/src/main/java/org/dromara/zyplayer/core/enums/SystemConfigEnum.java index 719c14e8..5020ae93 100644 --- a/zyplayer-doc-core/src/main/java/com/zyplayer/doc/core/enums/SystemConfigEnum.java +++ b/zyplayer-doc-core/src/main/java/org/dromara/zyplayer/core/enums/SystemConfigEnum.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.core.enums; +package org.dromara.zyplayer.core.enums; import java.util.Map; import java.util.stream.Collectors; diff --git a/zyplayer-doc-core/src/main/java/com/zyplayer/doc/core/exception/ConfirmException.java b/zyplayer-doc-core/src/main/java/org/dromara/zyplayer/core/exception/ConfirmException.java similarity index 90% rename from zyplayer-doc-core/src/main/java/com/zyplayer/doc/core/exception/ConfirmException.java rename to zyplayer-doc-core/src/main/java/org/dromara/zyplayer/core/exception/ConfirmException.java index 2c59458b..742d11f5 100644 --- a/zyplayer-doc-core/src/main/java/com/zyplayer/doc/core/exception/ConfirmException.java +++ b/zyplayer-doc-core/src/main/java/org/dromara/zyplayer/core/exception/ConfirmException.java @@ -1,33 +1,33 @@ -package com.zyplayer.doc.core.exception; - -/** - * 前端提示异常 - * - * @author 暮光：城中城 - * @since 2018年12月8日 - */ -public class ConfirmException extends RuntimeException { - - private static final long serialVersionUID = -7084066605197111614L; - - public ConfirmException() { - super(); - } - - public ConfirmException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) { - super(message, cause, enableSuppression, writableStackTrace); - } - - public ConfirmException(String message, Throwable cause) { - super(message, cause); - } - - public ConfirmException(String message) { - super(message); - } - - public ConfirmException(Throwable cause) { - super(cause); - } - -} +package org.dromara.zyplayer.core.exception; + +/** + * 前端提示异常 + * + * @author 暮光：城中城 + * @since 2018年12月8日 + */ +public class ConfirmException extends RuntimeException { + + private static final long serialVersionUID = -7084066605197111614L; + + public ConfirmException() { + super(); + } + + public ConfirmException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) { + super(message, cause, enableSuppression, writableStackTrace); + } + + public ConfirmException(String message, Throwable cause) { + super(message, cause); + } + + public ConfirmException(String message) { + super(message); + } + + public ConfirmException(Throwable cause) { + super(cause); + } + +} diff --git a/zyplayer-doc-core/src/main/java/com/zyplayer/doc/core/json/DocResponseJson.java b/zyplayer-doc-core/src/main/java/org/dromara/zyplayer/core/json/DocResponseJson.java similarity index 99% rename from zyplayer-doc-core/src/main/java/com/zyplayer/doc/core/json/DocResponseJson.java rename to zyplayer-doc-core/src/main/java/org/dromara/zyplayer/core/json/DocResponseJson.java index 5bd4be8d..3f7cb5e4 100644 --- a/zyplayer-doc-core/src/main/java/com/zyplayer/doc/core/json/DocResponseJson.java +++ b/zyplayer-doc-core/src/main/java/org/dromara/zyplayer/core/json/DocResponseJson.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.core.json; +package org.dromara.zyplayer.core.json; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.annotation.JSONField; diff --git a/zyplayer-doc-core/src/main/java/com/zyplayer/doc/core/json/HttpConst.java b/zyplayer-doc-core/src/main/java/org/dromara/zyplayer/core/json/HttpConst.java similarity index 88% rename from zyplayer-doc-core/src/main/java/com/zyplayer/doc/core/json/HttpConst.java rename to zyplayer-doc-core/src/main/java/org/dromara/zyplayer/core/json/HttpConst.java index cfdef5a3..05341b0b 100644 --- a/zyplayer-doc-core/src/main/java/com/zyplayer/doc/core/json/HttpConst.java +++ b/zyplayer-doc-core/src/main/java/org/dromara/zyplayer/core/json/HttpConst.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.core.json; +package org.dromara.zyplayer.core.json; /** * http静态资源定义 diff --git a/zyplayer-doc-core/src/main/java/com/zyplayer/doc/core/json/ResponseJson.java b/zyplayer-doc-core/src/main/java/org/dromara/zyplayer/core/json/ResponseJson.java similarity index 72% rename from zyplayer-doc-core/src/main/java/com/zyplayer/doc/core/json/ResponseJson.java rename to zyplayer-doc-core/src/main/java/org/dromara/zyplayer/core/json/ResponseJson.java index c36dd024..381d8d85 100644 --- a/zyplayer-doc-core/src/main/java/com/zyplayer/doc/core/json/ResponseJson.java +++ b/zyplayer-doc-core/src/main/java/org/dromara/zyplayer/core/json/ResponseJson.java @@ -1,11 +1,11 @@ -package com.zyplayer.doc.core.json; - -/** - * json视图 - * - * @author 暮光：城中城 - * @since 2018年8月21日 - */ -public interface ResponseJson { - -} +package org.dromara.zyplayer.core.json; + +/** + * json视图 + * + * @author 暮光：城中城 + * @since 2018年8月21日 + */ +public interface ResponseJson { + +} diff --git a/zyplayer-doc-core/src/main/java/com/zyplayer/doc/core/util/UpgradeInfo.java b/zyplayer-doc-core/src/main/java/org/dromara/zyplayer/core/util/UpgradeInfo.java similarity index 87% rename from zyplayer-doc-core/src/main/java/com/zyplayer/doc/core/util/UpgradeInfo.java rename to zyplayer-doc-core/src/main/java/org/dromara/zyplayer/core/util/UpgradeInfo.java index 9c0d795f..ceadf2eb 100644 --- a/zyplayer-doc-core/src/main/java/com/zyplayer/doc/core/util/UpgradeInfo.java +++ b/zyplayer-doc-core/src/main/java/org/dromara/zyplayer/core/util/UpgradeInfo.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.core.util; +package org.dromara.zyplayer.core.util; import lombok.Data; diff --git a/zyplayer-doc-core/src/main/java/com/zyplayer/doc/core/util/ZyplayerDocVersion.java b/zyplayer-doc-core/src/main/java/org/dromara/zyplayer/core/util/ZyplayerDocVersion.java similarity index 93% rename from zyplayer-doc-core/src/main/java/com/zyplayer/doc/core/util/ZyplayerDocVersion.java rename to zyplayer-doc-core/src/main/java/org/dromara/zyplayer/core/util/ZyplayerDocVersion.java index 87a9a9e7..60b861a1 100644 --- a/zyplayer-doc-core/src/main/java/com/zyplayer/doc/core/util/ZyplayerDocVersion.java +++ b/zyplayer-doc-core/src/main/java/org/dromara/zyplayer/core/util/ZyplayerDocVersion.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.core.util; +package org.dromara.zyplayer.core.util; import java.util.LinkedList; import java.util.List; diff --git a/zyplayer-doc-data/pom.xml b/zyplayer-doc-data/pom.xml index e300a342..62405b73 100644 --- a/zyplayer-doc-data/pom.xml +++ b/zyplayer-doc-data/pom.xml @@ -7,7 +7,7 @@ zyplayer-doc-data - com.zyplayer + org.dromara zyplayer-doc 1.0.0 @@ -101,7 +101,7 @@ - com.zyplayer + org.dromara zyplayer-doc-core diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/config/MybatisPlusConfig.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/config/MybatisPlusConfig.java similarity index 91% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/config/MybatisPlusConfig.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/config/MybatisPlusConfig.java index efd6d50f..23c3baf2 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/config/MybatisPlusConfig.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/config/MybatisPlusConfig.java @@ -1,10 +1,10 @@ -package com.zyplayer.doc.data.config; +package org.dromara.zyplayer.data.config; import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean; -import com.zyplayer.doc.data.repository.support.interceptor.SqlLogInterceptor; -import com.zyplayer.doc.data.utils.DruidDataSourceUtil; +import org.dromara.zyplayer.data.repository.support.interceptor.SqlLogInterceptor; +import org.dromara.zyplayer.data.utils.DruidDataSourceUtil; import org.mybatis.spring.annotation.MapperScan; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; @@ -32,7 +32,7 @@ public class MybatisPlusConfig { */ @Configuration @EnableTransactionManagement - @MapperScan(value = "com.zyplayer.doc.data.repository.manage.mapper", sqlSessionFactoryRef = "manageSqlSessionFactory") + @MapperScan(value = "org.dromara.zyplayer.data.repository.manage.mapper", sqlSessionFactoryRef = "manageSqlSessionFactory") static class ManageMybatisDbConfig { @Value("${zyplayer.doc.manage.datasource.driverClassName}") diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/config/security/DocUserDetails.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/config/security/DocUserDetails.java similarity index 94% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/config/security/DocUserDetails.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/config/security/DocUserDetails.java index 079ee63e..f6542b20 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/config/security/DocUserDetails.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/config/security/DocUserDetails.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.data.config.security; +package org.dromara.zyplayer.data.config.security; import lombok.Data; diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/config/security/DocUserUtil.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/config/security/DocUserUtil.java similarity index 94% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/config/security/DocUserUtil.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/config/security/DocUserUtil.java index 7e9a4b2f..c42da232 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/config/security/DocUserUtil.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/config/security/DocUserUtil.java @@ -1,7 +1,7 @@ -package com.zyplayer.doc.data.config.security; +package org.dromara.zyplayer.data.config.security; -import com.zyplayer.doc.data.utils.CachePrefix; -import com.zyplayer.doc.data.utils.CacheUtil; +import org.dromara.zyplayer.data.utils.CachePrefix; +import org.dromara.zyplayer.data.utils.CacheUtil; import java.util.List; import java.util.Objects; diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/config/security/UserAuthInfo.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/config/security/UserAuthInfo.java similarity index 76% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/config/security/UserAuthInfo.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/config/security/UserAuthInfo.java index ec562ea5..5a369798 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/config/security/UserAuthInfo.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/config/security/UserAuthInfo.java @@ -1,8 +1,8 @@ -package com.zyplayer.doc.data.config.security; +package org.dromara.zyplayer.data.config.security; -import com.zyplayer.doc.data.repository.manage.entity.UserAuth; -import com.zyplayer.doc.data.repository.support.consts.DocSysModuleType; -import com.zyplayer.doc.data.repository.support.consts.DocSysType; +import org.dromara.zyplayer.data.repository.manage.entity.UserAuth; +import org.dromara.zyplayer.data.repository.support.consts.DocSysModuleType; +import org.dromara.zyplayer.data.repository.support.consts.DocSysType; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/ApiCustomNode.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/entity/ApiCustomNode.java similarity index 95% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/ApiCustomNode.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/entity/ApiCustomNode.java index a3995437..e3d9cc59 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/ApiCustomNode.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/entity/ApiCustomNode.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.data.repository.manage.entity; +package org.dromara.zyplayer.data.repository.manage.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/ApiCustomParams.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/entity/ApiCustomParams.java similarity index 95% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/ApiCustomParams.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/entity/ApiCustomParams.java index 519139a4..8d99781f 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/ApiCustomParams.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/entity/ApiCustomParams.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.data.repository.manage.entity; +package org.dromara.zyplayer.data.repository.manage.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/ApiDoc.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/entity/ApiDoc.java similarity index 96% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/ApiDoc.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/entity/ApiDoc.java index 0c851d39..66736200 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/ApiDoc.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/entity/ApiDoc.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.data.repository.manage.entity; +package org.dromara.zyplayer.data.repository.manage.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/ApiGlobalParam.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/entity/ApiGlobalParam.java similarity index 95% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/ApiGlobalParam.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/entity/ApiGlobalParam.java index f6156488..dffe1cbe 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/ApiGlobalParam.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/entity/ApiGlobalParam.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.data.repository.manage.entity; +package org.dromara.zyplayer.data.repository.manage.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/ApiRequestParam.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/entity/ApiRequestParam.java similarity index 95% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/ApiRequestParam.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/entity/ApiRequestParam.java index 998c4c74..28d5368f 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/ApiRequestParam.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/entity/ApiRequestParam.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.data.repository.manage.entity; +package org.dromara.zyplayer.data.repository.manage.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/AuthInfo.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/entity/AuthInfo.java similarity index 93% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/AuthInfo.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/entity/AuthInfo.java index c7b58ab4..1da97d23 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/AuthInfo.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/entity/AuthInfo.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.data.repository.manage.entity; +package org.dromara.zyplayer.data.repository.manage.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/BackupLog.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/entity/BackupLog.java similarity index 96% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/BackupLog.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/entity/BackupLog.java index be9afe2e..eb3ec5e2 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/BackupLog.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/entity/BackupLog.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.data.repository.manage.entity; +package org.dromara.zyplayer.data.repository.manage.entity; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/BackupTask.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/entity/BackupTask.java similarity index 95% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/BackupTask.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/entity/BackupTask.java index 33d65d19..761cfa79 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/BackupTask.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/entity/BackupTask.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.data.repository.manage.entity; +package org.dromara.zyplayer.data.repository.manage.entity; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/DbDatasource.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/entity/DbDatasource.java similarity index 95% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/DbDatasource.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/entity/DbDatasource.java index 9be225b0..5ebce3ed 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/DbDatasource.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/entity/DbDatasource.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.data.repository.manage.entity; +package org.dromara.zyplayer.data.repository.manage.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/DbFavorite.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/entity/DbFavorite.java similarity index 94% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/DbFavorite.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/entity/DbFavorite.java index e4a60e6e..82d11eee 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/DbFavorite.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/entity/DbFavorite.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.data.repository.manage.entity; +package org.dromara.zyplayer.data.repository.manage.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/DbHistory.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/entity/DbHistory.java similarity index 94% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/DbHistory.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/entity/DbHistory.java index 4915bbdc..2ac2570d 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/DbHistory.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/entity/DbHistory.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.data.repository.manage.entity; +package org.dromara.zyplayer.data.repository.manage.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/DbProcLog.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/entity/DbProcLog.java similarity index 95% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/DbProcLog.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/entity/DbProcLog.java index f6bd94f5..8205bb34 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/DbProcLog.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/entity/DbProcLog.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.data.repository.manage.entity; +package org.dromara.zyplayer.data.repository.manage.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/DbTableRelation.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/entity/DbTableRelation.java similarity index 95% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/DbTableRelation.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/entity/DbTableRelation.java index 3c491c04..5236ec15 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/DbTableRelation.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/entity/DbTableRelation.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.data.repository.manage.entity; +package org.dromara.zyplayer.data.repository.manage.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/DbTransferTask.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/entity/DbTransferTask.java similarity index 96% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/DbTransferTask.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/entity/DbTransferTask.java index f9006a8a..80573ae1 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/DbTransferTask.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/entity/DbTransferTask.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.data.repository.manage.entity; +package org.dromara.zyplayer.data.repository.manage.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/SystemConfig.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/entity/SystemConfig.java similarity index 97% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/SystemConfig.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/entity/SystemConfig.java index 19dba630..f2d9d7a8 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/SystemConfig.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/entity/SystemConfig.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.data.repository.manage.entity; +package org.dromara.zyplayer.data.repository.manage.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/UserAuth.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/entity/UserAuth.java similarity index 95% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/UserAuth.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/entity/UserAuth.java index 969d7c3e..40fc792d 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/UserAuth.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/entity/UserAuth.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.data.repository.manage.entity; +package org.dromara.zyplayer.data.repository.manage.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/UserGroup.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/entity/UserGroup.java similarity index 93% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/UserGroup.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/entity/UserGroup.java index 95b60f78..b2e77acd 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/UserGroup.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/entity/UserGroup.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.data.repository.manage.entity; +package org.dromara.zyplayer.data.repository.manage.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/UserGroupAuth.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/entity/UserGroupAuth.java similarity index 95% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/UserGroupAuth.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/entity/UserGroupAuth.java index 4e4233fe..c5544299 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/UserGroupAuth.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/entity/UserGroupAuth.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.data.repository.manage.entity; +package org.dromara.zyplayer.data.repository.manage.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/UserGroupRelation.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/entity/UserGroupRelation.java similarity index 94% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/UserGroupRelation.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/entity/UserGroupRelation.java index e2cb3f07..2a49c283 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/UserGroupRelation.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/entity/UserGroupRelation.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.data.repository.manage.entity; +package org.dromara.zyplayer.data.repository.manage.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/UserInfo.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/entity/UserInfo.java similarity index 95% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/UserInfo.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/entity/UserInfo.java index 64d450bd..cdcd13b2 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/UserInfo.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/entity/UserInfo.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.data.repository.manage.entity; +package org.dromara.zyplayer.data.repository.manage.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/UserMessage.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/entity/UserMessage.java similarity index 96% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/UserMessage.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/entity/UserMessage.java index 639bdf77..73f40683 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/UserMessage.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/entity/UserMessage.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.data.repository.manage.entity; +package org.dromara.zyplayer.data.repository.manage.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/UserSetting.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/entity/UserSetting.java similarity index 93% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/UserSetting.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/entity/UserSetting.java index f8c0b3ac..25bf5b73 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/UserSetting.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/entity/UserSetting.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.data.repository.manage.entity; +package org.dromara.zyplayer.data.repository.manage.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/WikiPage.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/entity/WikiPage.java similarity index 96% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/WikiPage.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/entity/WikiPage.java index 87252a16..3ac6d10e 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/WikiPage.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/entity/WikiPage.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.data.repository.manage.entity; +package org.dromara.zyplayer.data.repository.manage.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/WikiPageComment.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/entity/WikiPageComment.java similarity index 94% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/WikiPageComment.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/entity/WikiPageComment.java index 3bb64d33..72cc2f7f 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/WikiPageComment.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/entity/WikiPageComment.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.data.repository.manage.entity; +package org.dromara.zyplayer.data.repository.manage.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/WikiPageContent.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/entity/WikiPageContent.java similarity index 94% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/WikiPageContent.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/entity/WikiPageContent.java index 15062976..10ac8b25 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/WikiPageContent.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/entity/WikiPageContent.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.data.repository.manage.entity; +package org.dromara.zyplayer.data.repository.manage.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/WikiPageFile.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/entity/WikiPageFile.java similarity index 96% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/WikiPageFile.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/entity/WikiPageFile.java index e3f97fce..c8ef3c46 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/WikiPageFile.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/entity/WikiPageFile.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.data.repository.manage.entity; +package org.dromara.zyplayer.data.repository.manage.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/WikiPageHistory.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/entity/WikiPageHistory.java similarity index 94% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/WikiPageHistory.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/entity/WikiPageHistory.java index 70efe982..53ad0b7b 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/WikiPageHistory.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/entity/WikiPageHistory.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.data.repository.manage.entity; +package org.dromara.zyplayer.data.repository.manage.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/WikiPageTemplate.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/entity/WikiPageTemplate.java similarity index 92% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/WikiPageTemplate.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/entity/WikiPageTemplate.java index d7853e43..abf3c5c7 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/WikiPageTemplate.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/entity/WikiPageTemplate.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.data.repository.manage.entity; +package org.dromara.zyplayer.data.repository.manage.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/WikiPageZan.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/entity/WikiPageZan.java similarity index 93% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/WikiPageZan.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/entity/WikiPageZan.java index f8313507..d9d153ae 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/WikiPageZan.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/entity/WikiPageZan.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.data.repository.manage.entity; +package org.dromara.zyplayer.data.repository.manage.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/WikiSpace.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/entity/WikiSpace.java similarity index 95% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/WikiSpace.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/entity/WikiSpace.java index 188e657a..7adb64ae 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/WikiSpace.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/entity/WikiSpace.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.data.repository.manage.entity; +package org.dromara.zyplayer.data.repository.manage.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/WikiSpaceFavorite.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/entity/WikiSpaceFavorite.java similarity index 93% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/WikiSpaceFavorite.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/entity/WikiSpaceFavorite.java index 7cf82a9c..9e410b72 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/WikiSpaceFavorite.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/entity/WikiSpaceFavorite.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.data.repository.manage.entity; +package org.dromara.zyplayer.data.repository.manage.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/ApiCustomNodeMapper.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/mapper/ApiCustomNodeMapper.java similarity index 84% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/ApiCustomNodeMapper.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/mapper/ApiCustomNodeMapper.java index ee462a48..c5d17746 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/ApiCustomNodeMapper.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/mapper/ApiCustomNodeMapper.java @@ -1,6 +1,6 @@ -package com.zyplayer.doc.data.repository.manage.mapper; +package org.dromara.zyplayer.data.repository.manage.mapper; -import com.zyplayer.doc.data.repository.manage.entity.ApiCustomNode; +import org.dromara.zyplayer.data.repository.manage.entity.ApiCustomNode; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/ApiCustomParamsMapper.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/mapper/ApiCustomParamsMapper.java similarity index 65% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/ApiCustomParamsMapper.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/mapper/ApiCustomParamsMapper.java index 9138a9da..7c97fc4c 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/ApiCustomParamsMapper.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/mapper/ApiCustomParamsMapper.java @@ -1,6 +1,6 @@ -package com.zyplayer.doc.data.repository.manage.mapper; +package org.dromara.zyplayer.data.repository.manage.mapper; -import com.zyplayer.doc.data.repository.manage.entity.ApiCustomParams; +import org.dromara.zyplayer.data.repository.manage.entity.ApiCustomParams; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/ApiDocMapper.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/mapper/ApiDocMapper.java similarity index 64% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/ApiDocMapper.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/mapper/ApiDocMapper.java index c7d7b3ce..9704412e 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/ApiDocMapper.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/mapper/ApiDocMapper.java @@ -1,6 +1,6 @@ -package com.zyplayer.doc.data.repository.manage.mapper; +package org.dromara.zyplayer.data.repository.manage.mapper; -import com.zyplayer.doc.data.repository.manage.entity.ApiDoc; +import org.dromara.zyplayer.data.repository.manage.entity.ApiDoc; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/ApiGlobalParamMapper.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/mapper/ApiGlobalParamMapper.java similarity index 65% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/ApiGlobalParamMapper.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/mapper/ApiGlobalParamMapper.java index adeb33c1..7668b49f 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/ApiGlobalParamMapper.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/mapper/ApiGlobalParamMapper.java @@ -1,6 +1,6 @@ -package com.zyplayer.doc.data.repository.manage.mapper; +package org.dromara.zyplayer.data.repository.manage.mapper; -import com.zyplayer.doc.data.repository.manage.entity.ApiGlobalParam; +import org.dromara.zyplayer.data.repository.manage.entity.ApiGlobalParam; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/ApiRequestParamMapper.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/mapper/ApiRequestParamMapper.java similarity index 65% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/ApiRequestParamMapper.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/mapper/ApiRequestParamMapper.java index a2e9b317..cd7e3384 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/ApiRequestParamMapper.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/mapper/ApiRequestParamMapper.java @@ -1,6 +1,6 @@ -package com.zyplayer.doc.data.repository.manage.mapper; +package org.dromara.zyplayer.data.repository.manage.mapper; -import com.zyplayer.doc.data.repository.manage.entity.ApiRequestParam; +import org.dromara.zyplayer.data.repository.manage.entity.ApiRequestParam; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/AuthInfoMapper.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/mapper/AuthInfoMapper.java similarity index 63% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/AuthInfoMapper.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/mapper/AuthInfoMapper.java index 43b8dcb1..75928226 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/AuthInfoMapper.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/mapper/AuthInfoMapper.java @@ -1,7 +1,7 @@ -package com.zyplayer.doc.data.repository.manage.mapper; +package org.dromara.zyplayer.data.repository.manage.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.zyplayer.doc.data.repository.manage.entity.AuthInfo; +import org.dromara.zyplayer.data.repository.manage.entity.AuthInfo; /** *

diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/BackupTaskMapper.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/mapper/BackupTaskMapper.java similarity index 61% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/BackupTaskMapper.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/mapper/BackupTaskMapper.java index 30043c1d..7320efe2 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/BackupTaskMapper.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/mapper/BackupTaskMapper.java @@ -1,7 +1,7 @@ -package com.zyplayer.doc.data.repository.manage.mapper; +package org.dromara.zyplayer.data.repository.manage.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.zyplayer.doc.data.repository.manage.entity.BackupTask; +import org.dromara.zyplayer.data.repository.manage.entity.BackupTask; /** * 备份任务Mapper 接口 diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/DbDatasourceMapper.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/mapper/DbDatasourceMapper.java similarity index 63% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/DbDatasourceMapper.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/mapper/DbDatasourceMapper.java index 1f8f01f9..57e15d11 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/DbDatasourceMapper.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/mapper/DbDatasourceMapper.java @@ -1,6 +1,6 @@ -package com.zyplayer.doc.data.repository.manage.mapper; +package org.dromara.zyplayer.data.repository.manage.mapper; -import com.zyplayer.doc.data.repository.manage.entity.DbDatasource; +import org.dromara.zyplayer.data.repository.manage.entity.DbDatasource; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/DbFavoriteMapper.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/mapper/DbFavoriteMapper.java similarity index 63% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/DbFavoriteMapper.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/mapper/DbFavoriteMapper.java index fed7a4ba..6170363e 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/DbFavoriteMapper.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/mapper/DbFavoriteMapper.java @@ -1,6 +1,6 @@ -package com.zyplayer.doc.data.repository.manage.mapper; +package org.dromara.zyplayer.data.repository.manage.mapper; -import com.zyplayer.doc.data.repository.manage.entity.DbFavorite; +import org.dromara.zyplayer.data.repository.manage.entity.DbFavorite; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/DbHistoryMapper.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/mapper/DbHistoryMapper.java similarity index 76% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/DbHistoryMapper.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/mapper/DbHistoryMapper.java index 9f3f8093..3bd246c7 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/DbHistoryMapper.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/mapper/DbHistoryMapper.java @@ -1,6 +1,6 @@ -package com.zyplayer.doc.data.repository.manage.mapper; +package org.dromara.zyplayer.data.repository.manage.mapper; -import com.zyplayer.doc.data.repository.manage.entity.DbHistory; +import org.dromara.zyplayer.data.repository.manage.entity.DbHistory; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Update; diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/DbProcLogMapper.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/mapper/DbProcLogMapper.java similarity index 65% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/DbProcLogMapper.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/mapper/DbProcLogMapper.java index e362e048..c1154ff2 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/DbProcLogMapper.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/mapper/DbProcLogMapper.java @@ -1,6 +1,6 @@ -package com.zyplayer.doc.data.repository.manage.mapper; +package org.dromara.zyplayer.data.repository.manage.mapper; -import com.zyplayer.doc.data.repository.manage.entity.DbProcLog; +import org.dromara.zyplayer.data.repository.manage.entity.DbProcLog; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/DbTableRelationMapper.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/mapper/DbTableRelationMapper.java similarity index 64% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/DbTableRelationMapper.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/mapper/DbTableRelationMapper.java index 45186eb6..61e9c6cf 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/DbTableRelationMapper.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/mapper/DbTableRelationMapper.java @@ -1,6 +1,6 @@ -package com.zyplayer.doc.data.repository.manage.mapper; +package org.dromara.zyplayer.data.repository.manage.mapper; -import com.zyplayer.doc.data.repository.manage.entity.DbTableRelation; +import org.dromara.zyplayer.data.repository.manage.entity.DbTableRelation; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/DbTransferTaskMapper.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/mapper/DbTransferTaskMapper.java similarity index 82% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/DbTransferTaskMapper.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/mapper/DbTransferTaskMapper.java index 8e81acb0..8d93e990 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/DbTransferTaskMapper.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/mapper/DbTransferTaskMapper.java @@ -1,6 +1,6 @@ -package com.zyplayer.doc.data.repository.manage.mapper; +package org.dromara.zyplayer.data.repository.manage.mapper; -import com.zyplayer.doc.data.repository.manage.entity.DbTransferTask; +import org.dromara.zyplayer.data.repository.manage.entity.DbTransferTask; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Update; diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/SystemConfigMapper.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/mapper/SystemConfigMapper.java similarity index 64% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/SystemConfigMapper.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/mapper/SystemConfigMapper.java index b447a9a4..f83d2a7c 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/SystemConfigMapper.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/mapper/SystemConfigMapper.java @@ -1,7 +1,7 @@ -package com.zyplayer.doc.data.repository.manage.mapper; +package org.dromara.zyplayer.data.repository.manage.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.zyplayer.doc.data.repository.manage.entity.SystemConfig; +import org.dromara.zyplayer.data.repository.manage.entity.SystemConfig; /** *

diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/UserAuthMapper.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/mapper/UserAuthMapper.java similarity index 64% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/UserAuthMapper.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/mapper/UserAuthMapper.java index 6b551dd1..72c75bb7 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/UserAuthMapper.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/mapper/UserAuthMapper.java @@ -1,6 +1,6 @@ -package com.zyplayer.doc.data.repository.manage.mapper; +package org.dromara.zyplayer.data.repository.manage.mapper; -import com.zyplayer.doc.data.repository.manage.entity.UserAuth; +import org.dromara.zyplayer.data.repository.manage.entity.UserAuth; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/UserGroupAuthMapper.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/mapper/UserGroupAuthMapper.java similarity index 84% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/UserGroupAuthMapper.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/mapper/UserGroupAuthMapper.java index e730fd7c..3e016533 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/UserGroupAuthMapper.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/mapper/UserGroupAuthMapper.java @@ -1,7 +1,7 @@ -package com.zyplayer.doc.data.repository.manage.mapper; +package org.dromara.zyplayer.data.repository.manage.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.zyplayer.doc.data.repository.manage.entity.UserGroupAuth; +import org.dromara.zyplayer.data.repository.manage.entity.UserGroupAuth; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/UserGroupMapper.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/mapper/UserGroupMapper.java similarity index 75% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/UserGroupMapper.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/mapper/UserGroupMapper.java index d16d0120..585681e3 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/UserGroupMapper.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/mapper/UserGroupMapper.java @@ -1,8 +1,8 @@ -package com.zyplayer.doc.data.repository.manage.mapper; +package org.dromara.zyplayer.data.repository.manage.mapper; -import com.zyplayer.doc.data.repository.manage.entity.UserGroup; +import org.dromara.zyplayer.data.repository.manage.entity.UserGroup; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.zyplayer.doc.data.repository.manage.entity.UserInfo; +import org.dromara.zyplayer.data.repository.manage.entity.UserInfo; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/UserGroupRelationMapper.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/mapper/UserGroupRelationMapper.java similarity index 65% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/UserGroupRelationMapper.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/mapper/UserGroupRelationMapper.java index 34211dbe..3062f5f7 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/UserGroupRelationMapper.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/mapper/UserGroupRelationMapper.java @@ -1,6 +1,6 @@ -package com.zyplayer.doc.data.repository.manage.mapper; +package org.dromara.zyplayer.data.repository.manage.mapper; -import com.zyplayer.doc.data.repository.manage.entity.UserGroupRelation; +import org.dromara.zyplayer.data.repository.manage.entity.UserGroupRelation; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/UserInfoMapper.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/mapper/UserInfoMapper.java similarity index 90% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/UserInfoMapper.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/mapper/UserInfoMapper.java index c3a88ab8..68f4ce94 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/UserInfoMapper.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/mapper/UserInfoMapper.java @@ -1,7 +1,7 @@ -package com.zyplayer.doc.data.repository.manage.mapper; +package org.dromara.zyplayer.data.repository.manage.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.zyplayer.doc.data.repository.manage.entity.UserInfo; +import org.dromara.zyplayer.data.repository.manage.entity.UserInfo; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/UserMessageMapper.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/mapper/UserMessageMapper.java similarity index 64% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/UserMessageMapper.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/mapper/UserMessageMapper.java index 1aeed349..b2821122 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/UserMessageMapper.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/mapper/UserMessageMapper.java @@ -1,6 +1,6 @@ -package com.zyplayer.doc.data.repository.manage.mapper; +package org.dromara.zyplayer.data.repository.manage.mapper; -import com.zyplayer.doc.data.repository.manage.entity.UserMessage; +import org.dromara.zyplayer.data.repository.manage.entity.UserMessage; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/UserSettingMapper.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/mapper/UserSettingMapper.java similarity index 64% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/UserSettingMapper.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/mapper/UserSettingMapper.java index b617c5ae..f00cf040 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/UserSettingMapper.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/mapper/UserSettingMapper.java @@ -1,6 +1,6 @@ -package com.zyplayer.doc.data.repository.manage.mapper; +package org.dromara.zyplayer.data.repository.manage.mapper; -import com.zyplayer.doc.data.repository.manage.entity.UserSetting; +import org.dromara.zyplayer.data.repository.manage.entity.UserSetting; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/WikiPageCommentMapper.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/mapper/WikiPageCommentMapper.java similarity index 63% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/WikiPageCommentMapper.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/mapper/WikiPageCommentMapper.java index 4d3801a4..d5254036 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/WikiPageCommentMapper.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/mapper/WikiPageCommentMapper.java @@ -1,6 +1,6 @@ -package com.zyplayer.doc.data.repository.manage.mapper; +package org.dromara.zyplayer.data.repository.manage.mapper; -import com.zyplayer.doc.data.repository.manage.entity.WikiPageComment; +import org.dromara.zyplayer.data.repository.manage.entity.WikiPageComment; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/WikiPageContentMapper.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/mapper/WikiPageContentMapper.java similarity index 53% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/WikiPageContentMapper.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/mapper/WikiPageContentMapper.java index 0b13dda2..634b0745 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/WikiPageContentMapper.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/mapper/WikiPageContentMapper.java @@ -1,9 +1,9 @@ -package com.zyplayer.doc.data.repository.manage.mapper; +package org.dromara.zyplayer.data.repository.manage.mapper; -import com.zyplayer.doc.data.repository.manage.entity.WikiPageContent; +import org.dromara.zyplayer.data.repository.manage.entity.WikiPageContent; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.zyplayer.doc.data.repository.manage.param.SearchByEsParam; -import com.zyplayer.doc.data.repository.manage.vo.SpaceNewsVo; +import org.dromara.zyplayer.data.repository.manage.param.SearchByEsParam; +import org.dromara.zyplayer.data.repository.manage.vo.SpaceNewsVo; import java.util.List; diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/WikiPageFileMapper.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/mapper/WikiPageFileMapper.java similarity index 76% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/WikiPageFileMapper.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/mapper/WikiPageFileMapper.java index 67288337..d2c3ae62 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/WikiPageFileMapper.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/mapper/WikiPageFileMapper.java @@ -1,6 +1,6 @@ -package com.zyplayer.doc.data.repository.manage.mapper; +package org.dromara.zyplayer.data.repository.manage.mapper; -import com.zyplayer.doc.data.repository.manage.entity.WikiPageFile; +import org.dromara.zyplayer.data.repository.manage.entity.WikiPageFile; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Update; diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/WikiPageHistoryMapper.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/mapper/WikiPageHistoryMapper.java similarity index 63% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/WikiPageHistoryMapper.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/mapper/WikiPageHistoryMapper.java index a45c8734..630bfab5 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/WikiPageHistoryMapper.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/mapper/WikiPageHistoryMapper.java @@ -1,6 +1,6 @@ -package com.zyplayer.doc.data.repository.manage.mapper; +package org.dromara.zyplayer.data.repository.manage.mapper; -import com.zyplayer.doc.data.repository.manage.entity.WikiPageHistory; +import org.dromara.zyplayer.data.repository.manage.entity.WikiPageHistory; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/WikiPageMapper.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/mapper/WikiPageMapper.java similarity index 87% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/WikiPageMapper.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/mapper/WikiPageMapper.java index 827a3813..4a441eb8 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/WikiPageMapper.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/mapper/WikiPageMapper.java @@ -1,8 +1,8 @@ -package com.zyplayer.doc.data.repository.manage.mapper; +package org.dromara.zyplayer.data.repository.manage.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -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 org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Update; diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/WikiPageTemplateMapper.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/mapper/WikiPageTemplateMapper.java similarity index 75% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/WikiPageTemplateMapper.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/mapper/WikiPageTemplateMapper.java index 1625cb2f..e6248987 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/WikiPageTemplateMapper.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/mapper/WikiPageTemplateMapper.java @@ -1,9 +1,9 @@ -package com.zyplayer.doc.data.repository.manage.mapper; +package org.dromara.zyplayer.data.repository.manage.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.zyplayer.doc.data.repository.manage.entity.WikiPageTemplate; -import com.zyplayer.doc.data.repository.manage.vo.WikiPageTemplateInfoVo; -import com.zyplayer.doc.data.repository.manage.vo.WikiTemplateTagVo; +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.apache.ibatis.annotations.Param; import java.util.List; diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/WikiPageZanMapper.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/mapper/WikiPageZanMapper.java similarity index 63% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/WikiPageZanMapper.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/mapper/WikiPageZanMapper.java index 4c8f442b..0c0c4764 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/WikiPageZanMapper.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/mapper/WikiPageZanMapper.java @@ -1,6 +1,6 @@ -package com.zyplayer.doc.data.repository.manage.mapper; +package org.dromara.zyplayer.data.repository.manage.mapper; -import com.zyplayer.doc.data.repository.manage.entity.WikiPageZan; +import org.dromara.zyplayer.data.repository.manage.entity.WikiPageZan; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/WikiSpaceFavoriteMapper.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/mapper/WikiSpaceFavoriteMapper.java similarity index 65% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/WikiSpaceFavoriteMapper.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/mapper/WikiSpaceFavoriteMapper.java index 973eae90..4bde149c 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/WikiSpaceFavoriteMapper.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/mapper/WikiSpaceFavoriteMapper.java @@ -1,6 +1,6 @@ -package com.zyplayer.doc.data.repository.manage.mapper; +package org.dromara.zyplayer.data.repository.manage.mapper; -import com.zyplayer.doc.data.repository.manage.entity.WikiSpaceFavorite; +import org.dromara.zyplayer.data.repository.manage.entity.WikiSpaceFavorite; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/WikiSpaceMapper.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/mapper/WikiSpaceMapper.java similarity index 63% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/WikiSpaceMapper.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/mapper/WikiSpaceMapper.java index 26bfcdea..2e4abb34 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/WikiSpaceMapper.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/mapper/WikiSpaceMapper.java @@ -1,6 +1,6 @@ -package com.zyplayer.doc.data.repository.manage.mapper; +package org.dromara.zyplayer.data.repository.manage.mapper; -import com.zyplayer.doc.data.repository.manage.entity.WikiSpace; +import org.dromara.zyplayer.data.repository.manage.entity.WikiSpace; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/param/SearchByEsParam.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/param/SearchByEsParam.java similarity index 85% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/param/SearchByEsParam.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/param/SearchByEsParam.java index 0b536a8b..58bddc6f 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/param/SearchByEsParam.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/param/SearchByEsParam.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.data.repository.manage.param; +package org.dromara.zyplayer.data.repository.manage.param; import lombok.Data; diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/param/TableRelationParam.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/param/TableRelationParam.java similarity index 86% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/param/TableRelationParam.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/param/TableRelationParam.java index f1a64439..a7c1f5f3 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/param/TableRelationParam.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/param/TableRelationParam.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.data.repository.manage.param; +package org.dromara.zyplayer.data.repository.manage.param; import lombok.Data; diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/vo/ApiCustomDocVo.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/vo/ApiCustomDocVo.java similarity index 94% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/vo/ApiCustomDocVo.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/vo/ApiCustomDocVo.java index 971b64d2..8e4d1547 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/vo/ApiCustomDocVo.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/vo/ApiCustomDocVo.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.data.repository.manage.vo; +package org.dromara.zyplayer.data.repository.manage.vo; import lombok.Data; diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/vo/ApiCustomVo.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/vo/ApiCustomVo.java similarity index 90% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/vo/ApiCustomVo.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/vo/ApiCustomVo.java index 87288ae2..4c811488 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/vo/ApiCustomVo.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/vo/ApiCustomVo.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.data.repository.manage.vo; +package org.dromara.zyplayer.data.repository.manage.vo; import lombok.*; diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/vo/ApiDocVo.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/vo/ApiDocVo.java similarity index 70% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/vo/ApiDocVo.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/vo/ApiDocVo.java index 4d99b24d..d28aa7d8 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/vo/ApiDocVo.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/vo/ApiDocVo.java @@ -1,6 +1,6 @@ -package com.zyplayer.doc.data.repository.manage.vo; +package org.dromara.zyplayer.data.repository.manage.vo; -import com.zyplayer.doc.data.repository.manage.entity.ApiDoc; +import org.dromara.zyplayer.data.repository.manage.entity.ApiDoc; import lombok.*; import java.io.Serializable; diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/vo/SpaceNewsVo.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/vo/SpaceNewsVo.java similarity index 89% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/vo/SpaceNewsVo.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/vo/SpaceNewsVo.java index 2a447341..90808c8a 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/vo/SpaceNewsVo.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/vo/SpaceNewsVo.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.data.repository.manage.vo; +package org.dromara.zyplayer.data.repository.manage.vo; import lombok.*; diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/vo/TableRelationVo.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/vo/TableRelationVo.java similarity index 87% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/vo/TableRelationVo.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/vo/TableRelationVo.java index 911cdbe8..06d3c785 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/vo/TableRelationVo.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/vo/TableRelationVo.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.data.repository.manage.vo; +package org.dromara.zyplayer.data.repository.manage.vo; import lombok.*; diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/vo/WikiPageTemplateInfoVo.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/vo/WikiPageTemplateInfoVo.java similarity index 96% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/vo/WikiPageTemplateInfoVo.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/vo/WikiPageTemplateInfoVo.java index 24188378..3d278cfc 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/vo/WikiPageTemplateInfoVo.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/vo/WikiPageTemplateInfoVo.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.data.repository.manage.vo; +package org.dromara.zyplayer.data.repository.manage.vo; import lombok.Data; diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/vo/WikiTemplateTagVo.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/vo/WikiTemplateTagVo.java similarity index 83% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/vo/WikiTemplateTagVo.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/vo/WikiTemplateTagVo.java index b55704ac..d2839b58 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/vo/WikiTemplateTagVo.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/manage/vo/WikiTemplateTagVo.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.data.repository.manage.vo; +package org.dromara.zyplayer.data.repository.manage.vo; import lombok.Data; diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/support/consts/ApiAuthType.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/support/consts/ApiAuthType.java similarity index 94% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/support/consts/ApiAuthType.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/support/consts/ApiAuthType.java index e47aaf5c..56032892 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/support/consts/ApiAuthType.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/support/consts/ApiAuthType.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.data.repository.support.consts; +package org.dromara.zyplayer.data.repository.support.consts; import java.util.Map; import java.util.stream.Collectors; diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/support/consts/DocAuthConst.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/support/consts/DocAuthConst.java similarity index 85% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/support/consts/DocAuthConst.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/support/consts/DocAuthConst.java index 713ba408..fbbcfd28 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/support/consts/DocAuthConst.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/support/consts/DocAuthConst.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.data.repository.support.consts; +package org.dromara.zyplayer.data.repository.support.consts; /** * 授权信息静态类 diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/support/consts/DocSysModuleType.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/support/consts/DocSysModuleType.java similarity index 95% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/support/consts/DocSysModuleType.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/support/consts/DocSysModuleType.java index 2849bd46..0462b28b 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/support/consts/DocSysModuleType.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/support/consts/DocSysModuleType.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.data.repository.support.consts; +package org.dromara.zyplayer.data.repository.support.consts; /** * 系统模块类型枚举 diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/support/consts/DocSysType.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/support/consts/DocSysType.java similarity index 85% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/support/consts/DocSysType.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/support/consts/DocSysType.java index dda0a6ad..32e55b7c 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/support/consts/DocSysType.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/support/consts/DocSysType.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.data.repository.support.consts; +package org.dromara.zyplayer.data.repository.support.consts; /** * 系统类型枚举 diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/support/consts/UserMsgType.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/support/consts/UserMsgType.java similarity index 94% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/support/consts/UserMsgType.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/support/consts/UserMsgType.java index 721bd848..ddceef87 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/support/consts/UserMsgType.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/support/consts/UserMsgType.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.data.repository.support.consts; +package org.dromara.zyplayer.data.repository.support.consts; /** * 用户消息类型 diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/support/consts/UserSettingConst.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/support/consts/UserSettingConst.java similarity index 77% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/support/consts/UserSettingConst.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/support/consts/UserSettingConst.java index df9e877b..b10c9e76 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/support/consts/UserSettingConst.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/support/consts/UserSettingConst.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.data.repository.support.consts; +package org.dromara.zyplayer.data.repository.support.consts; /** * 用户自定义配置的key diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/support/generator/CodeGenerator.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/support/generator/CodeGenerator.java similarity index 91% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/support/generator/CodeGenerator.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/support/generator/CodeGenerator.java index f325da88..43820bcc 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/support/generator/CodeGenerator.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/support/generator/CodeGenerator.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.data.repository.support.generator; +package org.dromara.zyplayer.data.repository.support.generator; import com.baomidou.mybatisplus.generator.FastAutoGenerator; import com.baomidou.mybatisplus.generator.config.OutputFile; @@ -29,7 +29,7 @@ public class CodeGenerator { .dateType(DateType.ONLY_DATE) .fileOverride(); // 覆盖已生成文件 }) - .packageConfig(builder -> builder.parent("com.zyplayer.doc.data") // 设置父包名 + .packageConfig(builder -> builder.parent("org.dromara.zyplayer.data") // 设置父包名 .moduleName("") // 设置父包模块名 .controller("web.generator") .entity("repository.manage.entity") diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/support/interceptor/SqlLogInterceptor.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/support/interceptor/SqlLogInterceptor.java similarity index 98% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/support/interceptor/SqlLogInterceptor.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/support/interceptor/SqlLogInterceptor.java index c0074a42..380d50d5 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/support/interceptor/SqlLogInterceptor.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/repository/support/interceptor/SqlLogInterceptor.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.data.repository.support.interceptor; +package org.dromara.zyplayer.data.repository.support.interceptor; import org.apache.ibatis.cache.CacheKey; import org.apache.ibatis.executor.Executor; diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/common/ApiDocAuthJudgeService.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/common/ApiDocAuthJudgeService.java similarity index 76% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/common/ApiDocAuthJudgeService.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/common/ApiDocAuthJudgeService.java index e37f0bd2..b6a3f9d7 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/common/ApiDocAuthJudgeService.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/common/ApiDocAuthJudgeService.java @@ -1,18 +1,18 @@ -package com.zyplayer.doc.data.service.common; +package org.dromara.zyplayer.data.service.common; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; -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.ApiDoc; -import com.zyplayer.doc.data.repository.manage.entity.AuthInfo; -import com.zyplayer.doc.data.repository.manage.entity.UserAuth; -import com.zyplayer.doc.data.repository.support.consts.ApiAuthType; -import com.zyplayer.doc.data.repository.support.consts.DocSysModuleType; -import com.zyplayer.doc.data.repository.support.consts.DocSysType; -import com.zyplayer.doc.data.service.manage.ApiDocService; -import com.zyplayer.doc.data.service.manage.AuthInfoService; -import com.zyplayer.doc.data.service.manage.UserAuthService; +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.ApiDoc; +import org.dromara.zyplayer.data.repository.manage.entity.AuthInfo; +import org.dromara.zyplayer.data.repository.manage.entity.UserAuth; +import org.dromara.zyplayer.data.repository.support.consts.ApiAuthType; +import org.dromara.zyplayer.data.repository.support.consts.DocSysModuleType; +import org.dromara.zyplayer.data.repository.support.consts.DocSysType; +import org.dromara.zyplayer.data.service.manage.ApiDocService; +import org.dromara.zyplayer.data.service.manage.AuthInfoService; +import org.dromara.zyplayer.data.service.manage.UserAuthService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/ApiCustomNodeService.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/ApiCustomNodeService.java similarity index 72% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/ApiCustomNodeService.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/ApiCustomNodeService.java index ce57a84b..aec54827 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/ApiCustomNodeService.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/ApiCustomNodeService.java @@ -1,10 +1,10 @@ -package com.zyplayer.doc.data.service.manage; +package org.dromara.zyplayer.data.service.manage; -import com.zyplayer.doc.data.repository.manage.entity.ApiCustomNode; +import org.dromara.zyplayer.data.repository.manage.entity.ApiCustomNode; import com.baomidou.mybatisplus.extension.service.IService; -import com.zyplayer.doc.data.repository.manage.entity.ApiCustomParams; -import com.zyplayer.doc.data.repository.manage.entity.ApiDoc; -import com.zyplayer.doc.data.repository.manage.vo.ApiCustomDocVo; +import org.dromara.zyplayer.data.repository.manage.entity.ApiCustomParams; +import org.dromara.zyplayer.data.repository.manage.entity.ApiDoc; +import org.dromara.zyplayer.data.repository.manage.vo.ApiCustomDocVo; import java.util.List; diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/ApiCustomParamsService.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/ApiCustomParamsService.java similarity index 66% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/ApiCustomParamsService.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/ApiCustomParamsService.java index 272cb00e..60a6ccc2 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/ApiCustomParamsService.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/ApiCustomParamsService.java @@ -1,6 +1,6 @@ -package com.zyplayer.doc.data.service.manage; +package org.dromara.zyplayer.data.service.manage; -import com.zyplayer.doc.data.repository.manage.entity.ApiCustomParams; +import org.dromara.zyplayer.data.repository.manage.entity.ApiCustomParams; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/ApiDocService.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/ApiDocService.java similarity index 81% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/ApiDocService.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/ApiDocService.java index 3059191f..d915ccf2 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/ApiDocService.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/ApiDocService.java @@ -1,9 +1,9 @@ -package com.zyplayer.doc.data.service.manage; +package org.dromara.zyplayer.data.service.manage; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; -import com.zyplayer.doc.data.repository.manage.entity.ApiDoc; -import com.zyplayer.doc.data.repository.manage.vo.ApiDocVo; +import org.dromara.zyplayer.data.repository.manage.entity.ApiDoc; +import org.dromara.zyplayer.data.repository.manage.vo.ApiDocVo; import java.util.List; diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/ApiGlobalParamService.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/ApiGlobalParamService.java similarity index 73% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/ApiGlobalParamService.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/ApiGlobalParamService.java index 41d6a115..28e95624 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/ApiGlobalParamService.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/ApiGlobalParamService.java @@ -1,6 +1,6 @@ -package com.zyplayer.doc.data.service.manage; +package org.dromara.zyplayer.data.service.manage; -import com.zyplayer.doc.data.repository.manage.entity.ApiGlobalParam; +import org.dromara.zyplayer.data.repository.manage.entity.ApiGlobalParam; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/ApiRequestParamService.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/ApiRequestParamService.java similarity index 67% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/ApiRequestParamService.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/ApiRequestParamService.java index 0df23573..2bc78005 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/ApiRequestParamService.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/ApiRequestParamService.java @@ -1,6 +1,6 @@ -package com.zyplayer.doc.data.service.manage; +package org.dromara.zyplayer.data.service.manage; -import com.zyplayer.doc.data.repository.manage.entity.ApiRequestParam; +import org.dromara.zyplayer.data.repository.manage.entity.ApiRequestParam; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/AuthInfoService.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/AuthInfoService.java similarity index 68% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/AuthInfoService.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/AuthInfoService.java index f94ee673..103e494e 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/AuthInfoService.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/AuthInfoService.java @@ -1,7 +1,7 @@ -package com.zyplayer.doc.data.service.manage; +package org.dromara.zyplayer.data.service.manage; import com.baomidou.mybatisplus.extension.service.IService; -import com.zyplayer.doc.data.repository.manage.entity.AuthInfo; +import org.dromara.zyplayer.data.repository.manage.entity.AuthInfo; /** *

diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/DbDatasourceService.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/DbDatasourceService.java similarity index 80% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/DbDatasourceService.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/DbDatasourceService.java index 0f31c000..32d8eb15 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/DbDatasourceService.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/DbDatasourceService.java @@ -1,7 +1,7 @@ -package com.zyplayer.doc.data.service.manage; +package org.dromara.zyplayer.data.service.manage; import com.baomidou.mybatisplus.extension.service.IService; -import com.zyplayer.doc.data.repository.manage.entity.DbDatasource; +import org.dromara.zyplayer.data.repository.manage.entity.DbDatasource; import java.util.List; diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/DbFavoriteService.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/DbFavoriteService.java similarity index 64% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/DbFavoriteService.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/DbFavoriteService.java index e05ebf4a..dee7e80f 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/DbFavoriteService.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/DbFavoriteService.java @@ -1,6 +1,6 @@ -package com.zyplayer.doc.data.service.manage; +package org.dromara.zyplayer.data.service.manage; -import com.zyplayer.doc.data.repository.manage.entity.DbFavorite; +import org.dromara.zyplayer.data.repository.manage.entity.DbFavorite; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/DbHistoryService.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/DbHistoryService.java similarity index 71% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/DbHistoryService.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/DbHistoryService.java index 57a53a64..cd1c2a1b 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/DbHistoryService.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/DbHistoryService.java @@ -1,6 +1,6 @@ -package com.zyplayer.doc.data.service.manage; +package org.dromara.zyplayer.data.service.manage; -import com.zyplayer.doc.data.repository.manage.entity.DbHistory; +import org.dromara.zyplayer.data.repository.manage.entity.DbHistory; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/DbProcLogService.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/DbProcLogService.java similarity index 67% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/DbProcLogService.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/DbProcLogService.java index ae11eee3..9158ef06 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/DbProcLogService.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/DbProcLogService.java @@ -1,6 +1,6 @@ -package com.zyplayer.doc.data.service.manage; +package org.dromara.zyplayer.data.service.manage; -import com.zyplayer.doc.data.repository.manage.entity.DbProcLog; +import org.dromara.zyplayer.data.repository.manage.entity.DbProcLog; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/DbTableRelationService.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/DbTableRelationService.java similarity index 58% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/DbTableRelationService.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/DbTableRelationService.java index bb73df0b..eb3aa501 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/DbTableRelationService.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/DbTableRelationService.java @@ -1,8 +1,8 @@ -package com.zyplayer.doc.data.service.manage; +package org.dromara.zyplayer.data.service.manage; -import com.zyplayer.doc.data.repository.manage.entity.DbTableRelation; +import org.dromara.zyplayer.data.repository.manage.entity.DbTableRelation; import com.baomidou.mybatisplus.extension.service.IService; -import com.zyplayer.doc.data.repository.manage.param.TableRelationParam; +import org.dromara.zyplayer.data.repository.manage.param.TableRelationParam; /** *

diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/DbTransferTaskService.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/DbTransferTaskService.java similarity index 73% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/DbTransferTaskService.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/DbTransferTaskService.java index 47bc6d22..22c8213c 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/DbTransferTaskService.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/DbTransferTaskService.java @@ -1,6 +1,6 @@ -package com.zyplayer.doc.data.service.manage; +package org.dromara.zyplayer.data.service.manage; -import com.zyplayer.doc.data.repository.manage.entity.DbTransferTask; +import org.dromara.zyplayer.data.repository.manage.entity.DbTransferTask; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/SystemConfigService.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/SystemConfigService.java similarity index 82% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/SystemConfigService.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/SystemConfigService.java index 8d68448d..5b70026e 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/SystemConfigService.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/SystemConfigService.java @@ -1,8 +1,8 @@ -package com.zyplayer.doc.data.service.manage; +package org.dromara.zyplayer.data.service.manage; import com.baomidou.mybatisplus.extension.service.IService; -import com.zyplayer.doc.core.enums.SystemConfigEnum; -import com.zyplayer.doc.data.repository.manage.entity.SystemConfig; +import org.dromara.zyplayer.core.enums.SystemConfigEnum; +import org.dromara.zyplayer.data.repository.manage.entity.SystemConfig; /** *

diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/UserAuthService.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/UserAuthService.java similarity index 79% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/UserAuthService.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/UserAuthService.java index bee749f9..ea62f752 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/UserAuthService.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/UserAuthService.java @@ -1,8 +1,8 @@ -package com.zyplayer.doc.data.service.manage; +package org.dromara.zyplayer.data.service.manage; import com.baomidou.mybatisplus.extension.service.IService; -import com.zyplayer.doc.data.config.security.UserAuthInfo; -import com.zyplayer.doc.data.repository.manage.entity.UserAuth; +import org.dromara.zyplayer.data.config.security.UserAuthInfo; +import org.dromara.zyplayer.data.repository.manage.entity.UserAuth; import java.util.List; diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/UserGroupAuthService.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/UserGroupAuthService.java similarity index 68% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/UserGroupAuthService.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/UserGroupAuthService.java index d5f617fc..d8efb3b2 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/UserGroupAuthService.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/UserGroupAuthService.java @@ -1,6 +1,6 @@ -package com.zyplayer.doc.data.service.manage; +package org.dromara.zyplayer.data.service.manage; -import com.zyplayer.doc.data.repository.manage.entity.UserGroupAuth; +import org.dromara.zyplayer.data.repository.manage.entity.UserGroupAuth; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/UserGroupRelationService.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/UserGroupRelationService.java similarity index 67% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/UserGroupRelationService.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/UserGroupRelationService.java index 3ab8b609..ff291665 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/UserGroupRelationService.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/UserGroupRelationService.java @@ -1,6 +1,6 @@ -package com.zyplayer.doc.data.service.manage; +package org.dromara.zyplayer.data.service.manage; -import com.zyplayer.doc.data.repository.manage.entity.UserGroupRelation; +import org.dromara.zyplayer.data.repository.manage.entity.UserGroupRelation; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/UserGroupService.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/UserGroupService.java similarity index 65% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/UserGroupService.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/UserGroupService.java index 263bde15..fdbd2215 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/UserGroupService.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/UserGroupService.java @@ -1,6 +1,6 @@ -package com.zyplayer.doc.data.service.manage; +package org.dromara.zyplayer.data.service.manage; -import com.zyplayer.doc.data.repository.manage.entity.UserGroup; +import org.dromara.zyplayer.data.repository.manage.entity.UserGroup; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/UserInfoService.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/UserInfoService.java similarity index 64% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/UserInfoService.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/UserInfoService.java index e0240e87..533832c6 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/UserInfoService.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/UserInfoService.java @@ -1,7 +1,7 @@ -package com.zyplayer.doc.data.service.manage; +package org.dromara.zyplayer.data.service.manage; import com.baomidou.mybatisplus.extension.service.IService; -import com.zyplayer.doc.data.repository.manage.entity.UserInfo; +import org.dromara.zyplayer.data.repository.manage.entity.UserInfo; /** *

diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/UserMessageService.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/UserMessageService.java similarity index 56% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/UserMessageService.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/UserMessageService.java index e1b17dfb..cef69f0e 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/UserMessageService.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/UserMessageService.java @@ -1,10 +1,10 @@ -package com.zyplayer.doc.data.service.manage; +package org.dromara.zyplayer.data.service.manage; import com.baomidou.mybatisplus.extension.service.IService; -import com.zyplayer.doc.data.config.security.DocUserDetails; -import com.zyplayer.doc.data.repository.manage.entity.UserMessage; -import com.zyplayer.doc.data.repository.support.consts.DocSysType; -import com.zyplayer.doc.data.repository.support.consts.UserMsgType; +import org.dromara.zyplayer.data.config.security.DocUserDetails; +import org.dromara.zyplayer.data.repository.manage.entity.UserMessage; +import org.dromara.zyplayer.data.repository.support.consts.DocSysType; +import org.dromara.zyplayer.data.repository.support.consts.UserMsgType; /** *

diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/UserSettingService.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/UserSettingService.java similarity index 69% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/UserSettingService.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/UserSettingService.java index 7d613ca2..59d74a9a 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/UserSettingService.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/UserSettingService.java @@ -1,6 +1,6 @@ -package com.zyplayer.doc.data.service.manage; +package org.dromara.zyplayer.data.service.manage; -import com.zyplayer.doc.data.repository.manage.entity.UserSetting; +import org.dromara.zyplayer.data.repository.manage.entity.UserSetting; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/WikiPageCommentService.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/WikiPageCommentService.java similarity index 64% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/WikiPageCommentService.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/WikiPageCommentService.java index 5501c225..6bf65520 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/WikiPageCommentService.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/WikiPageCommentService.java @@ -1,6 +1,6 @@ -package com.zyplayer.doc.data.service.manage; +package org.dromara.zyplayer.data.service.manage; -import com.zyplayer.doc.data.repository.manage.entity.WikiPageComment; +import org.dromara.zyplayer.data.repository.manage.entity.WikiPageComment; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/WikiPageContentService.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/WikiPageContentService.java similarity index 64% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/WikiPageContentService.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/WikiPageContentService.java index b8aa26de..2e188b73 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/WikiPageContentService.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/WikiPageContentService.java @@ -1,6 +1,6 @@ -package com.zyplayer.doc.data.service.manage; +package org.dromara.zyplayer.data.service.manage; -import com.zyplayer.doc.data.repository.manage.entity.WikiPageContent; +import org.dromara.zyplayer.data.repository.manage.entity.WikiPageContent; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/WikiPageFileService.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/WikiPageFileService.java similarity index 64% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/WikiPageFileService.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/WikiPageFileService.java index 6676ace4..9d4b1d4d 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/WikiPageFileService.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/WikiPageFileService.java @@ -1,6 +1,6 @@ -package com.zyplayer.doc.data.service.manage; +package org.dromara.zyplayer.data.service.manage; -import com.zyplayer.doc.data.repository.manage.entity.WikiPageFile; +import org.dromara.zyplayer.data.repository.manage.entity.WikiPageFile; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/WikiPageHistoryService.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/WikiPageHistoryService.java similarity index 72% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/WikiPageHistoryService.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/WikiPageHistoryService.java index f84eca71..af8487a9 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/WikiPageHistoryService.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/WikiPageHistoryService.java @@ -1,6 +1,6 @@ -package com.zyplayer.doc.data.service.manage; +package org.dromara.zyplayer.data.service.manage; -import com.zyplayer.doc.data.repository.manage.entity.WikiPageHistory; +import org.dromara.zyplayer.data.repository.manage.entity.WikiPageHistory; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/WikiPageService.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/WikiPageService.java similarity index 68% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/WikiPageService.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/WikiPageService.java index 005437bc..095ed99f 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/WikiPageService.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/WikiPageService.java @@ -1,8 +1,8 @@ -package com.zyplayer.doc.data.service.manage; +package org.dromara.zyplayer.data.service.manage; -import com.zyplayer.doc.data.repository.manage.entity.WikiPage; +import org.dromara.zyplayer.data.repository.manage.entity.WikiPage; import com.baomidou.mybatisplus.extension.service.IService; -import com.zyplayer.doc.data.repository.manage.vo.WikiPageTemplateInfoVo; +import org.dromara.zyplayer.data.repository.manage.vo.WikiPageTemplateInfoVo; import java.util.List; diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/WikiPageTemplateService.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/WikiPageTemplateService.java similarity index 74% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/WikiPageTemplateService.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/WikiPageTemplateService.java index 848a85e4..1da76809 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/WikiPageTemplateService.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/WikiPageTemplateService.java @@ -1,9 +1,9 @@ -package com.zyplayer.doc.data.service.manage; +package org.dromara.zyplayer.data.service.manage; import com.baomidou.mybatisplus.extension.service.IService; -import com.zyplayer.doc.data.repository.manage.entity.WikiPageTemplate; -import com.zyplayer.doc.data.repository.manage.vo.WikiPageTemplateInfoVo; -import com.zyplayer.doc.data.repository.manage.vo.WikiTemplateTagVo; +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 java.util.List; diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/WikiPageZanService.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/WikiPageZanService.java similarity index 68% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/WikiPageZanService.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/WikiPageZanService.java index 6d902927..71ba1cc3 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/WikiPageZanService.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/WikiPageZanService.java @@ -1,6 +1,6 @@ -package com.zyplayer.doc.data.service.manage; +package org.dromara.zyplayer.data.service.manage; -import com.zyplayer.doc.data.repository.manage.entity.WikiPageZan; +import org.dromara.zyplayer.data.repository.manage.entity.WikiPageZan; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/WikiSpaceFavoriteService.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/WikiSpaceFavoriteService.java similarity index 72% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/WikiSpaceFavoriteService.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/WikiSpaceFavoriteService.java index 0cee9bc7..746bfe83 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/WikiSpaceFavoriteService.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/WikiSpaceFavoriteService.java @@ -1,6 +1,6 @@ -package com.zyplayer.doc.data.service.manage; +package org.dromara.zyplayer.data.service.manage; -import com.zyplayer.doc.data.repository.manage.entity.WikiSpaceFavorite; +import org.dromara.zyplayer.data.repository.manage.entity.WikiSpaceFavorite; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/WikiSpaceService.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/WikiSpaceService.java similarity index 64% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/WikiSpaceService.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/WikiSpaceService.java index aecdd80d..a67e191d 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/WikiSpaceService.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/WikiSpaceService.java @@ -1,6 +1,6 @@ -package com.zyplayer.doc.data.service.manage; +package org.dromara.zyplayer.data.service.manage; -import com.zyplayer.doc.data.repository.manage.entity.WikiSpace; +import org.dromara.zyplayer.data.repository.manage.entity.WikiSpace; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/ApiCustomNodeServiceImpl.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/impl/ApiCustomNodeServiceImpl.java similarity index 91% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/ApiCustomNodeServiceImpl.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/impl/ApiCustomNodeServiceImpl.java index f9884a7e..077ce155 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/ApiCustomNodeServiceImpl.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/impl/ApiCustomNodeServiceImpl.java @@ -1,15 +1,17 @@ -package com.zyplayer.doc.data.service.manage.impl; +package org.dromara.zyplayer.data.service.manage.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -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.ApiCustomNodeMapper; -import com.zyplayer.doc.data.repository.manage.vo.ApiCustomDocVo; -import com.zyplayer.doc.data.service.common.ApiDocAuthJudgeService; -import com.zyplayer.doc.data.service.manage.ApiCustomNodeService; +import org.dromara.zyplayer.data.config.security.DocUserDetails; +import org.dromara.zyplayer.data.config.security.DocUserUtil; +import org.dromara.zyplayer.data.repository.manage.entity.ApiCustomNode; +import org.dromara.zyplayer.data.repository.manage.entity.ApiCustomParams; +import org.dromara.zyplayer.data.repository.manage.entity.ApiDoc; +import org.dromara.zyplayer.data.repository.manage.mapper.ApiCustomNodeMapper; +import org.dromara.zyplayer.data.repository.manage.vo.ApiCustomDocVo; +import org.dromara.zyplayer.data.service.common.ApiDocAuthJudgeService; +import org.dromara.zyplayer.data.service.manage.ApiCustomNodeService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.zyplayer.doc.data.service.manage.ApiCustomParamsService; +import org.dromara.zyplayer.data.service.manage.ApiCustomParamsService; import org.apache.commons.collections.CollectionUtils; import org.springframework.stereotype.Service; diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/ApiCustomParamsServiceImpl.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/impl/ApiCustomParamsServiceImpl.java similarity index 57% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/ApiCustomParamsServiceImpl.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/impl/ApiCustomParamsServiceImpl.java index 001bc34c..8ab2c10c 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/ApiCustomParamsServiceImpl.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/impl/ApiCustomParamsServiceImpl.java @@ -1,8 +1,8 @@ -package com.zyplayer.doc.data.service.manage.impl; +package org.dromara.zyplayer.data.service.manage.impl; -import com.zyplayer.doc.data.repository.manage.entity.ApiCustomParams; -import com.zyplayer.doc.data.repository.manage.mapper.ApiCustomParamsMapper; -import com.zyplayer.doc.data.service.manage.ApiCustomParamsService; +import org.dromara.zyplayer.data.repository.manage.entity.ApiCustomParams; +import org.dromara.zyplayer.data.repository.manage.mapper.ApiCustomParamsMapper; +import org.dromara.zyplayer.data.service.manage.ApiCustomParamsService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/ApiDocServiceImpl.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/impl/ApiDocServiceImpl.java similarity index 82% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/ApiDocServiceImpl.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/impl/ApiDocServiceImpl.java index 0363d626..4d829c19 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/ApiDocServiceImpl.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/impl/ApiDocServiceImpl.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.data.service.manage.impl; +package org.dromara.zyplayer.data.service.manage.impl; import java.util.*; import cn.hutool.core.bean.BeanUtil; @@ -6,19 +6,19 @@ 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.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.zyplayer.doc.data.config.security.DocUserDetails; -import com.zyplayer.doc.data.config.security.DocUserUtil; -import com.zyplayer.doc.data.repository.manage.entity.ApiDoc; -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.mapper.ApiDocMapper; -import com.zyplayer.doc.data.repository.manage.vo.ApiDocVo; -import com.zyplayer.doc.data.repository.support.consts.ApiAuthType; -import com.zyplayer.doc.data.repository.support.consts.DocSysModuleType; -import com.zyplayer.doc.data.repository.support.consts.DocSysType; -import com.zyplayer.doc.data.service.manage.ApiDocService; -import com.zyplayer.doc.data.service.manage.AuthInfoService; -import com.zyplayer.doc.data.service.manage.UserAuthService; +import org.dromara.zyplayer.data.config.security.DocUserDetails; +import org.dromara.zyplayer.data.config.security.DocUserUtil; +import org.dromara.zyplayer.data.repository.manage.entity.ApiDoc; +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.mapper.ApiDocMapper; +import org.dromara.zyplayer.data.repository.manage.vo.ApiDocVo; +import org.dromara.zyplayer.data.repository.support.consts.ApiAuthType; +import org.dromara.zyplayer.data.repository.support.consts.DocSysModuleType; +import org.dromara.zyplayer.data.repository.support.consts.DocSysType; +import org.dromara.zyplayer.data.service.manage.ApiDocService; +import org.dromara.zyplayer.data.service.manage.AuthInfoService; +import org.dromara.zyplayer.data.service.manage.UserAuthService; import org.apache.commons.collections.CollectionUtils; import org.springframework.stereotype.Service; diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/ApiGlobalParamServiceImpl.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/impl/ApiGlobalParamServiceImpl.java similarity index 73% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/ApiGlobalParamServiceImpl.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/impl/ApiGlobalParamServiceImpl.java index 2f249663..86bd63bc 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/ApiGlobalParamServiceImpl.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/impl/ApiGlobalParamServiceImpl.java @@ -1,11 +1,11 @@ -package com.zyplayer.doc.data.service.manage.impl; +package org.dromara.zyplayer.data.service.manage.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.zyplayer.doc.data.config.security.DocUserDetails; -import com.zyplayer.doc.data.config.security.DocUserUtil; -import com.zyplayer.doc.data.repository.manage.entity.ApiGlobalParam; -import com.zyplayer.doc.data.repository.manage.mapper.ApiGlobalParamMapper; -import com.zyplayer.doc.data.service.manage.ApiGlobalParamService; +import org.dromara.zyplayer.data.config.security.DocUserDetails; +import org.dromara.zyplayer.data.config.security.DocUserUtil; +import org.dromara.zyplayer.data.repository.manage.entity.ApiGlobalParam; +import org.dromara.zyplayer.data.repository.manage.mapper.ApiGlobalParamMapper; +import org.dromara.zyplayer.data.service.manage.ApiGlobalParamService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/ApiRequestParamServiceImpl.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/impl/ApiRequestParamServiceImpl.java similarity index 57% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/ApiRequestParamServiceImpl.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/impl/ApiRequestParamServiceImpl.java index d25d2e0d..d850077d 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/ApiRequestParamServiceImpl.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/impl/ApiRequestParamServiceImpl.java @@ -1,8 +1,8 @@ -package com.zyplayer.doc.data.service.manage.impl; +package org.dromara.zyplayer.data.service.manage.impl; -import com.zyplayer.doc.data.repository.manage.entity.ApiRequestParam; -import com.zyplayer.doc.data.repository.manage.mapper.ApiRequestParamMapper; -import com.zyplayer.doc.data.service.manage.ApiRequestParamService; +import org.dromara.zyplayer.data.repository.manage.entity.ApiRequestParam; +import org.dromara.zyplayer.data.repository.manage.mapper.ApiRequestParamMapper; +import org.dromara.zyplayer.data.service.manage.ApiRequestParamService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/AuthInfoServiceImpl.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/impl/AuthInfoServiceImpl.java similarity index 67% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/AuthInfoServiceImpl.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/impl/AuthInfoServiceImpl.java index dbf22c19..bfe8a4a9 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/AuthInfoServiceImpl.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/impl/AuthInfoServiceImpl.java @@ -1,10 +1,10 @@ -package com.zyplayer.doc.data.service.manage.impl; +package org.dromara.zyplayer.data.service.manage.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.zyplayer.doc.data.repository.manage.entity.AuthInfo; -import com.zyplayer.doc.data.repository.manage.mapper.AuthInfoMapper; -import com.zyplayer.doc.data.service.manage.AuthInfoService; +import org.dromara.zyplayer.data.repository.manage.entity.AuthInfo; +import org.dromara.zyplayer.data.repository.manage.mapper.AuthInfoMapper; +import org.dromara.zyplayer.data.service.manage.AuthInfoService; import org.springframework.stereotype.Service; /** diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/DbDatasourceServiceImpl.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/impl/DbDatasourceServiceImpl.java similarity index 78% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/DbDatasourceServiceImpl.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/impl/DbDatasourceServiceImpl.java index fb557607..f6173334 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/DbDatasourceServiceImpl.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/impl/DbDatasourceServiceImpl.java @@ -1,17 +1,17 @@ -package com.zyplayer.doc.data.service.manage.impl; +package org.dromara.zyplayer.data.service.manage.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.zyplayer.doc.data.config.security.DocUserDetails; -import com.zyplayer.doc.data.config.security.DocUserUtil; -import com.zyplayer.doc.data.repository.manage.entity.DbDatasource; -import com.zyplayer.doc.data.repository.manage.entity.UserAuth; -import com.zyplayer.doc.data.repository.manage.mapper.DbDatasourceMapper; -import com.zyplayer.doc.data.repository.support.consts.DocAuthConst; -import com.zyplayer.doc.data.repository.support.consts.DocSysModuleType; -import com.zyplayer.doc.data.repository.support.consts.DocSysType; -import com.zyplayer.doc.data.service.manage.DbDatasourceService; -import com.zyplayer.doc.data.service.manage.UserAuthService; +import org.dromara.zyplayer.data.config.security.DocUserDetails; +import org.dromara.zyplayer.data.config.security.DocUserUtil; +import org.dromara.zyplayer.data.repository.manage.entity.DbDatasource; +import org.dromara.zyplayer.data.repository.manage.entity.UserAuth; +import org.dromara.zyplayer.data.repository.manage.mapper.DbDatasourceMapper; +import org.dromara.zyplayer.data.repository.support.consts.DocAuthConst; +import org.dromara.zyplayer.data.repository.support.consts.DocSysModuleType; +import org.dromara.zyplayer.data.repository.support.consts.DocSysType; +import org.dromara.zyplayer.data.service.manage.DbDatasourceService; +import org.dromara.zyplayer.data.service.manage.UserAuthService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/DbFavoriteServiceImpl.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/impl/DbFavoriteServiceImpl.java similarity index 56% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/DbFavoriteServiceImpl.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/impl/DbFavoriteServiceImpl.java index 199c2b71..75b6c976 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/DbFavoriteServiceImpl.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/impl/DbFavoriteServiceImpl.java @@ -1,8 +1,8 @@ -package com.zyplayer.doc.data.service.manage.impl; +package org.dromara.zyplayer.data.service.manage.impl; -import com.zyplayer.doc.data.repository.manage.entity.DbFavorite; -import com.zyplayer.doc.data.repository.manage.mapper.DbFavoriteMapper; -import com.zyplayer.doc.data.service.manage.DbFavoriteService; +import org.dromara.zyplayer.data.repository.manage.entity.DbFavorite; +import org.dromara.zyplayer.data.repository.manage.mapper.DbFavoriteMapper; +import org.dromara.zyplayer.data.service.manage.DbFavoriteService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/DbHistoryServiceImpl.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/impl/DbHistoryServiceImpl.java similarity index 72% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/DbHistoryServiceImpl.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/impl/DbHistoryServiceImpl.java index b112d344..eda9496f 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/DbHistoryServiceImpl.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/impl/DbHistoryServiceImpl.java @@ -1,10 +1,10 @@ -package com.zyplayer.doc.data.service.manage.impl; +package org.dromara.zyplayer.data.service.manage.impl; -import com.zyplayer.doc.data.config.security.DocUserDetails; -import com.zyplayer.doc.data.config.security.DocUserUtil; -import com.zyplayer.doc.data.repository.manage.entity.DbHistory; -import com.zyplayer.doc.data.repository.manage.mapper.DbHistoryMapper; -import com.zyplayer.doc.data.service.manage.DbHistoryService; +import org.dromara.zyplayer.data.config.security.DocUserDetails; +import org.dromara.zyplayer.data.config.security.DocUserUtil; +import org.dromara.zyplayer.data.repository.manage.entity.DbHistory; +import org.dromara.zyplayer.data.repository.manage.mapper.DbHistoryMapper; +import org.dromara.zyplayer.data.service.manage.DbHistoryService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/DbProcLogServiceImpl.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/impl/DbProcLogServiceImpl.java similarity index 57% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/DbProcLogServiceImpl.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/impl/DbProcLogServiceImpl.java index 4c92c397..270dbaad 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/DbProcLogServiceImpl.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/impl/DbProcLogServiceImpl.java @@ -1,8 +1,8 @@ -package com.zyplayer.doc.data.service.manage.impl; +package org.dromara.zyplayer.data.service.manage.impl; -import com.zyplayer.doc.data.repository.manage.entity.DbProcLog; -import com.zyplayer.doc.data.repository.manage.mapper.DbProcLogMapper; -import com.zyplayer.doc.data.service.manage.DbProcLogService; +import org.dromara.zyplayer.data.repository.manage.entity.DbProcLog; +import org.dromara.zyplayer.data.repository.manage.mapper.DbProcLogMapper; +import org.dromara.zyplayer.data.service.manage.DbProcLogService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/DbTableRelationServiceImpl.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/impl/DbTableRelationServiceImpl.java similarity index 82% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/DbTableRelationServiceImpl.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/impl/DbTableRelationServiceImpl.java index c8880821..ad5c3549 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/DbTableRelationServiceImpl.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/impl/DbTableRelationServiceImpl.java @@ -1,14 +1,14 @@ -package com.zyplayer.doc.data.service.manage.impl; +package org.dromara.zyplayer.data.service.manage.impl; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.zyplayer.doc.data.config.security.DocUserDetails; -import com.zyplayer.doc.data.config.security.DocUserUtil; -import com.zyplayer.doc.data.repository.manage.entity.DbTableRelation; -import com.zyplayer.doc.data.repository.manage.mapper.DbTableRelationMapper; -import com.zyplayer.doc.data.repository.manage.param.TableRelationParam; -import com.zyplayer.doc.data.service.manage.DbTableRelationService; +import org.dromara.zyplayer.data.config.security.DocUserDetails; +import org.dromara.zyplayer.data.config.security.DocUserUtil; +import org.dromara.zyplayer.data.repository.manage.entity.DbTableRelation; +import org.dromara.zyplayer.data.repository.manage.mapper.DbTableRelationMapper; +import org.dromara.zyplayer.data.repository.manage.param.TableRelationParam; +import org.dromara.zyplayer.data.service.manage.DbTableRelationService; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/DbTransferTaskServiceImpl.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/impl/DbTransferTaskServiceImpl.java similarity index 75% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/DbTransferTaskServiceImpl.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/impl/DbTransferTaskServiceImpl.java index acef24c2..c5a472c7 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/DbTransferTaskServiceImpl.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/impl/DbTransferTaskServiceImpl.java @@ -1,9 +1,9 @@ -package com.zyplayer.doc.data.service.manage.impl; +package org.dromara.zyplayer.data.service.manage.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.zyplayer.doc.data.repository.manage.entity.DbTransferTask; -import com.zyplayer.doc.data.repository.manage.mapper.DbTransferTaskMapper; -import com.zyplayer.doc.data.service.manage.DbTransferTaskService; +import org.dromara.zyplayer.data.repository.manage.entity.DbTransferTask; +import org.dromara.zyplayer.data.repository.manage.mapper.DbTransferTaskMapper; +import org.dromara.zyplayer.data.service.manage.DbTransferTaskService; import org.springframework.stereotype.Service; import java.util.Date; diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/SystemConfigServiceImpl.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/impl/SystemConfigServiceImpl.java similarity index 86% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/SystemConfigServiceImpl.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/impl/SystemConfigServiceImpl.java index 852e7002..7e93ee2f 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/SystemConfigServiceImpl.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/impl/SystemConfigServiceImpl.java @@ -1,15 +1,15 @@ -package com.zyplayer.doc.data.service.manage.impl; +package org.dromara.zyplayer.data.service.manage.impl; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.zyplayer.doc.core.enums.SystemConfigEnum; -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.SystemConfig; -import com.zyplayer.doc.data.repository.manage.mapper.SystemConfigMapper; -import com.zyplayer.doc.data.service.manage.SystemConfigService; +import org.dromara.zyplayer.core.enums.SystemConfigEnum; +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.SystemConfig; +import org.dromara.zyplayer.data.repository.manage.mapper.SystemConfigMapper; +import org.dromara.zyplayer.data.service.manage.SystemConfigService; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/UserAuthServiceImpl.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/impl/UserAuthServiceImpl.java similarity index 87% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/UserAuthServiceImpl.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/impl/UserAuthServiceImpl.java index 6407372b..bc731748 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/UserAuthServiceImpl.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/impl/UserAuthServiceImpl.java @@ -1,13 +1,13 @@ -package com.zyplayer.doc.data.service.manage.impl; +package org.dromara.zyplayer.data.service.manage.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -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.mapper.UserAuthMapper; -import com.zyplayer.doc.data.service.manage.AuthInfoService; -import com.zyplayer.doc.data.service.manage.UserAuthService; +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.mapper.UserAuthMapper; +import org.dromara.zyplayer.data.service.manage.AuthInfoService; +import org.dromara.zyplayer.data.service.manage.UserAuthService; import org.apache.commons.collections.CollectionUtils; import org.springframework.stereotype.Service; diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/UserGroupAuthServiceImpl.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/impl/UserGroupAuthServiceImpl.java similarity index 58% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/UserGroupAuthServiceImpl.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/impl/UserGroupAuthServiceImpl.java index 0aec521b..20a436a6 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/UserGroupAuthServiceImpl.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/impl/UserGroupAuthServiceImpl.java @@ -1,8 +1,8 @@ -package com.zyplayer.doc.data.service.manage.impl; +package org.dromara.zyplayer.data.service.manage.impl; -import com.zyplayer.doc.data.repository.manage.entity.UserGroupAuth; -import com.zyplayer.doc.data.repository.manage.mapper.UserGroupAuthMapper; -import com.zyplayer.doc.data.service.manage.UserGroupAuthService; +import org.dromara.zyplayer.data.repository.manage.entity.UserGroupAuth; +import org.dromara.zyplayer.data.repository.manage.mapper.UserGroupAuthMapper; +import org.dromara.zyplayer.data.service.manage.UserGroupAuthService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/UserGroupRelationServiceImpl.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/impl/UserGroupRelationServiceImpl.java similarity index 57% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/UserGroupRelationServiceImpl.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/impl/UserGroupRelationServiceImpl.java index 761a41b2..de15c4bb 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/UserGroupRelationServiceImpl.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/impl/UserGroupRelationServiceImpl.java @@ -1,8 +1,8 @@ -package com.zyplayer.doc.data.service.manage.impl; +package org.dromara.zyplayer.data.service.manage.impl; -import com.zyplayer.doc.data.repository.manage.entity.UserGroupRelation; -import com.zyplayer.doc.data.repository.manage.mapper.UserGroupRelationMapper; -import com.zyplayer.doc.data.service.manage.UserGroupRelationService; +import org.dromara.zyplayer.data.repository.manage.entity.UserGroupRelation; +import org.dromara.zyplayer.data.repository.manage.mapper.UserGroupRelationMapper; +import org.dromara.zyplayer.data.service.manage.UserGroupRelationService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/UserGroupServiceImpl.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/impl/UserGroupServiceImpl.java similarity index 56% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/UserGroupServiceImpl.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/impl/UserGroupServiceImpl.java index 712305c8..0560daf3 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/UserGroupServiceImpl.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/impl/UserGroupServiceImpl.java @@ -1,8 +1,8 @@ -package com.zyplayer.doc.data.service.manage.impl; +package org.dromara.zyplayer.data.service.manage.impl; -import com.zyplayer.doc.data.repository.manage.entity.UserGroup; -import com.zyplayer.doc.data.repository.manage.mapper.UserGroupMapper; -import com.zyplayer.doc.data.service.manage.UserGroupService; +import org.dromara.zyplayer.data.repository.manage.entity.UserGroup; +import org.dromara.zyplayer.data.repository.manage.mapper.UserGroupMapper; +import org.dromara.zyplayer.data.service.manage.UserGroupService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/UserInfoServiceImpl.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/impl/UserInfoServiceImpl.java similarity index 56% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/UserInfoServiceImpl.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/impl/UserInfoServiceImpl.java index 536ba734..5d1757be 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/UserInfoServiceImpl.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/impl/UserInfoServiceImpl.java @@ -1,9 +1,9 @@ -package com.zyplayer.doc.data.service.manage.impl; +package org.dromara.zyplayer.data.service.manage.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.zyplayer.doc.data.repository.manage.entity.UserInfo; -import com.zyplayer.doc.data.repository.manage.mapper.UserInfoMapper; -import com.zyplayer.doc.data.service.manage.UserInfoService; +import org.dromara.zyplayer.data.repository.manage.entity.UserInfo; +import org.dromara.zyplayer.data.repository.manage.mapper.UserInfoMapper; +import org.dromara.zyplayer.data.service.manage.UserInfoService; import org.springframework.stereotype.Service; /** diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/UserMessageServiceImpl.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/impl/UserMessageServiceImpl.java similarity index 94% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/UserMessageServiceImpl.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/impl/UserMessageServiceImpl.java index 36b72cf9..780bbef0 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/UserMessageServiceImpl.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/impl/UserMessageServiceImpl.java @@ -1,12 +1,12 @@ -package com.zyplayer.doc.data.service.manage.impl; +package org.dromara.zyplayer.data.service.manage.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.zyplayer.doc.data.config.security.DocUserDetails; -import com.zyplayer.doc.data.repository.manage.entity.UserMessage; -import com.zyplayer.doc.data.repository.manage.mapper.UserMessageMapper; -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 org.dromara.zyplayer.data.config.security.DocUserDetails; +import org.dromara.zyplayer.data.repository.manage.entity.UserMessage; +import org.dromara.zyplayer.data.repository.manage.mapper.UserMessageMapper; +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.springframework.stereotype.Service; import java.util.Date; diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/UserSettingServiceImpl.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/impl/UserSettingServiceImpl.java similarity index 67% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/UserSettingServiceImpl.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/impl/UserSettingServiceImpl.java index 05da0752..893f05f2 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/UserSettingServiceImpl.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/impl/UserSettingServiceImpl.java @@ -1,13 +1,13 @@ -package com.zyplayer.doc.data.service.manage.impl; +package org.dromara.zyplayer.data.service.manage.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.zyplayer.doc.data.config.security.DocUserDetails; -import com.zyplayer.doc.data.config.security.DocUserUtil; -import com.zyplayer.doc.data.repository.manage.entity.UserSetting; -import com.zyplayer.doc.data.repository.manage.mapper.UserSettingMapper; -import com.zyplayer.doc.data.repository.support.consts.UserSettingConst; -import com.zyplayer.doc.data.service.manage.UserSettingService; +import org.dromara.zyplayer.data.config.security.DocUserDetails; +import org.dromara.zyplayer.data.config.security.DocUserUtil; +import org.dromara.zyplayer.data.repository.manage.entity.UserSetting; +import org.dromara.zyplayer.data.repository.manage.mapper.UserSettingMapper; +import org.dromara.zyplayer.data.repository.support.consts.UserSettingConst; +import org.dromara.zyplayer.data.service.manage.UserSettingService; import org.springframework.stereotype.Service; /** diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/WikiPageCommentServiceImpl.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/impl/WikiPageCommentServiceImpl.java similarity index 56% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/WikiPageCommentServiceImpl.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/impl/WikiPageCommentServiceImpl.java index 35f4be0d..8e9a857d 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/WikiPageCommentServiceImpl.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/impl/WikiPageCommentServiceImpl.java @@ -1,8 +1,8 @@ -package com.zyplayer.doc.data.service.manage.impl; +package org.dromara.zyplayer.data.service.manage.impl; -import com.zyplayer.doc.data.repository.manage.entity.WikiPageComment; -import com.zyplayer.doc.data.repository.manage.mapper.WikiPageCommentMapper; -import com.zyplayer.doc.data.service.manage.WikiPageCommentService; +import org.dromara.zyplayer.data.repository.manage.entity.WikiPageComment; +import org.dromara.zyplayer.data.repository.manage.mapper.WikiPageCommentMapper; +import org.dromara.zyplayer.data.service.manage.WikiPageCommentService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/WikiPageContentServiceImpl.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/impl/WikiPageContentServiceImpl.java similarity index 56% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/WikiPageContentServiceImpl.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/impl/WikiPageContentServiceImpl.java index 8a286b9c..ce7598fd 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/WikiPageContentServiceImpl.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/impl/WikiPageContentServiceImpl.java @@ -1,8 +1,8 @@ -package com.zyplayer.doc.data.service.manage.impl; +package org.dromara.zyplayer.data.service.manage.impl; -import com.zyplayer.doc.data.repository.manage.entity.WikiPageContent; -import com.zyplayer.doc.data.repository.manage.mapper.WikiPageContentMapper; -import com.zyplayer.doc.data.service.manage.WikiPageContentService; +import org.dromara.zyplayer.data.repository.manage.entity.WikiPageContent; +import org.dromara.zyplayer.data.repository.manage.mapper.WikiPageContentMapper; +import org.dromara.zyplayer.data.service.manage.WikiPageContentService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/WikiPageFileServiceImpl.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/impl/WikiPageFileServiceImpl.java similarity index 56% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/WikiPageFileServiceImpl.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/impl/WikiPageFileServiceImpl.java index 4844b599..9902dd38 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/WikiPageFileServiceImpl.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/impl/WikiPageFileServiceImpl.java @@ -1,8 +1,8 @@ -package com.zyplayer.doc.data.service.manage.impl; +package org.dromara.zyplayer.data.service.manage.impl; -import com.zyplayer.doc.data.repository.manage.entity.WikiPageFile; -import com.zyplayer.doc.data.repository.manage.mapper.WikiPageFileMapper; -import com.zyplayer.doc.data.service.manage.WikiPageFileService; +import org.dromara.zyplayer.data.repository.manage.entity.WikiPageFile; +import org.dromara.zyplayer.data.repository.manage.mapper.WikiPageFileMapper; +import org.dromara.zyplayer.data.service.manage.WikiPageFileService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/WikiPageHistoryServiceImpl.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/impl/WikiPageHistoryServiceImpl.java similarity index 73% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/WikiPageHistoryServiceImpl.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/impl/WikiPageHistoryServiceImpl.java index 801ef8bf..2cfdac75 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/WikiPageHistoryServiceImpl.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/impl/WikiPageHistoryServiceImpl.java @@ -1,12 +1,12 @@ -package com.zyplayer.doc.data.service.manage.impl; +package org.dromara.zyplayer.data.service.manage.impl; 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.WikiPageHistory; -import com.zyplayer.doc.data.repository.manage.mapper.WikiPageHistoryMapper; -import com.zyplayer.doc.data.service.manage.WikiPageHistoryService; +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.WikiPageHistory; +import org.dromara.zyplayer.data.repository.manage.mapper.WikiPageHistoryMapper; +import org.dromara.zyplayer.data.service.manage.WikiPageHistoryService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/WikiPageServiceImpl.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/impl/WikiPageServiceImpl.java similarity index 81% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/WikiPageServiceImpl.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/impl/WikiPageServiceImpl.java index e466d02e..6b4f4a40 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/WikiPageServiceImpl.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/impl/WikiPageServiceImpl.java @@ -1,18 +1,18 @@ -package com.zyplayer.doc.data.service.manage.impl; +package org.dromara.zyplayer.data.service.manage.impl; import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -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.mapper.WikiPageMapper; -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.UserMessageService; -import com.zyplayer.doc.data.service.manage.WikiPageService; +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.mapper.WikiPageMapper; +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.UserMessageService; +import org.dromara.zyplayer.data.service.manage.WikiPageService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/WikiPageTemplateServiceImpl.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/impl/WikiPageTemplateServiceImpl.java similarity index 77% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/WikiPageTemplateServiceImpl.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/impl/WikiPageTemplateServiceImpl.java index 45dde0ad..e95bbb72 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/WikiPageTemplateServiceImpl.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/impl/WikiPageTemplateServiceImpl.java @@ -1,12 +1,12 @@ -package com.zyplayer.doc.data.service.manage.impl; +package org.dromara.zyplayer.data.service.manage.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.zyplayer.doc.data.repository.manage.entity.WikiPageTemplate; -import com.zyplayer.doc.data.repository.manage.mapper.WikiPageTemplateMapper; -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.WikiPageTemplateService; +import org.dromara.zyplayer.data.repository.manage.entity.WikiPageTemplate; +import org.dromara.zyplayer.data.repository.manage.mapper.WikiPageTemplateMapper; +import org.dromara.zyplayer.data.repository.manage.vo.WikiPageTemplateInfoVo; +import org.dromara.zyplayer.data.repository.manage.vo.WikiTemplateTagVo; +import org.dromara.zyplayer.data.service.manage.WikiPageTemplateService; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/WikiPageZanServiceImpl.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/impl/WikiPageZanServiceImpl.java similarity index 76% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/WikiPageZanServiceImpl.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/impl/WikiPageZanServiceImpl.java index f278b79d..6fb05e74 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/WikiPageZanServiceImpl.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/impl/WikiPageZanServiceImpl.java @@ -1,13 +1,13 @@ -package com.zyplayer.doc.data.service.manage.impl; +package org.dromara.zyplayer.data.service.manage.impl; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.zyplayer.doc.data.config.security.DocUserDetails; -import com.zyplayer.doc.data.config.security.DocUserUtil; -import com.zyplayer.doc.data.repository.manage.entity.WikiPageZan; -import com.zyplayer.doc.data.repository.manage.mapper.WikiPageMapper; -import com.zyplayer.doc.data.repository.manage.mapper.WikiPageZanMapper; -import com.zyplayer.doc.data.service.manage.WikiPageZanService; +import org.dromara.zyplayer.data.config.security.DocUserDetails; +import org.dromara.zyplayer.data.config.security.DocUserUtil; +import org.dromara.zyplayer.data.repository.manage.entity.WikiPageZan; +import org.dromara.zyplayer.data.repository.manage.mapper.WikiPageMapper; +import org.dromara.zyplayer.data.repository.manage.mapper.WikiPageZanMapper; +import org.dromara.zyplayer.data.service.manage.WikiPageZanService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/WikiSpaceFavoriteServiceImpl.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/impl/WikiSpaceFavoriteServiceImpl.java similarity index 67% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/WikiSpaceFavoriteServiceImpl.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/impl/WikiSpaceFavoriteServiceImpl.java index e44d9357..60de99ff 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/WikiSpaceFavoriteServiceImpl.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/impl/WikiSpaceFavoriteServiceImpl.java @@ -1,12 +1,12 @@ -package com.zyplayer.doc.data.service.manage.impl; +package org.dromara.zyplayer.data.service.manage.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.zyplayer.doc.data.config.security.DocUserDetails; -import com.zyplayer.doc.data.config.security.DocUserUtil; -import com.zyplayer.doc.data.repository.manage.entity.WikiSpaceFavorite; -import com.zyplayer.doc.data.repository.manage.mapper.WikiSpaceFavoriteMapper; -import com.zyplayer.doc.data.service.manage.WikiSpaceFavoriteService; +import org.dromara.zyplayer.data.config.security.DocUserDetails; +import org.dromara.zyplayer.data.config.security.DocUserUtil; +import org.dromara.zyplayer.data.repository.manage.entity.WikiSpaceFavorite; +import org.dromara.zyplayer.data.repository.manage.mapper.WikiSpaceFavoriteMapper; +import org.dromara.zyplayer.data.service.manage.WikiSpaceFavoriteService; import org.springframework.stereotype.Service; import java.util.List; diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/WikiSpaceServiceImpl.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/impl/WikiSpaceServiceImpl.java similarity index 56% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/WikiSpaceServiceImpl.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/impl/WikiSpaceServiceImpl.java index 257d8933..5f47cf79 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/WikiSpaceServiceImpl.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/service/manage/impl/WikiSpaceServiceImpl.java @@ -1,8 +1,8 @@ -package com.zyplayer.doc.data.service.manage.impl; +package org.dromara.zyplayer.data.service.manage.impl; -import com.zyplayer.doc.data.repository.manage.entity.WikiSpace; -import com.zyplayer.doc.data.repository.manage.mapper.WikiSpaceMapper; -import com.zyplayer.doc.data.service.manage.WikiSpaceService; +import org.dromara.zyplayer.data.repository.manage.entity.WikiSpace; +import org.dromara.zyplayer.data.repository.manage.mapper.WikiSpaceMapper; +import org.dromara.zyplayer.data.service.manage.WikiSpaceService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/utils/CachePrefix.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/utils/CachePrefix.java similarity index 88% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/utils/CachePrefix.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/utils/CachePrefix.java index 16930095..cd14e180 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/utils/CachePrefix.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/utils/CachePrefix.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.data.utils; +package org.dromara.zyplayer.data.utils; /** * 缓存前缀 diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/utils/CacheUtil.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/utils/CacheUtil.java similarity index 98% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/utils/CacheUtil.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/utils/CacheUtil.java index abd775b5..266c04a1 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/utils/CacheUtil.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/utils/CacheUtil.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.data.utils; +package org.dromara.zyplayer.data.utils; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/utils/CleanInputCache.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/utils/CleanInputCache.java similarity index 96% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/utils/CleanInputCache.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/utils/CleanInputCache.java index d0fb6e3f..dee04f0f 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/utils/CleanInputCache.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/utils/CleanInputCache.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.data.utils; +package org.dromara.zyplayer.data.utils; import lombok.extern.slf4j.Slf4j; diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/utils/DruidDataSourceUtil.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/utils/DruidDataSourceUtil.java similarity index 95% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/utils/DruidDataSourceUtil.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/utils/DruidDataSourceUtil.java index c6d5e819..9468fe3e 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/utils/DruidDataSourceUtil.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/utils/DruidDataSourceUtil.java @@ -1,8 +1,8 @@ -package com.zyplayer.doc.data.utils; +package org.dromara.zyplayer.data.utils; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidPooledConnection; -import com.zyplayer.doc.core.exception.ConfirmException; +import org.dromara.zyplayer.core.exception.ConfirmException; import java.util.Objects; import java.util.concurrent.atomic.AtomicLong; diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/utils/HtmlUtils.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/utils/HtmlUtils.java similarity index 95% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/utils/HtmlUtils.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/utils/HtmlUtils.java index 71a6d8a7..fe35ceab 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/utils/HtmlUtils.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/utils/HtmlUtils.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.data.utils; +package org.dromara.zyplayer.data.utils; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/utils/ThreadPoolUtil.java b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/utils/ThreadPoolUtil.java similarity index 92% rename from zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/utils/ThreadPoolUtil.java rename to zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/utils/ThreadPoolUtil.java index 88264aae..0d110f94 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/utils/ThreadPoolUtil.java +++ b/zyplayer-doc-data/src/main/java/org/dromara/zyplayer/data/utils/ThreadPoolUtil.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.data.utils; +package org.dromara.zyplayer.data.utils; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; diff --git a/zyplayer-doc-data/src/main/resources/mapper/manage/ApiCustomGroupMapper.xml b/zyplayer-doc-data/src/main/resources/mapper/manage/ApiCustomGroupMapper.xml index 828d4c7d..881bdd8a 100644 --- a/zyplayer-doc-data/src/main/resources/mapper/manage/ApiCustomGroupMapper.xml +++ b/zyplayer-doc-data/src/main/resources/mapper/manage/ApiCustomGroupMapper.xml @@ -1,5 +1,5 @@ - + diff --git a/zyplayer-doc-data/src/main/resources/mapper/manage/ApiCustomMapper.xml b/zyplayer-doc-data/src/main/resources/mapper/manage/ApiCustomMapper.xml index a35f4a71..d2bbdaad 100644 --- a/zyplayer-doc-data/src/main/resources/mapper/manage/ApiCustomMapper.xml +++ b/zyplayer-doc-data/src/main/resources/mapper/manage/ApiCustomMapper.xml @@ -1,5 +1,5 @@ - + diff --git a/zyplayer-doc-data/src/main/resources/mapper/manage/ApiCustomNodeMapper.xml b/zyplayer-doc-data/src/main/resources/mapper/manage/ApiCustomNodeMapper.xml index e33ec1c8..11575437 100644 --- a/zyplayer-doc-data/src/main/resources/mapper/manage/ApiCustomNodeMapper.xml +++ b/zyplayer-doc-data/src/main/resources/mapper/manage/ApiCustomNodeMapper.xml @@ -1,5 +1,5 @@ - + diff --git a/zyplayer-doc-data/src/main/resources/mapper/manage/ApiCustomParamsMapper.xml b/zyplayer-doc-data/src/main/resources/mapper/manage/ApiCustomParamsMapper.xml index aa4bc350..0a7e2662 100644 --- a/zyplayer-doc-data/src/main/resources/mapper/manage/ApiCustomParamsMapper.xml +++ b/zyplayer-doc-data/src/main/resources/mapper/manage/ApiCustomParamsMapper.xml @@ -1,5 +1,5 @@ - + diff --git a/zyplayer-doc-data/src/main/resources/mapper/manage/ApiDocMapper.xml b/zyplayer-doc-data/src/main/resources/mapper/manage/ApiDocMapper.xml index 8c88a8a9..d7e06149 100644 --- a/zyplayer-doc-data/src/main/resources/mapper/manage/ApiDocMapper.xml +++ b/zyplayer-doc-data/src/main/resources/mapper/manage/ApiDocMapper.xml @@ -1,5 +1,5 @@ - + diff --git a/zyplayer-doc-data/src/main/resources/mapper/manage/ApiGlobalParamMapper.xml b/zyplayer-doc-data/src/main/resources/mapper/manage/ApiGlobalParamMapper.xml index efc30f92..d7b72882 100644 --- a/zyplayer-doc-data/src/main/resources/mapper/manage/ApiGlobalParamMapper.xml +++ b/zyplayer-doc-data/src/main/resources/mapper/manage/ApiGlobalParamMapper.xml @@ -1,5 +1,5 @@ - + diff --git a/zyplayer-doc-data/src/main/resources/mapper/manage/ApiRequestParamMapper.xml b/zyplayer-doc-data/src/main/resources/mapper/manage/ApiRequestParamMapper.xml index 3c497c6a..924ce7d3 100644 --- a/zyplayer-doc-data/src/main/resources/mapper/manage/ApiRequestParamMapper.xml +++ b/zyplayer-doc-data/src/main/resources/mapper/manage/ApiRequestParamMapper.xml @@ -1,5 +1,5 @@ - + diff --git a/zyplayer-doc-data/src/main/resources/mapper/manage/AuthInfoMapper.xml b/zyplayer-doc-data/src/main/resources/mapper/manage/AuthInfoMapper.xml index 118a080c..e4116b83 100644 --- a/zyplayer-doc-data/src/main/resources/mapper/manage/AuthInfoMapper.xml +++ b/zyplayer-doc-data/src/main/resources/mapper/manage/AuthInfoMapper.xml @@ -1,5 +1,5 @@ - + diff --git a/zyplayer-doc-data/src/main/resources/mapper/manage/DbDatasourceMapper.xml b/zyplayer-doc-data/src/main/resources/mapper/manage/DbDatasourceMapper.xml index 2dab3575..0957f879 100644 --- a/zyplayer-doc-data/src/main/resources/mapper/manage/DbDatasourceMapper.xml +++ b/zyplayer-doc-data/src/main/resources/mapper/manage/DbDatasourceMapper.xml @@ -1,5 +1,5 @@ - + diff --git a/zyplayer-doc-data/src/main/resources/mapper/manage/DbFavoriteMapper.xml b/zyplayer-doc-data/src/main/resources/mapper/manage/DbFavoriteMapper.xml index ed347ae7..474cddbf 100644 --- a/zyplayer-doc-data/src/main/resources/mapper/manage/DbFavoriteMapper.xml +++ b/zyplayer-doc-data/src/main/resources/mapper/manage/DbFavoriteMapper.xml @@ -1,5 +1,5 @@ - + diff --git a/zyplayer-doc-data/src/main/resources/mapper/manage/DbHistoryMapper.xml b/zyplayer-doc-data/src/main/resources/mapper/manage/DbHistoryMapper.xml index 2b164024..868f5a16 100644 --- a/zyplayer-doc-data/src/main/resources/mapper/manage/DbHistoryMapper.xml +++ b/zyplayer-doc-data/src/main/resources/mapper/manage/DbHistoryMapper.xml @@ -1,5 +1,5 @@ - + diff --git a/zyplayer-doc-data/src/main/resources/mapper/manage/DbProcLogMapper.xml b/zyplayer-doc-data/src/main/resources/mapper/manage/DbProcLogMapper.xml index 0120ac82..b141b9fc 100644 --- a/zyplayer-doc-data/src/main/resources/mapper/manage/DbProcLogMapper.xml +++ b/zyplayer-doc-data/src/main/resources/mapper/manage/DbProcLogMapper.xml @@ -1,5 +1,5 @@ - + diff --git a/zyplayer-doc-data/src/main/resources/mapper/manage/DbTableRelationMapper.xml b/zyplayer-doc-data/src/main/resources/mapper/manage/DbTableRelationMapper.xml index 00a7bfd3..0e9ed096 100644 --- a/zyplayer-doc-data/src/main/resources/mapper/manage/DbTableRelationMapper.xml +++ b/zyplayer-doc-data/src/main/resources/mapper/manage/DbTableRelationMapper.xml @@ -1,5 +1,5 @@ - + diff --git a/zyplayer-doc-data/src/main/resources/mapper/manage/DbTransferTaskMapper.xml b/zyplayer-doc-data/src/main/resources/mapper/manage/DbTransferTaskMapper.xml index 95b8fb3e..239e7915 100644 --- a/zyplayer-doc-data/src/main/resources/mapper/manage/DbTransferTaskMapper.xml +++ b/zyplayer-doc-data/src/main/resources/mapper/manage/DbTransferTaskMapper.xml @@ -1,5 +1,5 @@ - + diff --git a/zyplayer-doc-data/src/main/resources/mapper/manage/SwaggerDocMapper.xml b/zyplayer-doc-data/src/main/resources/mapper/manage/SwaggerDocMapper.xml index a5521a83..b303cd7c 100644 --- a/zyplayer-doc-data/src/main/resources/mapper/manage/SwaggerDocMapper.xml +++ b/zyplayer-doc-data/src/main/resources/mapper/manage/SwaggerDocMapper.xml @@ -1,5 +1,5 @@ - + diff --git a/zyplayer-doc-data/src/main/resources/mapper/manage/SwaggerGlobalParamMapper.xml b/zyplayer-doc-data/src/main/resources/mapper/manage/SwaggerGlobalParamMapper.xml index 6e6442eb..e09a20a9 100644 --- a/zyplayer-doc-data/src/main/resources/mapper/manage/SwaggerGlobalParamMapper.xml +++ b/zyplayer-doc-data/src/main/resources/mapper/manage/SwaggerGlobalParamMapper.xml @@ -1,5 +1,5 @@ - + diff --git a/zyplayer-doc-data/src/main/resources/mapper/manage/SwaggerRequestParamMapper.xml b/zyplayer-doc-data/src/main/resources/mapper/manage/SwaggerRequestParamMapper.xml index d4720d9a..c890a9ad 100644 --- a/zyplayer-doc-data/src/main/resources/mapper/manage/SwaggerRequestParamMapper.xml +++ b/zyplayer-doc-data/src/main/resources/mapper/manage/SwaggerRequestParamMapper.xml @@ -1,5 +1,5 @@ - + diff --git a/zyplayer-doc-data/src/main/resources/mapper/manage/UserAuthMapper.xml b/zyplayer-doc-data/src/main/resources/mapper/manage/UserAuthMapper.xml index 6e330fb7..6d7c1fb9 100644 --- a/zyplayer-doc-data/src/main/resources/mapper/manage/UserAuthMapper.xml +++ b/zyplayer-doc-data/src/main/resources/mapper/manage/UserAuthMapper.xml @@ -1,5 +1,5 @@ - + diff --git a/zyplayer-doc-data/src/main/resources/mapper/manage/UserGroupAuthMapper.xml b/zyplayer-doc-data/src/main/resources/mapper/manage/UserGroupAuthMapper.xml index a5a733bf..727b78d1 100644 --- a/zyplayer-doc-data/src/main/resources/mapper/manage/UserGroupAuthMapper.xml +++ b/zyplayer-doc-data/src/main/resources/mapper/manage/UserGroupAuthMapper.xml @@ -1,5 +1,5 @@ - + diff --git a/zyplayer-doc-data/src/main/resources/mapper/manage/UserGroupMapper.xml b/zyplayer-doc-data/src/main/resources/mapper/manage/UserGroupMapper.xml index c3ff7e85..8a006fd5 100644 --- a/zyplayer-doc-data/src/main/resources/mapper/manage/UserGroupMapper.xml +++ b/zyplayer-doc-data/src/main/resources/mapper/manage/UserGroupMapper.xml @@ -1,5 +1,5 @@ - + diff --git a/zyplayer-doc-data/src/main/resources/mapper/manage/UserGroupRelationMapper.xml b/zyplayer-doc-data/src/main/resources/mapper/manage/UserGroupRelationMapper.xml index 74f0b9b1..2892c032 100644 --- a/zyplayer-doc-data/src/main/resources/mapper/manage/UserGroupRelationMapper.xml +++ b/zyplayer-doc-data/src/main/resources/mapper/manage/UserGroupRelationMapper.xml @@ -1,5 +1,5 @@ - + diff --git a/zyplayer-doc-data/src/main/resources/mapper/manage/UserInfoMapper.xml b/zyplayer-doc-data/src/main/resources/mapper/manage/UserInfoMapper.xml index 653c3e07..710e8205 100644 --- a/zyplayer-doc-data/src/main/resources/mapper/manage/UserInfoMapper.xml +++ b/zyplayer-doc-data/src/main/resources/mapper/manage/UserInfoMapper.xml @@ -1,5 +1,5 @@ - + diff --git a/zyplayer-doc-data/src/main/resources/mapper/manage/UserMessageMapper.xml b/zyplayer-doc-data/src/main/resources/mapper/manage/UserMessageMapper.xml index 589ba039..aa4be492 100644 --- a/zyplayer-doc-data/src/main/resources/mapper/manage/UserMessageMapper.xml +++ b/zyplayer-doc-data/src/main/resources/mapper/manage/UserMessageMapper.xml @@ -1,5 +1,5 @@ - + diff --git a/zyplayer-doc-data/src/main/resources/mapper/manage/UserSettingMapper.xml b/zyplayer-doc-data/src/main/resources/mapper/manage/UserSettingMapper.xml index b2717019..eddfac3d 100644 --- a/zyplayer-doc-data/src/main/resources/mapper/manage/UserSettingMapper.xml +++ b/zyplayer-doc-data/src/main/resources/mapper/manage/UserSettingMapper.xml @@ -1,5 +1,5 @@ - + diff --git a/zyplayer-doc-data/src/main/resources/mapper/manage/WikiPageCommentMapper.xml b/zyplayer-doc-data/src/main/resources/mapper/manage/WikiPageCommentMapper.xml index 2dac74a5..26f0b281 100644 --- a/zyplayer-doc-data/src/main/resources/mapper/manage/WikiPageCommentMapper.xml +++ b/zyplayer-doc-data/src/main/resources/mapper/manage/WikiPageCommentMapper.xml @@ -1,5 +1,5 @@ - + diff --git a/zyplayer-doc-data/src/main/resources/mapper/manage/WikiPageContentMapper.xml b/zyplayer-doc-data/src/main/resources/mapper/manage/WikiPageContentMapper.xml index 20e4ba7d..188c59c2 100644 --- a/zyplayer-doc-data/src/main/resources/mapper/manage/WikiPageContentMapper.xml +++ b/zyplayer-doc-data/src/main/resources/mapper/manage/WikiPageContentMapper.xml @@ -1,8 +1,8 @@ - - - select a.space_id as spaceId, a.id as pageId, a.zan_num as zanNum, a.view_num as viewNum, a.create_user_name as createUserName, a.update_user_name as updateUserName, a.create_time as createTime, a.update_time as updateTime, a.name as pageTitle, b.preview as previewContent diff --git a/zyplayer-doc-data/src/main/resources/mapper/manage/WikiPageFileMapper.xml b/zyplayer-doc-data/src/main/resources/mapper/manage/WikiPageFileMapper.xml index 9686544d..23bb7464 100644 --- a/zyplayer-doc-data/src/main/resources/mapper/manage/WikiPageFileMapper.xml +++ b/zyplayer-doc-data/src/main/resources/mapper/manage/WikiPageFileMapper.xml @@ -1,5 +1,5 @@ - + diff --git a/zyplayer-doc-data/src/main/resources/mapper/manage/WikiPageHistoryMapper.xml b/zyplayer-doc-data/src/main/resources/mapper/manage/WikiPageHistoryMapper.xml index eada852c..f688f1c3 100644 --- a/zyplayer-doc-data/src/main/resources/mapper/manage/WikiPageHistoryMapper.xml +++ b/zyplayer-doc-data/src/main/resources/mapper/manage/WikiPageHistoryMapper.xml @@ -1,5 +1,5 @@ - + diff --git a/zyplayer-doc-data/src/main/resources/mapper/manage/WikiPageMapper.xml b/zyplayer-doc-data/src/main/resources/mapper/manage/WikiPageMapper.xml index 8f1a014e..bc0d436d 100644 --- a/zyplayer-doc-data/src/main/resources/mapper/manage/WikiPageMapper.xml +++ b/zyplayer-doc-data/src/main/resources/mapper/manage/WikiPageMapper.xml @@ -1,6 +1,6 @@ - + update wiki_page a join ( @@ -16,8 +16,8 @@ WITH exceeded_wiki_page AS ( select row_number() over() as rownum, * from wiki_page where parent_id = #{parentId} and space_id = #{spaceId} ORDER BY seq_no ASC, update_time DESC ) - UPDATE wiki_page SET seq_no = ewp.rownum - FROM exceeded_wiki_page AS ewp + UPDATE wiki_page SET seq_no = ewp.rownum + FROM exceeded_wiki_page AS ewp WHERE wiki_page.id = ewp.id diff --git a/zyplayer-doc-data/src/main/resources/mapper/manage/WikiPageTemplateMapper.xml b/zyplayer-doc-data/src/main/resources/mapper/manage/WikiPageTemplateMapper.xml index 658653e7..05abe487 100644 --- a/zyplayer-doc-data/src/main/resources/mapper/manage/WikiPageTemplateMapper.xml +++ b/zyplayer-doc-data/src/main/resources/mapper/manage/WikiPageTemplateMapper.xml @@ -1,7 +1,7 @@ - - SELECT a.*,b.tag_name As tags,b.share_status as shareStatus,c.content,b.id as templateId from wiki_page a left join wiki_page_template b on a.space_id = b.space_id and a.id = b.page_id left join wiki_page_content c on a.id = c.page_id @@ -15,7 +15,7 @@ left join wiki_page_content c on a.id = c.page_id - select DISTINCT tag_name from wiki_page_template where tag_name is not null diff --git a/zyplayer-doc-data/src/main/resources/mapper/manage/WikiPageZanMapper.xml b/zyplayer-doc-data/src/main/resources/mapper/manage/WikiPageZanMapper.xml index bea2a277..b20dee33 100644 --- a/zyplayer-doc-data/src/main/resources/mapper/manage/WikiPageZanMapper.xml +++ b/zyplayer-doc-data/src/main/resources/mapper/manage/WikiPageZanMapper.xml @@ -1,5 +1,5 @@ - + diff --git a/zyplayer-doc-data/src/main/resources/mapper/manage/WikiSpaceFavoriteMapper.xml b/zyplayer-doc-data/src/main/resources/mapper/manage/WikiSpaceFavoriteMapper.xml index f1633785..7ccb54e6 100644 --- a/zyplayer-doc-data/src/main/resources/mapper/manage/WikiSpaceFavoriteMapper.xml +++ b/zyplayer-doc-data/src/main/resources/mapper/manage/WikiSpaceFavoriteMapper.xml @@ -1,5 +1,5 @@ - + diff --git a/zyplayer-doc-data/src/main/resources/mapper/manage/WikiSpaceMapper.xml b/zyplayer-doc-data/src/main/resources/mapper/manage/WikiSpaceMapper.xml index b0728bbc..c02aeee8 100644 --- a/zyplayer-doc-data/src/main/resources/mapper/manage/WikiSpaceMapper.xml +++ b/zyplayer-doc-data/src/main/resources/mapper/manage/WikiSpaceMapper.xml @@ -1,5 +1,5 @@ - + diff --git a/zyplayer-doc-db/pom.xml b/zyplayer-doc-db/pom.xml index 46cf5ba8..131a41bc 100644 --- a/zyplayer-doc-db/pom.xml +++ b/zyplayer-doc-db/pom.xml @@ -21,7 +21,7 @@ - com.zyplayer + org.dromara zyplayer-doc 1.0.0 @@ -36,11 +36,11 @@ spring-boot-starter-jdbc - com.zyplayer + org.dromara zyplayer-doc-core - com.zyplayer + org.dromara zyplayer-doc-data diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/DatabaseDocController.java b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/controller/DatabaseDocController.java similarity index 85% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/DatabaseDocController.java rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/controller/DatabaseDocController.java index 01cd57ad..2ad97139 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/DatabaseDocController.java +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/controller/DatabaseDocController.java @@ -1,27 +1,27 @@ -package com.zyplayer.doc.db.controller; +package org.dromara.zyplayer.db.controller; -import com.zyplayer.doc.core.annotation.AuthMan; -import com.zyplayer.doc.core.exception.ConfirmException; -import com.zyplayer.doc.data.config.security.DocUserUtil; -import com.zyplayer.doc.data.repository.manage.entity.DbDatasource; -import com.zyplayer.doc.data.repository.support.consts.DocAuthConst; -import com.zyplayer.doc.data.repository.support.consts.DocSysModuleType; -import com.zyplayer.doc.data.repository.support.consts.DocSysType; -import com.zyplayer.doc.data.service.manage.DbDatasourceService; -import com.zyplayer.doc.db.controller.vo.DatabaseExportVo; -import com.zyplayer.doc.db.controller.vo.TableColumnVo; -import com.zyplayer.doc.db.controller.vo.TableColumnVo.TableInfoVo; -import com.zyplayer.doc.db.controller.vo.TableDdlVo; -import com.zyplayer.doc.db.controller.vo.TableStatusVo; -import com.zyplayer.doc.db.framework.consts.DbAuthType; -import com.zyplayer.doc.db.framework.db.bean.DatabaseFactoryBean; -import com.zyplayer.doc.db.framework.db.bean.DatabaseRegistrationBean; -import com.zyplayer.doc.db.framework.db.dto.*; -import com.zyplayer.doc.db.framework.db.enums.DatabaseProductEnum; -import com.zyplayer.doc.db.framework.json.DocDbResponseJson; -import com.zyplayer.doc.db.framework.utils.PoiUtil; -import com.zyplayer.doc.db.service.database.DatabaseServiceFactory; -import com.zyplayer.doc.db.service.database.DbBaseService; +import org.dromara.zyplayer.core.annotation.AuthMan; +import org.dromara.zyplayer.core.exception.ConfirmException; +import org.dromara.zyplayer.data.config.security.DocUserUtil; +import org.dromara.zyplayer.data.repository.manage.entity.DbDatasource; +import org.dromara.zyplayer.data.repository.support.consts.DocAuthConst; +import org.dromara.zyplayer.data.repository.support.consts.DocSysModuleType; +import org.dromara.zyplayer.data.repository.support.consts.DocSysType; +import org.dromara.zyplayer.data.service.manage.DbDatasourceService; +import org.dromara.zyplayer.db.controller.vo.DatabaseExportVo; +import org.dromara.zyplayer.db.controller.vo.TableColumnVo; +import org.dromara.zyplayer.db.controller.vo.TableColumnVo.TableInfoVo; +import org.dromara.zyplayer.db.controller.vo.TableDdlVo; +import org.dromara.zyplayer.db.controller.vo.TableStatusVo; +import org.dromara.zyplayer.db.framework.consts.DbAuthType; +import org.dromara.zyplayer.db.framework.db.bean.DatabaseFactoryBean; +import org.dromara.zyplayer.db.framework.db.bean.DatabaseRegistrationBean; +import org.dromara.zyplayer.db.framework.db.dto.*; +import org.dromara.zyplayer.db.framework.db.enums.DatabaseProductEnum; +import org.dromara.zyplayer.db.framework.json.DocDbResponseJson; +import org.dromara.zyplayer.db.framework.utils.PoiUtil; +import org.dromara.zyplayer.db.service.database.DatabaseServiceFactory; +import org.dromara.zyplayer.db.service.database.DbBaseService; import org.apache.commons.lang3.StringUtils; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/DbDataSourceAuthController.java b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/controller/DbDataSourceAuthController.java similarity index 85% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/DbDataSourceAuthController.java rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/controller/DbDataSourceAuthController.java index 10cef5cd..7893a461 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/DbDataSourceAuthController.java +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/controller/DbDataSourceAuthController.java @@ -1,23 +1,23 @@ -package com.zyplayer.doc.db.controller; +package org.dromara.zyplayer.db.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.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.support.consts.DocAuthConst; -import com.zyplayer.doc.data.repository.support.consts.DocSysModuleType; -import com.zyplayer.doc.data.repository.support.consts.DocSysType; -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.db.controller.vo.UserDbAuthVo; -import com.zyplayer.doc.db.framework.consts.DbAuthType; +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.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.support.consts.DocAuthConst; +import org.dromara.zyplayer.data.repository.support.consts.DocSysModuleType; +import org.dromara.zyplayer.data.repository.support.consts.DocSysType; +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.db.controller.vo.UserDbAuthVo; +import org.dromara.zyplayer.db.framework.consts.DbAuthType; import org.apache.commons.collections.CollectionUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/DbDataViewController.java b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/controller/DbDataViewController.java similarity index 86% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/DbDataViewController.java rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/controller/DbDataViewController.java index f8e5dade..ff76f6f0 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/DbDataViewController.java +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/controller/DbDataViewController.java @@ -1,23 +1,23 @@ -package com.zyplayer.doc.db.controller; +package org.dromara.zyplayer.db.controller; import cn.hutool.core.util.IdUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.serializer.SerializerFeature; import com.alibaba.fastjson.util.TypeUtils; -import com.zyplayer.doc.core.annotation.AuthMan; -import com.zyplayer.doc.db.controller.download.FormatDownloadConst; -import com.zyplayer.doc.db.controller.download.FormatDownloadService; -import com.zyplayer.doc.db.controller.param.DataViewParam; -import com.zyplayer.doc.db.framework.db.mapper.base.ExecuteParam; -import com.zyplayer.doc.db.framework.db.mapper.base.ExecuteResult; -import com.zyplayer.doc.db.framework.db.mapper.base.ExecuteType; -import com.zyplayer.doc.db.framework.db.mapper.base.SqlExecutor; -import com.zyplayer.doc.db.framework.json.DocDbResponseJson; -import com.zyplayer.doc.db.framework.utils.JSONUtil; -import com.zyplayer.doc.db.service.common.ExecuteAuthService; -import com.zyplayer.doc.db.service.database.DatabaseServiceFactory; -import com.zyplayer.doc.db.service.database.DbBaseService; +import org.dromara.zyplayer.core.annotation.AuthMan; +import org.dromara.zyplayer.db.controller.download.FormatDownloadConst; +import org.dromara.zyplayer.db.controller.download.FormatDownloadService; +import org.dromara.zyplayer.db.controller.param.DataViewParam; +import org.dromara.zyplayer.db.framework.db.mapper.base.ExecuteParam; +import org.dromara.zyplayer.db.framework.db.mapper.base.ExecuteResult; +import org.dromara.zyplayer.db.framework.db.mapper.base.ExecuteType; +import org.dromara.zyplayer.db.framework.db.mapper.base.SqlExecutor; +import org.dromara.zyplayer.db.framework.json.DocDbResponseJson; +import org.dromara.zyplayer.db.framework.utils.JSONUtil; +import org.dromara.zyplayer.db.service.common.ExecuteAuthService; +import org.dromara.zyplayer.db.service.database.DatabaseServiceFactory; +import org.dromara.zyplayer.db.service.database.DbBaseService; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.MapUtils; import org.apache.commons.lang3.StringUtils; diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/DbDatasourceController.java b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/controller/DbDatasourceController.java similarity index 85% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/DbDatasourceController.java rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/controller/DbDatasourceController.java index 72b6355b..cac9c4d4 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/DbDatasourceController.java +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/controller/DbDatasourceController.java @@ -1,19 +1,19 @@ -package com.zyplayer.doc.db.controller; +package org.dromara.zyplayer.db.controller; 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.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.DbDatasource; -import com.zyplayer.doc.data.repository.support.consts.DocAuthConst; -import com.zyplayer.doc.data.service.manage.DbDatasourceService; -import com.zyplayer.doc.db.framework.configuration.DatasourceUtil; -import com.zyplayer.doc.db.framework.db.bean.DatabaseFactoryBean; -import com.zyplayer.doc.db.framework.db.bean.DatabaseRegistrationBean; -import com.zyplayer.doc.db.framework.json.DocDbResponseJson; +import org.dromara.zyplayer.core.annotation.AuthMan; +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.DbDatasource; +import org.dromara.zyplayer.data.repository.support.consts.DocAuthConst; +import org.dromara.zyplayer.data.service.manage.DbDatasourceService; +import org.dromara.zyplayer.db.framework.configuration.DatasourceUtil; +import org.dromara.zyplayer.db.framework.db.bean.DatabaseFactoryBean; +import org.dromara.zyplayer.db.framework.db.bean.DatabaseRegistrationBean; +import org.dromara.zyplayer.db.framework.json.DocDbResponseJson; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.exception.ExceptionUtils; diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/DbProcedureController.java b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/controller/DbProcedureController.java similarity index 86% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/DbProcedureController.java rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/controller/DbProcedureController.java index 4bd51a89..f51df79c 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/DbProcedureController.java +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/controller/DbProcedureController.java @@ -1,24 +1,24 @@ -package com.zyplayer.doc.db.controller; +package org.dromara.zyplayer.db.controller; 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.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.DbProcLog; -import com.zyplayer.doc.data.repository.support.consts.DocAuthConst; -import com.zyplayer.doc.data.repository.support.consts.DocSysModuleType; -import com.zyplayer.doc.data.repository.support.consts.DocSysType; -import com.zyplayer.doc.data.service.manage.DbProcLogService; -import com.zyplayer.doc.db.controller.param.ProcedureListParam; -import com.zyplayer.doc.db.framework.consts.DbAuthType; -import com.zyplayer.doc.db.framework.db.dto.ProcedureDto; -import com.zyplayer.doc.db.framework.db.mapper.base.ExecuteResult; -import com.zyplayer.doc.db.framework.json.DocDbResponseJson; -import com.zyplayer.doc.db.service.database.DatabaseServiceFactory; -import com.zyplayer.doc.db.service.database.DbBaseService; +import org.dromara.zyplayer.core.annotation.AuthMan; +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.DbProcLog; +import org.dromara.zyplayer.data.repository.support.consts.DocAuthConst; +import org.dromara.zyplayer.data.repository.support.consts.DocSysModuleType; +import org.dromara.zyplayer.data.repository.support.consts.DocSysType; +import org.dromara.zyplayer.data.service.manage.DbProcLogService; +import org.dromara.zyplayer.db.controller.param.ProcedureListParam; +import org.dromara.zyplayer.db.framework.consts.DbAuthType; +import org.dromara.zyplayer.db.framework.db.dto.ProcedureDto; +import org.dromara.zyplayer.db.framework.db.mapper.base.ExecuteResult; +import org.dromara.zyplayer.db.framework.json.DocDbResponseJson; +import org.dromara.zyplayer.db.service.database.DatabaseServiceFactory; +import org.dromara.zyplayer.db.service.database.DbBaseService; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/DbSqlExecutorController.java b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/controller/DbSqlExecutorController.java similarity index 85% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/DbSqlExecutorController.java rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/controller/DbSqlExecutorController.java index 921cf2cd..55edd473 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/DbSqlExecutorController.java +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/controller/DbSqlExecutorController.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.db.controller; +package org.dromara.zyplayer.db.controller; import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONArray; @@ -9,23 +9,26 @@ import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; import com.alibaba.druid.sql.parser.SQLStatementParser; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import com.zyplayer.doc.core.annotation.AuthMan; -import com.zyplayer.doc.data.config.security.DocUserDetails; -import com.zyplayer.doc.data.config.security.DocUserUtil; -import com.zyplayer.doc.data.repository.manage.entity.DbFavorite; -import com.zyplayer.doc.data.repository.manage.entity.DbHistory; -import com.zyplayer.doc.data.repository.support.consts.DocAuthConst; -import com.zyplayer.doc.data.repository.support.consts.DocSysModuleType; -import com.zyplayer.doc.data.repository.support.consts.DocSysType; -import com.zyplayer.doc.data.service.manage.DbFavoriteService; -import com.zyplayer.doc.data.service.manage.DbHistoryService; -import com.zyplayer.doc.db.framework.consts.DbAuthType; -import com.zyplayer.doc.db.framework.db.mapper.base.*; -import com.zyplayer.doc.db.framework.db.transfer.SqlParseUtil; -import com.zyplayer.doc.db.framework.json.DocDbResponseJson; -import com.zyplayer.doc.db.framework.utils.SQLTransformUtils; -import com.zyplayer.doc.db.service.database.DatabaseServiceFactory; -import com.zyplayer.doc.db.service.database.DbBaseService; +import org.dromara.zyplayer.core.annotation.AuthMan; +import org.dromara.zyplayer.data.config.security.DocUserDetails; +import org.dromara.zyplayer.data.config.security.DocUserUtil; +import org.dromara.zyplayer.data.repository.manage.entity.DbFavorite; +import org.dromara.zyplayer.data.repository.manage.entity.DbHistory; +import org.dromara.zyplayer.data.repository.support.consts.DocAuthConst; +import org.dromara.zyplayer.data.repository.support.consts.DocSysModuleType; +import org.dromara.zyplayer.data.repository.support.consts.DocSysType; +import org.dromara.zyplayer.data.service.manage.DbFavoriteService; +import org.dromara.zyplayer.data.service.manage.DbHistoryService; +import org.dromara.zyplayer.db.framework.consts.DbAuthType; +import org.dromara.zyplayer.db.framework.db.mapper.base.ColumnExecuteResult; +import org.dromara.zyplayer.db.framework.db.mapper.base.ColumnSqlExecutor; +import org.dromara.zyplayer.db.framework.db.mapper.base.ExecuteParam; +import org.dromara.zyplayer.db.framework.db.mapper.base.ExecuteType; +import org.dromara.zyplayer.db.framework.db.transfer.SqlParseUtil; +import org.dromara.zyplayer.db.framework.json.DocDbResponseJson; +import org.dromara.zyplayer.db.framework.utils.SQLTransformUtils; +import org.dromara.zyplayer.db.service.database.DatabaseServiceFactory; +import org.dromara.zyplayer.db.service.database.DbBaseService; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/DbTableRelationController.java b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/controller/DbTableRelationController.java similarity index 88% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/DbTableRelationController.java rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/controller/DbTableRelationController.java index 9c9b6e9e..add4226e 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/DbTableRelationController.java +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/controller/DbTableRelationController.java @@ -1,17 +1,17 @@ -package com.zyplayer.doc.db.controller; +package org.dromara.zyplayer.db.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.zyplayer.doc.core.annotation.AuthMan; -import com.zyplayer.doc.data.repository.manage.entity.DbTableRelation; -import com.zyplayer.doc.data.repository.manage.param.TableRelationParam; -import com.zyplayer.doc.data.repository.manage.vo.TableRelationVo; -import com.zyplayer.doc.data.service.manage.DbTableRelationService; -import com.zyplayer.doc.db.controller.vo.TableColumnVo; -import com.zyplayer.doc.db.framework.consts.DbAuthType; -import com.zyplayer.doc.db.framework.db.dto.TableColumnDescDto; -import com.zyplayer.doc.db.framework.json.DocDbResponseJson; -import com.zyplayer.doc.db.service.database.DatabaseServiceFactory; -import com.zyplayer.doc.db.service.database.DbBaseService; +import org.dromara.zyplayer.core.annotation.AuthMan; +import org.dromara.zyplayer.data.repository.manage.entity.DbTableRelation; +import org.dromara.zyplayer.data.repository.manage.param.TableRelationParam; +import org.dromara.zyplayer.data.repository.manage.vo.TableRelationVo; +import org.dromara.zyplayer.data.service.manage.DbTableRelationService; +import org.dromara.zyplayer.db.controller.vo.TableColumnVo; +import org.dromara.zyplayer.db.framework.consts.DbAuthType; +import org.dromara.zyplayer.db.framework.db.dto.TableColumnDescDto; +import org.dromara.zyplayer.db.framework.json.DocDbResponseJson; +import org.dromara.zyplayer.db.service.database.DatabaseServiceFactory; +import org.dromara.zyplayer.db.service.database.DbBaseService; import org.apache.commons.collections.CollectionUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/DbTransferDataController.java b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/controller/DbTransferDataController.java similarity index 83% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/DbTransferDataController.java rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/controller/DbTransferDataController.java index 610184e3..f5126cc2 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/DbTransferDataController.java +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/controller/DbTransferDataController.java @@ -1,14 +1,14 @@ -package com.zyplayer.doc.db.controller; +package org.dromara.zyplayer.db.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.zyplayer.doc.core.annotation.AuthMan; -import com.zyplayer.doc.data.config.security.DocUserDetails; -import com.zyplayer.doc.data.config.security.DocUserUtil; -import com.zyplayer.doc.data.repository.manage.entity.DbTransferTask; -import com.zyplayer.doc.data.service.manage.DbTransferTaskService; -import com.zyplayer.doc.db.framework.db.transfer.SqlParseUtil; -import com.zyplayer.doc.db.framework.db.transfer.TransferDataServer; -import com.zyplayer.doc.db.framework.json.DocDbResponseJson; +import org.dromara.zyplayer.core.annotation.AuthMan; +import org.dromara.zyplayer.data.config.security.DocUserDetails; +import org.dromara.zyplayer.data.config.security.DocUserUtil; +import org.dromara.zyplayer.data.repository.manage.entity.DbTransferTask; +import org.dromara.zyplayer.data.service.manage.DbTransferTaskService; +import org.dromara.zyplayer.db.framework.db.transfer.SqlParseUtil; +import org.dromara.zyplayer.db.framework.db.transfer.TransferDataServer; +import org.dromara.zyplayer.db.framework.json.DocDbResponseJson; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/download/CommonFormatDownloadService.java b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/controller/download/CommonFormatDownloadService.java similarity index 87% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/download/CommonFormatDownloadService.java rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/controller/download/CommonFormatDownloadService.java index 03e6c005..b005a6f6 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/download/CommonFormatDownloadService.java +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/controller/download/CommonFormatDownloadService.java @@ -1,21 +1,21 @@ -package com.zyplayer.doc.db.controller.download; +package org.dromara.zyplayer.db.controller.download; import cn.hutool.core.date.DateTime; import cn.hutool.core.io.FileUtil; import cn.hutool.core.util.IdUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.zyplayer.doc.core.exception.ConfirmException; -import com.zyplayer.doc.core.util.ZyplayerDocVersion; -import com.zyplayer.doc.db.controller.param.DataViewParam; -import com.zyplayer.doc.db.controller.vo.TableColumnVo; -import com.zyplayer.doc.db.framework.db.dto.TableColumnDescDto; -import com.zyplayer.doc.db.framework.db.mapper.base.ExecuteParam; -import com.zyplayer.doc.db.framework.db.mapper.base.ExecuteType; -import com.zyplayer.doc.db.service.common.ExecuteAuthService; -import com.zyplayer.doc.db.service.database.DatabaseServiceFactory; -import com.zyplayer.doc.db.service.database.DbBaseService; -import com.zyplayer.doc.db.service.download.BaseDownloadService; +import org.dromara.zyplayer.core.exception.ConfirmException; +import org.dromara.zyplayer.core.util.ZyplayerDocVersion; +import org.dromara.zyplayer.db.controller.param.DataViewParam; +import org.dromara.zyplayer.db.controller.vo.TableColumnVo; +import org.dromara.zyplayer.db.framework.db.dto.TableColumnDescDto; +import org.dromara.zyplayer.db.framework.db.mapper.base.ExecuteParam; +import org.dromara.zyplayer.db.framework.db.mapper.base.ExecuteType; +import org.dromara.zyplayer.db.service.common.ExecuteAuthService; +import org.dromara.zyplayer.db.service.database.DatabaseServiceFactory; +import org.dromara.zyplayer.db.service.database.DbBaseService; +import org.dromara.zyplayer.db.service.download.BaseDownloadService; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/download/ExcelFormatDownloadService.java b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/controller/download/ExcelFormatDownloadService.java similarity index 88% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/download/ExcelFormatDownloadService.java rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/controller/download/ExcelFormatDownloadService.java index 8b6aa041..58ea4d88 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/download/ExcelFormatDownloadService.java +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/controller/download/ExcelFormatDownloadService.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.db.controller.download; +package org.dromara.zyplayer.db.controller.download; import cn.hutool.core.date.DateTime; import cn.hutool.core.io.FileUtil; @@ -8,18 +8,18 @@ import com.alibaba.excel.ExcelWriter; import com.alibaba.excel.write.metadata.WriteSheet; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.zyplayer.doc.db.controller.param.DataViewParam; -import com.zyplayer.doc.db.controller.vo.TableColumnVo; -import com.zyplayer.doc.db.framework.db.dto.TableColumnDescDto; -import com.zyplayer.doc.db.framework.db.mapper.base.ExecuteParam; -import com.zyplayer.doc.db.framework.db.mapper.base.ExecuteResult; -import com.zyplayer.doc.db.framework.db.mapper.base.ExecuteType; -import com.zyplayer.doc.db.framework.db.mapper.base.SqlExecutor; -import com.zyplayer.doc.db.framework.utils.SQLTransformUtils; -import com.zyplayer.doc.db.service.common.ExecuteAuthService; -import com.zyplayer.doc.db.service.database.DatabaseServiceFactory; -import com.zyplayer.doc.db.service.database.DbBaseService; -import com.zyplayer.doc.db.service.download.BaseDownloadService; +import org.dromara.zyplayer.db.controller.param.DataViewParam; +import org.dromara.zyplayer.db.controller.vo.TableColumnVo; +import org.dromara.zyplayer.db.framework.db.dto.TableColumnDescDto; +import org.dromara.zyplayer.db.framework.db.mapper.base.ExecuteParam; +import org.dromara.zyplayer.db.framework.db.mapper.base.ExecuteResult; +import org.dromara.zyplayer.db.framework.db.mapper.base.ExecuteType; +import org.dromara.zyplayer.db.framework.db.mapper.base.SqlExecutor; +import org.dromara.zyplayer.db.framework.utils.SQLTransformUtils; +import org.dromara.zyplayer.db.service.common.ExecuteAuthService; +import org.dromara.zyplayer.db.service.database.DatabaseServiceFactory; +import org.dromara.zyplayer.db.service.database.DbBaseService; +import org.dromara.zyplayer.db.service.download.BaseDownloadService; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/download/FormatDownloadConst.java b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/controller/download/FormatDownloadConst.java similarity index 89% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/download/FormatDownloadConst.java rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/controller/download/FormatDownloadConst.java index a6f55c9d..db6952b6 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/download/FormatDownloadConst.java +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/controller/download/FormatDownloadConst.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.db.controller.download; +package org.dromara.zyplayer.db.controller.download; /** * 下载类型枚举 diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/download/FormatDownloadEnum.java b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/controller/download/FormatDownloadEnum.java similarity index 90% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/download/FormatDownloadEnum.java rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/controller/download/FormatDownloadEnum.java index e21a9306..ee996252 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/download/FormatDownloadEnum.java +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/controller/download/FormatDownloadEnum.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.db.controller.download; +package org.dromara.zyplayer.db.controller.download; /** * 下载类型枚举 diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/download/FormatDownloadService.java b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/controller/download/FormatDownloadService.java similarity index 70% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/download/FormatDownloadService.java rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/controller/download/FormatDownloadService.java index 09bc069a..4ce8d43e 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/download/FormatDownloadService.java +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/controller/download/FormatDownloadService.java @@ -1,6 +1,6 @@ -package com.zyplayer.doc.db.controller.download; +package org.dromara.zyplayer.db.controller.download; -import com.zyplayer.doc.db.controller.param.DataViewParam; +import org.dromara.zyplayer.db.controller.param.DataViewParam; import javax.servlet.http.HttpServletResponse; diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/param/DataDownloadParam.java b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/controller/param/DataDownloadParam.java similarity index 84% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/param/DataDownloadParam.java rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/controller/param/DataDownloadParam.java index 03bb05a5..5c08efe3 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/param/DataDownloadParam.java +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/controller/param/DataDownloadParam.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.db.controller.param; +package org.dromara.zyplayer.db.controller.param; import lombok.Data; diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/param/DataViewParam.java b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/controller/param/DataViewParam.java similarity index 95% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/param/DataViewParam.java rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/controller/param/DataViewParam.java index f95b11db..f41f2bec 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/param/DataViewParam.java +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/controller/param/DataViewParam.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.db.controller.param; +package org.dromara.zyplayer.db.controller.param; import lombok.Data; diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/param/ProcedureListParam.java b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/controller/param/ProcedureListParam.java similarity index 86% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/param/ProcedureListParam.java rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/controller/param/ProcedureListParam.java index 94f6f51f..cb192fb6 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/param/ProcedureListParam.java +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/controller/param/ProcedureListParam.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.db.controller.param; +package org.dromara.zyplayer.db.controller.param; import lombok.Data; diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/vo/DatabaseExportVo.java b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/controller/vo/DatabaseExportVo.java similarity index 66% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/vo/DatabaseExportVo.java rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/controller/vo/DatabaseExportVo.java index d3d8ad12..080b50cf 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/vo/DatabaseExportVo.java +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/controller/vo/DatabaseExportVo.java @@ -1,27 +1,27 @@ -package com.zyplayer.doc.db.controller.vo; - -import com.zyplayer.doc.db.controller.vo.TableColumnVo.TableInfoVo; -import com.zyplayer.doc.db.framework.db.dto.TableColumnDescDto; -import lombok.AllArgsConstructor; -import lombok.Data; - -import java.util.List; -import java.util.Map; - -/** - * 数据库表导出 - * - * @author 暮光：城中城 - * @since 2018-11-27 - */ -@Data -@AllArgsConstructor -public class DatabaseExportVo { - - // 表字段注释信息列表 - private Map> columnList; - - // 数据库表列表 - private List tableList; - -} +package org.dromara.zyplayer.db.controller.vo; + +import org.dromara.zyplayer.db.controller.vo.TableColumnVo.TableInfoVo; +import org.dromara.zyplayer.db.framework.db.dto.TableColumnDescDto; +import lombok.AllArgsConstructor; +import lombok.Data; + +import java.util.List; +import java.util.Map; + +/** + * 数据库表导出 + * + * @author 暮光：城中城 + * @since 2018-11-27 + */ +@Data +@AllArgsConstructor +public class DatabaseExportVo { + + // 表字段注释信息列表 + private Map> columnList; + + // 数据库表列表 + private List tableList; + +} diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/vo/TableColumnVo.java b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/controller/vo/TableColumnVo.java similarity index 84% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/vo/TableColumnVo.java rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/controller/vo/TableColumnVo.java index 714321c0..cd781d35 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/vo/TableColumnVo.java +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/controller/vo/TableColumnVo.java @@ -1,8 +1,8 @@ -package com.zyplayer.doc.db.controller.vo; +package org.dromara.zyplayer.db.controller.vo; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.zyplayer.doc.db.framework.db.dto.TableColumnDescDto; +import org.dromara.zyplayer.db.framework.db.dto.TableColumnDescDto; import lombok.Data; import java.util.List; diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/vo/TableDdlVo.java b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/controller/vo/TableDdlVo.java similarity index 89% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/vo/TableDdlVo.java rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/controller/vo/TableDdlVo.java index 492c166e..2f9f9932 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/vo/TableDdlVo.java +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/controller/vo/TableDdlVo.java @@ -1,6 +1,6 @@ -package com.zyplayer.doc.db.controller.vo; +package org.dromara.zyplayer.db.controller.vo; -import com.zyplayer.doc.db.framework.db.enums.DatabaseProductEnum; +import org.dromara.zyplayer.db.framework.db.enums.DatabaseProductEnum; import lombok.Data; import java.util.Objects; diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/vo/TableStatusVo.java b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/controller/vo/TableStatusVo.java similarity index 93% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/vo/TableStatusVo.java rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/controller/vo/TableStatusVo.java index 74cc196f..ba688155 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/vo/TableStatusVo.java +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/controller/vo/TableStatusVo.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.db.controller.vo; +package org.dromara.zyplayer.db.controller.vo; import lombok.Data; diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/vo/UserDbAuthVo.java b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/controller/vo/UserDbAuthVo.java similarity index 86% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/vo/UserDbAuthVo.java rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/controller/vo/UserDbAuthVo.java index a70f2de8..9f700085 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/vo/UserDbAuthVo.java +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/controller/vo/UserDbAuthVo.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.db.controller.vo; +package org.dromara.zyplayer.db.controller.vo; import lombok.Data; diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/configuration/ApplicationListenerBean.java b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/configuration/ApplicationListenerBean.java similarity index 88% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/configuration/ApplicationListenerBean.java rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/configuration/ApplicationListenerBean.java index 25fee1fd..d44fec0b 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/configuration/ApplicationListenerBean.java +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/configuration/ApplicationListenerBean.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.db.framework.configuration; +package org.dromara.zyplayer.db.framework.configuration; import org.springframework.context.ApplicationListener; import org.springframework.context.event.ContextRefreshedEvent; diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/configuration/DatasourceUtil.java b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/configuration/DatasourceUtil.java similarity index 82% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/configuration/DatasourceUtil.java rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/configuration/DatasourceUtil.java index d6137d6c..2c266fda 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/configuration/DatasourceUtil.java +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/configuration/DatasourceUtil.java @@ -1,14 +1,13 @@ -package com.zyplayer.doc.db.framework.configuration; +package org.dromara.zyplayer.db.framework.configuration; import com.alibaba.druid.pool.DruidDataSource; -import com.zyplayer.doc.core.exception.ConfirmException; -import com.zyplayer.doc.data.repository.manage.entity.DbDatasource; -import com.zyplayer.doc.data.utils.DruidDataSourceUtil; -import com.zyplayer.doc.db.framework.configuration.analysis.*; -import com.zyplayer.doc.db.framework.db.bean.DatabaseFactoryBean; -import com.zyplayer.doc.db.framework.db.enums.DatabaseProductEnum; -import com.zyplayer.doc.db.framework.db.interceptor.SqlLogInterceptor; -import org.apache.ibatis.plugin.Interceptor; +import org.dromara.zyplayer.core.exception.ConfirmException; +import org.dromara.zyplayer.data.repository.manage.entity.DbDatasource; +import org.dromara.zyplayer.data.utils.DruidDataSourceUtil; +import org.dromara.zyplayer.db.framework.configuration.analysis.*; +import org.dromara.zyplayer.db.framework.db.bean.DatabaseFactoryBean; +import org.dromara.zyplayer.db.framework.db.enums.DatabaseProductEnum; +import org.dromara.zyplayer.db.framework.db.interceptor.SqlLogInterceptor; import org.mybatis.spring.SqlSessionFactoryBean; import org.mybatis.spring.SqlSessionTemplate; import org.springframework.core.io.Resource; diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/configuration/EnableDocDb.java b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/configuration/EnableDocDb.java similarity index 80% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/configuration/EnableDocDb.java rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/configuration/EnableDocDb.java index e0ad186f..ee3b9a2a 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/configuration/EnableDocDb.java +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/configuration/EnableDocDb.java @@ -1,22 +1,22 @@ -package com.zyplayer.doc.db.framework.configuration; - -import org.springframework.context.annotation.ComponentScan; -import org.springframework.context.annotation.Configuration; - -import java.lang.annotation.*; - -/** - * 开启db模块的注解 - * - * @author 暮光：城中城 - * @since 2018-11-27 - */ -@Target(ElementType.TYPE) -@Retention(RetentionPolicy.RUNTIME) -@Documented -@Configuration -@ComponentScan(basePackages = { - "com.zyplayer.doc.db", -}) -public @interface EnableDocDb { -} +package org.dromara.zyplayer.db.framework.configuration; + +import org.springframework.context.annotation.ComponentScan; +import org.springframework.context.annotation.Configuration; + +import java.lang.annotation.*; + +/** + * 开启db模块的注解 + * + * @author 暮光：城中城 + * @since 2018-11-27 + */ +@Target(ElementType.TYPE) +@Retention(RetentionPolicy.RUNTIME) +@Documented +@Configuration +@ComponentScan(basePackages = { + "org.dromara.zyplayer.db", +}) +public @interface EnableDocDb { +} diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/configuration/analysis/AnalysisApi.java b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/configuration/analysis/AnalysisApi.java similarity index 66% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/configuration/analysis/AnalysisApi.java rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/configuration/analysis/AnalysisApi.java index 02927fb3..0d83070a 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/configuration/analysis/AnalysisApi.java +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/configuration/analysis/AnalysisApi.java @@ -1,6 +1,6 @@ -package com.zyplayer.doc.db.framework.configuration.analysis; +package org.dromara.zyplayer.db.framework.configuration.analysis; -import com.zyplayer.doc.db.framework.db.bean.DatabaseFactoryBean; +import org.dromara.zyplayer.db.framework.db.bean.DatabaseFactoryBean; import org.springframework.core.io.Resource; /** diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/configuration/analysis/DmAnalysis.java b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/configuration/analysis/DmAnalysis.java similarity index 82% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/configuration/analysis/DmAnalysis.java rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/configuration/analysis/DmAnalysis.java index a904e454..d8fd510e 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/configuration/analysis/DmAnalysis.java +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/configuration/analysis/DmAnalysis.java @@ -1,7 +1,7 @@ -package com.zyplayer.doc.db.framework.configuration.analysis; +package org.dromara.zyplayer.db.framework.configuration.analysis; -import com.zyplayer.doc.db.framework.db.bean.DatabaseFactoryBean; -import com.zyplayer.doc.db.framework.db.enums.DatabaseProductEnum; +import org.dromara.zyplayer.db.framework.db.bean.DatabaseFactoryBean; +import org.dromara.zyplayer.db.framework.db.enums.DatabaseProductEnum; import org.springframework.core.io.Resource; import org.springframework.core.io.support.PathMatchingResourcePatternResolver; diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/configuration/analysis/HiveAnalysis.java b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/configuration/analysis/HiveAnalysis.java similarity index 81% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/configuration/analysis/HiveAnalysis.java rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/configuration/analysis/HiveAnalysis.java index 782707db..42fcef0f 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/configuration/analysis/HiveAnalysis.java +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/configuration/analysis/HiveAnalysis.java @@ -1,7 +1,7 @@ -package com.zyplayer.doc.db.framework.configuration.analysis; +package org.dromara.zyplayer.db.framework.configuration.analysis; -import com.zyplayer.doc.db.framework.db.bean.DatabaseFactoryBean; -import com.zyplayer.doc.db.framework.db.enums.DatabaseProductEnum; +import org.dromara.zyplayer.db.framework.db.bean.DatabaseFactoryBean; +import org.dromara.zyplayer.db.framework.db.enums.DatabaseProductEnum; import org.springframework.core.io.Resource; import org.springframework.core.io.support.PathMatchingResourcePatternResolver; diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/configuration/analysis/MysqlAnalysis.java b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/configuration/analysis/MysqlAnalysis.java similarity index 83% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/configuration/analysis/MysqlAnalysis.java rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/configuration/analysis/MysqlAnalysis.java index a187d344..cca20806 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/configuration/analysis/MysqlAnalysis.java +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/configuration/analysis/MysqlAnalysis.java @@ -1,7 +1,7 @@ -package com.zyplayer.doc.db.framework.configuration.analysis; +package org.dromara.zyplayer.db.framework.configuration.analysis; -import com.zyplayer.doc.db.framework.db.bean.DatabaseFactoryBean; -import com.zyplayer.doc.db.framework.db.enums.DatabaseProductEnum; +import org.dromara.zyplayer.db.framework.db.bean.DatabaseFactoryBean; +import org.dromara.zyplayer.db.framework.db.enums.DatabaseProductEnum; import org.springframework.core.io.Resource; import org.springframework.core.io.support.PathMatchingResourcePatternResolver; diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/configuration/analysis/OracleAnalysis.java b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/configuration/analysis/OracleAnalysis.java similarity index 82% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/configuration/analysis/OracleAnalysis.java rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/configuration/analysis/OracleAnalysis.java index d40edc3a..5aa6597c 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/configuration/analysis/OracleAnalysis.java +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/configuration/analysis/OracleAnalysis.java @@ -1,7 +1,7 @@ -package com.zyplayer.doc.db.framework.configuration.analysis; +package org.dromara.zyplayer.db.framework.configuration.analysis; -import com.zyplayer.doc.db.framework.db.bean.DatabaseFactoryBean; -import com.zyplayer.doc.db.framework.db.enums.DatabaseProductEnum; +import org.dromara.zyplayer.db.framework.db.bean.DatabaseFactoryBean; +import org.dromara.zyplayer.db.framework.db.enums.DatabaseProductEnum; import org.springframework.core.io.Resource; import org.springframework.core.io.support.PathMatchingResourcePatternResolver; diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/configuration/analysis/PostgresqlAnalysis.java b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/configuration/analysis/PostgresqlAnalysis.java similarity index 84% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/configuration/analysis/PostgresqlAnalysis.java rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/configuration/analysis/PostgresqlAnalysis.java index ac5c0cd9..331150f4 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/configuration/analysis/PostgresqlAnalysis.java +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/configuration/analysis/PostgresqlAnalysis.java @@ -1,7 +1,7 @@ -package com.zyplayer.doc.db.framework.configuration.analysis; +package org.dromara.zyplayer.db.framework.configuration.analysis; -import com.zyplayer.doc.db.framework.db.bean.DatabaseFactoryBean; -import com.zyplayer.doc.db.framework.db.enums.DatabaseProductEnum; +import org.dromara.zyplayer.db.framework.db.bean.DatabaseFactoryBean; +import org.dromara.zyplayer.db.framework.db.enums.DatabaseProductEnum; import org.springframework.core.io.Resource; import org.springframework.core.io.support.PathMatchingResourcePatternResolver; diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/configuration/analysis/SqlserverAnalysis.java b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/configuration/analysis/SqlserverAnalysis.java similarity index 84% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/configuration/analysis/SqlserverAnalysis.java rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/configuration/analysis/SqlserverAnalysis.java index 90fcaed7..df46ad23 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/configuration/analysis/SqlserverAnalysis.java +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/configuration/analysis/SqlserverAnalysis.java @@ -1,7 +1,7 @@ -package com.zyplayer.doc.db.framework.configuration.analysis; +package org.dromara.zyplayer.db.framework.configuration.analysis; -import com.zyplayer.doc.db.framework.db.bean.DatabaseFactoryBean; -import com.zyplayer.doc.db.framework.db.enums.DatabaseProductEnum; +import org.dromara.zyplayer.db.framework.db.bean.DatabaseFactoryBean; +import org.dromara.zyplayer.db.framework.db.enums.DatabaseProductEnum; import org.springframework.core.io.Resource; import org.springframework.core.io.support.PathMatchingResourcePatternResolver; diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/configuration/async/AsyncConfigurer.java b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/configuration/async/AsyncConfigurer.java similarity index 96% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/configuration/async/AsyncConfigurer.java rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/configuration/async/AsyncConfigurer.java index 756d75ec..88d5c0c9 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/configuration/async/AsyncConfigurer.java +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/configuration/async/AsyncConfigurer.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.db.framework.configuration.async; +package org.dromara.zyplayer.db.framework.configuration.async; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/consts/DbAuthType.java b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/consts/DbAuthType.java similarity index 92% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/consts/DbAuthType.java rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/consts/DbAuthType.java index 3d962dd7..cc1ef499 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/consts/DbAuthType.java +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/consts/DbAuthType.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.db.framework.consts; +package org.dromara.zyplayer.db.framework.consts; /** * 数据库授权前缀 diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/bean/DatabaseFactoryBean.java b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/bean/DatabaseFactoryBean.java similarity index 80% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/bean/DatabaseFactoryBean.java rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/bean/DatabaseFactoryBean.java index 3c892c81..9f2316bb 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/bean/DatabaseFactoryBean.java +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/bean/DatabaseFactoryBean.java @@ -1,7 +1,7 @@ -package com.zyplayer.doc.db.framework.db.bean; +package org.dromara.zyplayer.db.framework.db.bean; import com.alibaba.druid.pool.DruidDataSource; -import com.zyplayer.doc.db.framework.db.enums.DatabaseProductEnum; +import org.dromara.zyplayer.db.framework.db.enums.DatabaseProductEnum; import lombok.Data; import org.mybatis.spring.SqlSessionTemplate; diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/bean/DatabaseRegistrationBean.java b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/bean/DatabaseRegistrationBean.java similarity index 88% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/bean/DatabaseRegistrationBean.java rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/bean/DatabaseRegistrationBean.java index 8f69683e..70d98243 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/bean/DatabaseRegistrationBean.java +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/bean/DatabaseRegistrationBean.java @@ -1,10 +1,10 @@ -package com.zyplayer.doc.db.framework.db.bean; +package org.dromara.zyplayer.db.framework.db.bean; -import com.zyplayer.doc.core.exception.ConfirmException; -import com.zyplayer.doc.data.repository.manage.entity.DbDatasource; -import com.zyplayer.doc.data.service.manage.DbDatasourceService; -import com.zyplayer.doc.db.framework.configuration.DatasourceUtil; -import com.zyplayer.doc.db.framework.db.mapper.base.BaseMapper; +import org.dromara.zyplayer.core.exception.ConfirmException; +import org.dromara.zyplayer.data.repository.manage.entity.DbDatasource; +import org.dromara.zyplayer.data.service.manage.DbDatasourceService; +import org.dromara.zyplayer.db.framework.configuration.DatasourceUtil; +import org.dromara.zyplayer.db.framework.db.mapper.base.BaseMapper; import org.mybatis.spring.SqlSessionTemplate; import org.springframework.stereotype.Repository; diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/bean/DbConfigBean.java b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/bean/DbConfigBean.java similarity index 83% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/bean/DbConfigBean.java rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/bean/DbConfigBean.java index 13b6ab81..15fa08fb 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/bean/DbConfigBean.java +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/bean/DbConfigBean.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.db.framework.db.bean; +package org.dromara.zyplayer.db.framework.db.bean; import lombok.Data; diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/dto/ColumnInfoDto.java b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/dto/ColumnInfoDto.java similarity index 79% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/dto/ColumnInfoDto.java rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/dto/ColumnInfoDto.java index 7bfd12bd..f6369e49 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/dto/ColumnInfoDto.java +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/dto/ColumnInfoDto.java @@ -1,17 +1,17 @@ -package com.zyplayer.doc.db.framework.db.dto; - -import lombok.Data; - -/** - * 字段信息 - * - * @author 暮光：城中城 - * @since 2018-11-27 - */ -@Data -public class ColumnInfoDto { - private String isNullable; - private String columnType; - private String columnDefault; - private String extra; -} +package org.dromara.zyplayer.db.framework.db.dto; + +import lombok.Data; + +/** + * 字段信息 + * + * @author 暮光：城中城 + * @since 2018-11-27 + */ +@Data +public class ColumnInfoDto { + private String isNullable; + private String columnType; + private String columnDefault; + private String extra; +} diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/dto/DatabaseInfoDto.java b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/dto/DatabaseInfoDto.java similarity index 73% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/dto/DatabaseInfoDto.java rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/dto/DatabaseInfoDto.java index 098bbc66..f6b3836f 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/dto/DatabaseInfoDto.java +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/dto/DatabaseInfoDto.java @@ -1,14 +1,14 @@ -package com.zyplayer.doc.db.framework.db.dto; - -import lombok.Data; - -/** - * 数据库信息 - * - * @author 暮光：城中城 - * @since 2018-11-27 - */ -@Data -public class DatabaseInfoDto { - private String dbName; -} +package org.dromara.zyplayer.db.framework.db.dto; + +import lombok.Data; + +/** + * 数据库信息 + * + * @author 暮光：城中城 + * @since 2018-11-27 + */ +@Data +public class DatabaseInfoDto { + private String dbName; +} diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/dto/ProcedureDto.java b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/dto/ProcedureDto.java similarity index 86% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/dto/ProcedureDto.java rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/dto/ProcedureDto.java index 292ac125..6c9c21ed 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/dto/ProcedureDto.java +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/dto/ProcedureDto.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.db.framework.db.dto; +package org.dromara.zyplayer.db.framework.db.dto; import lombok.Data; diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/dto/QueryTableColumnDescDto.java b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/dto/QueryTableColumnDescDto.java similarity index 79% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/dto/QueryTableColumnDescDto.java rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/dto/QueryTableColumnDescDto.java index 19dd1623..cecb8f32 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/dto/QueryTableColumnDescDto.java +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/dto/QueryTableColumnDescDto.java @@ -1,16 +1,16 @@ -package com.zyplayer.doc.db.framework.db.dto; - -import lombok.Data; - -/** - * 表字段注释信息 - * - * @author 暮光：城中城 - * @since 2018-11-27 - */ -@Data -public class QueryTableColumnDescDto { - private String tableName; - private String columnName; - private String description; -} +package org.dromara.zyplayer.db.framework.db.dto; + +import lombok.Data; + +/** + * 表字段注释信息 + * + * @author 暮光：城中城 + * @since 2018-11-27 + */ +@Data +public class QueryTableColumnDescDto { + private String tableName; + private String columnName; + private String description; +} diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/dto/TableColumnDescDto.java b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/dto/TableColumnDescDto.java similarity index 94% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/dto/TableColumnDescDto.java rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/dto/TableColumnDescDto.java index 9f1f701c..1fdc0a8f 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/dto/TableColumnDescDto.java +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/dto/TableColumnDescDto.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.db.framework.db.dto; +package org.dromara.zyplayer.db.framework.db.dto; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.ColumnWidth; diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/dto/TableDescDto.java b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/dto/TableDescDto.java similarity index 78% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/dto/TableDescDto.java rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/dto/TableDescDto.java index c0eae402..1578c7a8 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/dto/TableDescDto.java +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/dto/TableDescDto.java @@ -1,16 +1,16 @@ -package com.zyplayer.doc.db.framework.db.dto; - -import lombok.Data; - -/** - * 表注释信息 - * - * @author 暮光：城中城 - * @since 2018-11-27 - */ -@Data -public class TableDescDto { - private String tableName; - private String description; - private String majorId; -} +package org.dromara.zyplayer.db.framework.db.dto; + +import lombok.Data; + +/** + * 表注释信息 + * + * @author 暮光：城中城 + * @since 2018-11-27 + */ +@Data +public class TableDescDto { + private String tableName; + private String description; + private String majorId; +} diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/dto/TableInfoDto.java b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/dto/TableInfoDto.java similarity index 82% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/dto/TableInfoDto.java rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/dto/TableInfoDto.java index c4ca7d70..caa3d9f4 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/dto/TableInfoDto.java +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/dto/TableInfoDto.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.db.framework.db.dto; +package org.dromara.zyplayer.db.framework.db.dto; import lombok.Data; diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/enums/BackupCategoryEnum.java b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/enums/BackupCategoryEnum.java similarity index 91% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/enums/BackupCategoryEnum.java rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/enums/BackupCategoryEnum.java index eeeb6fdb..a6a3c61d 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/enums/BackupCategoryEnum.java +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/enums/BackupCategoryEnum.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.db.framework.db.enums; +package org.dromara.zyplayer.db.framework.db.enums; import lombok.AllArgsConstructor; diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/enums/DatabaseProductEnum.java b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/enums/DatabaseProductEnum.java similarity index 92% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/enums/DatabaseProductEnum.java rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/enums/DatabaseProductEnum.java index 424feb79..3753da97 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/enums/DatabaseProductEnum.java +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/enums/DatabaseProductEnum.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.db.framework.db.enums; +package org.dromara.zyplayer.db.framework.db.enums; /** * 数据库类型枚举 diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/interceptor/SqlLogInterceptor.java b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/interceptor/SqlLogInterceptor.java similarity index 98% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/interceptor/SqlLogInterceptor.java rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/interceptor/SqlLogInterceptor.java index 219cf216..1ea2ad83 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/interceptor/SqlLogInterceptor.java +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/interceptor/SqlLogInterceptor.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.db.framework.db.interceptor; +package org.dromara.zyplayer.db.framework.db.interceptor; import org.apache.ibatis.cache.CacheKey; import org.apache.ibatis.executor.Executor; diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/job/BackupJob.java b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/job/BackupJob.java similarity index 70% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/job/BackupJob.java rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/job/BackupJob.java index 1480b0dc..9ac855d3 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/job/BackupJob.java +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/job/BackupJob.java @@ -1,13 +1,12 @@ -package com.zyplayer.doc.db.framework.db.job; +package org.dromara.zyplayer.db.framework.db.job; import com.alibaba.fastjson.JSONObject; -import com.zyplayer.doc.data.repository.manage.entity.BackupLog; -import com.zyplayer.doc.db.framework.db.vo.BackupJobVO; -import com.zyplayer.doc.db.framework.utils.DatabaseBackupUtils; -import com.zyplayer.doc.db.framework.utils.QuartzManagerUtils; +import org.dromara.zyplayer.data.repository.manage.entity.BackupLog; +import org.dromara.zyplayer.db.framework.db.vo.BackupJobVO; +import org.dromara.zyplayer.db.framework.utils.DatabaseBackupUtils; +import org.dromara.zyplayer.db.framework.utils.QuartzManagerUtils; import org.quartz.Job; import org.quartz.JobExecutionContext; -import org.quartz.JobExecutionException; import org.springframework.beans.factory.annotation.Autowired; /** diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/mapper/base/BaseMapper.java b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/mapper/base/BaseMapper.java similarity index 94% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/mapper/base/BaseMapper.java rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/mapper/base/BaseMapper.java index 4a5f9447..4d76cd5d 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/mapper/base/BaseMapper.java +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/mapper/base/BaseMapper.java @@ -1,10 +1,10 @@ -package com.zyplayer.doc.db.framework.db.mapper.base; +package org.dromara.zyplayer.db.framework.db.mapper.base; import com.alibaba.fastjson.JSONObject; -import com.zyplayer.doc.db.controller.param.ProcedureListParam; -import com.zyplayer.doc.db.controller.vo.TableStatusVo; -import com.zyplayer.doc.db.framework.db.dto.*; +import org.dromara.zyplayer.db.controller.param.ProcedureListParam; +import org.dromara.zyplayer.db.controller.vo.TableStatusVo; import org.apache.ibatis.annotations.Param; +import org.dromara.zyplayer.db.framework.db.dto.*; import java.util.List; import java.util.Map; diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/mapper/base/ColumnExecuteResult.java b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/mapper/base/ColumnExecuteResult.java similarity index 97% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/mapper/base/ColumnExecuteResult.java rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/mapper/base/ColumnExecuteResult.java index 1d1386be..4922885e 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/mapper/base/ColumnExecuteResult.java +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/mapper/base/ColumnExecuteResult.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.db.framework.db.mapper.base; +package org.dromara.zyplayer.db.framework.db.mapper.base; import lombok.Data; diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/mapper/base/ColumnSqlExecutor.java b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/mapper/base/ColumnSqlExecutor.java similarity index 93% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/mapper/base/ColumnSqlExecutor.java rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/mapper/base/ColumnSqlExecutor.java index 079d7097..8b74a00a 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/mapper/base/ColumnSqlExecutor.java +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/mapper/base/ColumnSqlExecutor.java @@ -1,13 +1,13 @@ -package com.zyplayer.doc.db.framework.db.mapper.base; +package org.dromara.zyplayer.db.framework.db.mapper.base; import cn.hutool.core.io.IoUtil; import com.alibaba.druid.pool.DruidPooledConnection; -import com.zyplayer.doc.data.config.security.DocUserDetails; -import com.zyplayer.doc.data.config.security.DocUserUtil; -import com.zyplayer.doc.db.framework.db.bean.DatabaseFactoryBean; -import com.zyplayer.doc.db.framework.db.bean.DatabaseRegistrationBean; -import com.zyplayer.doc.db.framework.sse.service.DbSseEmitterService; -import com.zyplayer.doc.db.framework.sse.util.DbSseCacheUtil; +import org.dromara.zyplayer.data.config.security.DocUserDetails; +import org.dromara.zyplayer.data.config.security.DocUserUtil; +import org.dromara.zyplayer.db.framework.db.bean.DatabaseFactoryBean; +import org.dromara.zyplayer.db.framework.db.bean.DatabaseRegistrationBean; +import org.dromara.zyplayer.db.framework.sse.service.DbSseEmitterService; +import org.dromara.zyplayer.db.framework.sse.util.DbSseCacheUtil; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.ibatis.mapping.ParameterMapping; diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/mapper/base/ExecuteParam.java b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/mapper/base/ExecuteParam.java similarity index 90% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/mapper/base/ExecuteParam.java rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/mapper/base/ExecuteParam.java index 2438e38d..cbadd32f 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/mapper/base/ExecuteParam.java +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/mapper/base/ExecuteParam.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.db.framework.db.mapper.base; +package org.dromara.zyplayer.db.framework.db.mapper.base; import lombok.Data; import org.apache.ibatis.mapping.ParameterMapping; diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/mapper/base/ExecuteResult.java b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/mapper/base/ExecuteResult.java similarity index 93% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/mapper/base/ExecuteResult.java rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/mapper/base/ExecuteResult.java index d1defbcd..775222a0 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/mapper/base/ExecuteResult.java +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/mapper/base/ExecuteResult.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.db.framework.db.mapper.base; +package org.dromara.zyplayer.db.framework.db.mapper.base; import lombok.Data; diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/mapper/base/ExecuteType.java b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/mapper/base/ExecuteType.java similarity index 67% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/mapper/base/ExecuteType.java rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/mapper/base/ExecuteType.java index 98578aed..9802408b 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/mapper/base/ExecuteType.java +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/mapper/base/ExecuteType.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.db.framework.db.mapper.base; +package org.dromara.zyplayer.db.framework.db.mapper.base; /** * 执行类型 diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/mapper/base/ResultHandler.java b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/mapper/base/ResultHandler.java similarity index 77% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/mapper/base/ResultHandler.java rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/mapper/base/ResultHandler.java index cb0ea28c..48271809 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/mapper/base/ResultHandler.java +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/mapper/base/ResultHandler.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.db.framework.db.mapper.base; +package org.dromara.zyplayer.db.framework.db.mapper.base; import java.util.Map; diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/mapper/base/SqlExecutor.java b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/mapper/base/SqlExecutor.java similarity index 96% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/mapper/base/SqlExecutor.java rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/mapper/base/SqlExecutor.java index 99248eb2..ca10e9dd 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/mapper/base/SqlExecutor.java +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/mapper/base/SqlExecutor.java @@ -1,9 +1,9 @@ -package com.zyplayer.doc.db.framework.db.mapper.base; +package org.dromara.zyplayer.db.framework.db.mapper.base; import cn.hutool.core.io.IoUtil; import com.alibaba.druid.pool.DruidPooledConnection; -import com.zyplayer.doc.db.framework.db.bean.DatabaseFactoryBean; -import com.zyplayer.doc.db.framework.db.bean.DatabaseRegistrationBean; +import org.dromara.zyplayer.db.framework.db.bean.DatabaseFactoryBean; +import org.dromara.zyplayer.db.framework.db.bean.DatabaseRegistrationBean; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.ibatis.mapping.ParameterMapping; diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/mapper/dm/DmBaseMapper.xml b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/mapper/dm/DmBaseMapper.xml similarity index 87% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/mapper/dm/DmBaseMapper.xml rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/mapper/dm/DmBaseMapper.xml index eb97b057..7403835c 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/mapper/dm/DmBaseMapper.xml +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/mapper/dm/DmBaseMapper.xml @@ -1,8 +1,8 @@ - + - + @@ -10,18 +10,18 @@ - + - select USERNAME dbName from all_users - select dt.TABLE_NAME as name, dt.NUM_ROWS as "rows", dt.AVG_ROW_LEN as avgRowLength, @@ -35,7 +35,7 @@ - select t.OWNER as dbName,t.TABLE_NAME as tableName,c.COMMENTS as tableComment from all_tables t left join all_tab_comments c on t.TABLE_NAME = c.TABLE_NAME and t.OWNER = c.OWNER @@ -72,7 +72,7 @@ - select t.OWNER,t.TABLE_NAME as tableName,c.COMMENTS as description from all_tables t left join all_tab_comments c on t.TABLE_NAME = c.TABLE_NAME and t.owner = c.owner diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/mapper/dm/DmMapper.java b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/mapper/dm/DmMapper.java similarity index 69% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/mapper/dm/DmMapper.java rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/mapper/dm/DmMapper.java index 189ae80f..8f041e28 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/mapper/dm/DmMapper.java +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/mapper/dm/DmMapper.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.db.framework.db.mapper.dm; +package org.dromara.zyplayer.db.framework.db.mapper.dm; /** * 达梦数据库的mapper持有对象 diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/mapper/hive/HiveBaseMapper.xml b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/mapper/hive/HiveBaseMapper.xml similarity index 81% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/mapper/hive/HiveBaseMapper.xml rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/mapper/hive/HiveBaseMapper.xml index 0d972b3d..1441cef1 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/mapper/hive/HiveBaseMapper.xml +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/mapper/hive/HiveBaseMapper.xml @@ -1,21 +1,21 @@ - + - + - + - + @@ -36,7 +36,7 @@ - + @@ -49,7 +49,7 @@ show create table `${dbName}`.${tableName} - + @@ -74,7 +74,7 @@ select 1 - select 1 from ${dbName}.${tableName} where 0 = 1 diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/mapper/hive/HiveMapper.java b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/mapper/hive/HiveMapper.java similarity index 72% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/mapper/hive/HiveMapper.java rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/mapper/hive/HiveMapper.java index bd8dc859..791bc623 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/mapper/hive/HiveMapper.java +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/mapper/hive/HiveMapper.java @@ -1,6 +1,6 @@ -package com.zyplayer.doc.db.framework.db.mapper.hive; +package org.dromara.zyplayer.db.framework.db.mapper.hive; -import com.zyplayer.doc.db.framework.db.dto.ColumnInfoDto; +import org.dromara.zyplayer.db.framework.db.dto.ColumnInfoDto; import org.apache.ibatis.annotations.Param; /** diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/mapper/hive/HiveMapper.xml b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/mapper/hive/HiveMapper.xml similarity index 65% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/mapper/hive/HiveMapper.xml rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/mapper/hive/HiveMapper.xml index 861db14d..96f4f0f4 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/mapper/hive/HiveMapper.xml +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/mapper/hive/HiveMapper.xml @@ -1,5 +1,5 @@ - + diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/mapper/mysql/MysqlBaseMapper.xml b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/mapper/mysql/MysqlBaseMapper.xml similarity index 77% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/mapper/mysql/MysqlBaseMapper.xml rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/mapper/mysql/MysqlBaseMapper.xml index 7a616284..d04537bb 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/mapper/mysql/MysqlBaseMapper.xml +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/mapper/mysql/MysqlBaseMapper.xml @@ -1,8 +1,8 @@ - + - select SCHEMA_NAME dbName from `information_schema`.SCHEMATA @@ -10,13 +10,13 @@ show create table `${dbName}`.${tableName} - select table_schema dbName,table_name tableName, table_comment as tableComment from `information_schema`.tables where table_schema=#{dbName} - SELECT table_name as tableName,COLUMN_NAME as name,column_comment description,data_type type, COALESCE(CHARACTER_MAXIMUM_LENGTH,NUMERIC_PRECISION) as `length`,NUMERIC_SCALE as numericScale, if(COLUMN_KEY='PRI','1','0') as primaryKey, @@ -27,7 +27,7 @@ ORDER BY ordinal_position - select TABLE_NAME as name, ENGINE as engine, VERSION as version, ROW_FORMAT as rowFormat, TABLE_ROWS as `rows`, AVG_ROW_LENGTH as avgRowLength, DATA_LENGTH as dataLength, @@ -39,17 +39,17 @@ where table_schema=#{dbName} and table_name=#{tableName} - select 1 - SELECT TABLE_NAME as tableName, column_name as columnName, column_comment as description FROM `INFORMATION_SCHEMA`.Columns WHERE table_schema=#{dbName} AND (COLUMN_NAME like #{searchText} or column_comment like #{searchText}) - select table_name tableName, table_comment as description from `information_schema`.tables @@ -73,13 +73,13 @@ - select `db`, `name`, `type`, `definer`, `created` from mysql.proc limit #{param.pageSize} offset #{param.offset} - select `db`, `name`, `type`, `definer`, `created`, `body`, `param_list` as paramList, `returns` from mysql.proc where db=#{dbName} and `type`=#{typeName} and name=#{procName} diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/mapper/mysql/MysqlMapper.java b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/mapper/mysql/MysqlMapper.java similarity index 70% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/mapper/mysql/MysqlMapper.java rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/mapper/mysql/MysqlMapper.java index b28e85f4..a585f299 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/mapper/mysql/MysqlMapper.java +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/mapper/mysql/MysqlMapper.java @@ -1,16 +1,16 @@ -package com.zyplayer.doc.db.framework.db.mapper.mysql; - -import org.apache.ibatis.annotations.Param; - -import com.zyplayer.doc.db.framework.db.dto.ColumnInfoDto; - -/** - * mysql数据库的mapper持有对象 - * - * @author 暮光：城中城 - * @since 2018年8月8日 - */ -public interface MysqlMapper { - - ColumnInfoDto getColumnInfo(@Param("dbName") String dbName, @Param("tableName") String tableName, @Param("columnName") String columnName); -} \ No newline at end of file +package org.dromara.zyplayer.db.framework.db.mapper.mysql; + +import org.apache.ibatis.annotations.Param; + +import org.dromara.zyplayer.db.framework.db.dto.ColumnInfoDto; + +/** + * mysql数据库的mapper持有对象 + * + * @author 暮光：城中城 + * @since 2018年8月8日 + */ +public interface MysqlMapper { + + ColumnInfoDto getColumnInfo(@Param("dbName") String dbName, @Param("tableName") String tableName, @Param("columnName") String columnName); +} diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/mapper/mysql/MysqlMapper.xml b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/mapper/mysql/MysqlMapper.xml similarity index 64% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/mapper/mysql/MysqlMapper.xml rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/mapper/mysql/MysqlMapper.xml index 595f5e3e..a3500716 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/mapper/mysql/MysqlMapper.xml +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/mapper/mysql/MysqlMapper.xml @@ -1,15 +1,15 @@ - - - - - - - + + + + + + + diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/mapper/oracle/OracleBaseMapper.xml b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/mapper/oracle/OracleBaseMapper.xml similarity index 87% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/mapper/oracle/OracleBaseMapper.xml rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/mapper/oracle/OracleBaseMapper.xml index c16dbe8f..2601d56c 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/mapper/oracle/OracleBaseMapper.xml +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/mapper/oracle/OracleBaseMapper.xml @@ -1,8 +1,8 @@ - + - + @@ -10,18 +10,18 @@ - + - select USERNAME dbName from all_users - select dt.TABLE_NAME as name, dt.NUM_ROWS as "rows", dt.AVG_ROW_LEN as avgRowLength, @@ -35,7 +35,7 @@ - select t.OWNER as dbName,t.TABLE_NAME as tableName,c.COMMENTS as tableComment from all_tables t left join all_tab_comments c on t.TABLE_NAME = c.TABLE_NAME and t.OWNER = c.OWNER @@ -72,7 +72,7 @@ - select t.OWNER,t.TABLE_NAME as tableName,c.COMMENTS as description from all_tables t left join all_tab_comments c on t.TABLE_NAME = c.TABLE_NAME and t.owner = c.owner diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/mapper/oracle/OracleMapper.java b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/mapper/oracle/OracleMapper.java similarity index 70% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/mapper/oracle/OracleMapper.java rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/mapper/oracle/OracleMapper.java index 11b5b9d5..7cc45fa0 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/mapper/oracle/OracleMapper.java +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/mapper/oracle/OracleMapper.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.db.framework.db.mapper.oracle; +package org.dromara.zyplayer.db.framework.db.mapper.oracle; /** * oracle数据库的mapper持有对象 diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/mapper/postgresql/PostgresqlBaseMapper.xml b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/mapper/postgresql/PostgresqlBaseMapper.xml similarity index 83% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/mapper/postgresql/PostgresqlBaseMapper.xml rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/mapper/postgresql/PostgresqlBaseMapper.xml index a3bec098..8e344710 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/mapper/postgresql/PostgresqlBaseMapper.xml +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/mapper/postgresql/PostgresqlBaseMapper.xml @@ -1,8 +1,8 @@ - + - + @@ -13,25 +13,25 @@ - + - SELECT distinct table_schema as dbName FROM information_schema.tables ORDER BY 1 - SELECT relname as name, reltuples as rows FROM pg_class r JOIN pg_namespace n ON (relnamespace = n.oid) WHERE relkind = 'r' AND n.nspname = #{dbName} and relname = #{tableName} - select relname as tableName,cast(obj_description(relfilenode,'pg_class') as varchar) as tableComment from pg_class c where relname in (select tablename from pg_tables where schemaname=#{dbName} and position('_2' in tablename)=0) order by 1 @@ -78,7 +78,7 @@ AND A .attnum > 0 - select t.relname as tableName ,description as description from pg_description d,pg_class c,pg_stat_all_tables t where d.objoid=c.oid and objsubid=0 and t.relname=c.relname and t.schemaname=#{dbName} diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/mapper/postgresql/PostgresqlMapper.java b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/mapper/postgresql/PostgresqlMapper.java similarity index 72% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/mapper/postgresql/PostgresqlMapper.java rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/mapper/postgresql/PostgresqlMapper.java index 5dfd3fa6..b1094aba 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/mapper/postgresql/PostgresqlMapper.java +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/mapper/postgresql/PostgresqlMapper.java @@ -1,8 +1,8 @@ -package com.zyplayer.doc.db.framework.db.mapper.postgresql; +package org.dromara.zyplayer.db.framework.db.mapper.postgresql; import org.apache.ibatis.annotations.Param; -import com.zyplayer.doc.db.framework.db.dto.ColumnInfoDto; +import org.dromara.zyplayer.db.framework.db.dto.ColumnInfoDto; /** * postgresql数据库的mapper持有对象 diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/mapper/sqlserver/SqlServerBaseMapper.xml b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/mapper/sqlserver/SqlServerBaseMapper.xml similarity index 88% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/mapper/sqlserver/SqlServerBaseMapper.xml rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/mapper/sqlserver/SqlServerBaseMapper.xml index db249b93..9ba7c35d 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/mapper/sqlserver/SqlServerBaseMapper.xml +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/mapper/sqlserver/SqlServerBaseMapper.xml @@ -1,8 +1,8 @@ - + - + @@ -12,17 +12,17 @@ - + - SELECT NAME as dbName FROM Master..SysDatabases ORDER BY NAME - select #{tableName} as name @@ -76,12 +76,12 @@ AND name = '${tableName}' - SELECT NAME as tableName, ID as tableId FROM ${dbName}..SysObjects Where XType='U' ORDER BY NAME - WITH PRIMARYINFO( COLUMNNAME ,ISPRAMARY) AS ( SELECT C.NAME,'true' AS COLUMNNAME @@ -113,7 +113,7 @@ WHERE convert(nvarchar(max),C.value) like #{searchText} OR B.name like #{searchText} - select 'TABLEDESC_SYS' as tableName, value as description, major_id as majorId from ${dbName}.sys.extended_properties WHERE minor_id=0 diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/mapper/sqlserver/SqlServerMapper.java b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/mapper/sqlserver/SqlServerMapper.java similarity index 75% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/mapper/sqlserver/SqlServerMapper.java rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/mapper/sqlserver/SqlServerMapper.java index 9af95561..7e44c6fc 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/mapper/sqlserver/SqlServerMapper.java +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/mapper/sqlserver/SqlServerMapper.java @@ -1,26 +1,26 @@ -package com.zyplayer.doc.db.framework.db.mapper.sqlserver; - -import com.zyplayer.doc.db.framework.db.dto.TableColumnDescDto; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * sqlserver数据库的mapper持有对象 - * - * @author 暮光：城中城 - * @since 2018年8月8日 - */ -public interface SqlServerMapper { - - /** - * 获取字段注释 - * - * @param tableName 表名 - * @return 表字段注释 - * @author 暮光：城中城 - * @since 2018年8月8日 - */ - List getTableColumnDescList(@Param("tableName") String tableName); - -} +package org.dromara.zyplayer.db.framework.db.mapper.sqlserver; + +import org.dromara.zyplayer.db.framework.db.dto.TableColumnDescDto; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * sqlserver数据库的mapper持有对象 + * + * @author 暮光：城中城 + * @since 2018年8月8日 + */ +public interface SqlServerMapper { + + /** + * 获取字段注释 + * + * @param tableName 表名 + * @return 表字段注释 + * @author 暮光：城中城 + * @since 2018年8月8日 + */ + List getTableColumnDescList(@Param("tableName") String tableName); + +} diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/mapper/sqlserver/SqlServerMapper.xml b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/mapper/sqlserver/SqlServerMapper.xml similarity index 67% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/mapper/sqlserver/SqlServerMapper.xml rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/mapper/sqlserver/SqlServerMapper.xml index 90fc50f3..d9e416b1 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/mapper/sqlserver/SqlServerMapper.xml +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/mapper/sqlserver/SqlServerMapper.xml @@ -1,8 +1,8 @@ - + - SELECT B.name AS name,C.value AS description FROM sys.tables A INNER JOIN sys.columns B ON B.object_id = A.object_id diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/parser/FillParamParser.java b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/parser/FillParamParser.java similarity index 88% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/parser/FillParamParser.java rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/parser/FillParamParser.java index 73f48b26..b38118d1 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/parser/FillParamParser.java +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/parser/FillParamParser.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.db.framework.db.parser; +package org.dromara.zyplayer.db.framework.db.parser; import cn.hutool.core.date.DateTime; diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/parser/FillParamUtil.java b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/parser/FillParamUtil.java similarity index 98% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/parser/FillParamUtil.java rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/parser/FillParamUtil.java index 66d48066..99e72835 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/parser/FillParamUtil.java +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/parser/FillParamUtil.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.db.framework.db.parser; +package org.dromara.zyplayer.db.framework.db.parser; import cn.hutool.core.date.DateField; import cn.hutool.core.date.DateTime; diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/parser/GenericTokenParser.java b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/parser/GenericTokenParser.java similarity index 98% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/parser/GenericTokenParser.java rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/parser/GenericTokenParser.java index 41e3f41d..0a3c3b55 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/parser/GenericTokenParser.java +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/parser/GenericTokenParser.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.zyplayer.doc.db.framework.db.parser; +package org.dromara.zyplayer.db.framework.db.parser; import org.apache.ibatis.parsing.TokenHandler; diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/sql/MethodInvoke.java b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/sql/MethodInvoke.java similarity index 96% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/sql/MethodInvoke.java rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/sql/MethodInvoke.java index c5bec0e6..ff5030cb 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/sql/MethodInvoke.java +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/sql/MethodInvoke.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.db.framework.db.sql; +package org.dromara.zyplayer.db.framework.db.sql; import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.ast.expr.SQLMethodInvokeExpr; diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/sql/dialect/mysql/MySqlToOracleOutputVisitor.java b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/sql/dialect/mysql/MySqlToOracleOutputVisitor.java similarity index 94% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/sql/dialect/mysql/MySqlToOracleOutputVisitor.java rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/sql/dialect/mysql/MySqlToOracleOutputVisitor.java index 2772863d..b5912ae0 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/sql/dialect/mysql/MySqlToOracleOutputVisitor.java +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/sql/dialect/mysql/MySqlToOracleOutputVisitor.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.db.framework.db.sql.dialect.mysql; +package org.dromara.zyplayer.db.framework.db.sql.dialect.mysql; import com.alibaba.druid.DbType; import com.alibaba.druid.sql.ast.SQLExpr; @@ -17,10 +17,10 @@ import com.alibaba.druid.sql.dialect.oracle.ast.stmt.OraclePrimaryKey; import com.alibaba.druid.sql.dialect.oracle.ast.stmt.OracleUnique; import com.alibaba.druid.sql.parser.SQLParserUtils; import com.alibaba.druid.util.FnvHash; -import com.zyplayer.doc.db.framework.db.sql.dialect.mysql.function.MySqlToOracleFunctionTransform; -import com.zyplayer.doc.db.framework.db.sql.dialect.mysql.util.MySqlSQLDataTypeTransformUtil; -import com.zyplayer.doc.db.framework.utils.MapCacheUtil; -import com.zyplayer.doc.db.framework.utils.SQLTransformUtils; +import org.dromara.zyplayer.db.framework.db.sql.dialect.mysql.function.MySqlToOracleFunctionTransform; +import org.dromara.zyplayer.db.framework.db.sql.dialect.mysql.util.MySqlSQLDataTypeTransformUtil; +import org.dromara.zyplayer.db.framework.utils.MapCacheUtil; +import org.dromara.zyplayer.db.framework.utils.SQLTransformUtils; import java.util.List; import java.util.Objects; diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/sql/dialect/mysql/MySqlToSqlServerOutputVisitor.java b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/sql/dialect/mysql/MySqlToSqlServerOutputVisitor.java similarity index 93% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/sql/dialect/mysql/MySqlToSqlServerOutputVisitor.java rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/sql/dialect/mysql/MySqlToSqlServerOutputVisitor.java index a66bb8be..2211b009 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/sql/dialect/mysql/MySqlToSqlServerOutputVisitor.java +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/sql/dialect/mysql/MySqlToSqlServerOutputVisitor.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.db.framework.db.sql.dialect.mysql; +package org.dromara.zyplayer.db.framework.db.sql.dialect.mysql; import com.alibaba.druid.DbType; import com.alibaba.druid.sql.ast.SQLExpr; @@ -10,10 +10,10 @@ import com.alibaba.druid.sql.dialect.mysql.ast.MySqlUnique; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlCreateTableStatement; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlOutputVisitor; import com.alibaba.druid.sql.parser.SQLParserUtils; -import com.zyplayer.doc.db.framework.db.sql.dialect.mysql.function.MySqlToSqlServerFunctionTransform; -import com.zyplayer.doc.db.framework.db.sql.dialect.mysql.util.MySqlSQLDataTypeTransformUtil; -import com.zyplayer.doc.db.framework.utils.MapCacheUtil; -import com.zyplayer.doc.db.framework.utils.SQLTransformUtils; +import org.dromara.zyplayer.db.framework.db.sql.dialect.mysql.function.MySqlToSqlServerFunctionTransform; +import org.dromara.zyplayer.db.framework.db.sql.dialect.mysql.util.MySqlSQLDataTypeTransformUtil; +import org.dromara.zyplayer.db.framework.utils.MapCacheUtil; +import org.dromara.zyplayer.db.framework.utils.SQLTransformUtils; import java.util.List; import java.util.Objects; diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/sql/dialect/mysql/function/MySqlToOracleFunction.java b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/sql/dialect/mysql/function/MySqlToOracleFunction.java similarity index 54% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/sql/dialect/mysql/function/MySqlToOracleFunction.java rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/sql/dialect/mysql/function/MySqlToOracleFunction.java index 23e4cd72..4ed825f2 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/sql/dialect/mysql/function/MySqlToOracleFunction.java +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/sql/dialect/mysql/function/MySqlToOracleFunction.java @@ -1,6 +1,6 @@ -package com.zyplayer.doc.db.framework.db.sql.dialect.mysql.function; +package org.dromara.zyplayer.db.framework.db.sql.dialect.mysql.function; -import com.zyplayer.doc.db.framework.db.sql.MethodInvoke; +import org.dromara.zyplayer.db.framework.db.sql.MethodInvoke; /** * mysql2oracle需要转换的函数 diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/sql/dialect/mysql/function/MySqlToOracleFunctionTransform.java b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/sql/dialect/mysql/function/MySqlToOracleFunctionTransform.java similarity index 71% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/sql/dialect/mysql/function/MySqlToOracleFunctionTransform.java rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/sql/dialect/mysql/function/MySqlToOracleFunctionTransform.java index 465c221a..14ed6b45 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/sql/dialect/mysql/function/MySqlToOracleFunctionTransform.java +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/sql/dialect/mysql/function/MySqlToOracleFunctionTransform.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.db.framework.db.sql.dialect.mysql.function; +package org.dromara.zyplayer.db.framework.db.sql.dialect.mysql.function; /** * mysql2oracle需要转换的函数实现 diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/sql/dialect/mysql/function/MySqlToSqlServerFunction.java b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/sql/dialect/mysql/function/MySqlToSqlServerFunction.java similarity index 91% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/sql/dialect/mysql/function/MySqlToSqlServerFunction.java rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/sql/dialect/mysql/function/MySqlToSqlServerFunction.java index 1f84fd0f..7bc980bc 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/sql/dialect/mysql/function/MySqlToSqlServerFunction.java +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/sql/dialect/mysql/function/MySqlToSqlServerFunction.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.db.framework.db.sql.dialect.mysql.function; +package org.dromara.zyplayer.db.framework.db.sql.dialect.mysql.function; import com.alibaba.druid.sql.ast.SQLObject; import com.alibaba.druid.sql.ast.expr.SQLBinaryOpExpr; @@ -6,7 +6,7 @@ import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr; import com.alibaba.druid.sql.ast.expr.SQLMethodInvokeExpr; import com.alibaba.druid.sql.ast.statement.SQLColumnDefinition; import com.alibaba.druid.sql.ast.statement.SQLSelectItem; -import com.zyplayer.doc.db.framework.db.sql.MethodInvoke; +import org.dromara.zyplayer.db.framework.db.sql.MethodInvoke; /** * mysql2sqlserver需要转换的函数 diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/sql/dialect/mysql/function/MySqlToSqlServerFunctionTransform.java b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/sql/dialect/mysql/function/MySqlToSqlServerFunctionTransform.java similarity index 83% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/sql/dialect/mysql/function/MySqlToSqlServerFunctionTransform.java rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/sql/dialect/mysql/function/MySqlToSqlServerFunctionTransform.java index dd986c3c..b74f87d6 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/sql/dialect/mysql/function/MySqlToSqlServerFunctionTransform.java +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/sql/dialect/mysql/function/MySqlToSqlServerFunctionTransform.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.db.framework.db.sql.dialect.mysql.function; +package org.dromara.zyplayer.db.framework.db.sql.dialect.mysql.function; import com.alibaba.druid.sql.ast.expr.SQLMethodInvokeExpr; diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/sql/dialect/mysql/util/MySqlSQLDataTypeTransformUtil.java b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/sql/dialect/mysql/util/MySqlSQLDataTypeTransformUtil.java similarity index 98% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/sql/dialect/mysql/util/MySqlSQLDataTypeTransformUtil.java rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/sql/dialect/mysql/util/MySqlSQLDataTypeTransformUtil.java index ed4072a2..ddd86eb8 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/sql/dialect/mysql/util/MySqlSQLDataTypeTransformUtil.java +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/sql/dialect/mysql/util/MySqlSQLDataTypeTransformUtil.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.db.framework.db.sql.dialect.mysql.util; +package org.dromara.zyplayer.db.framework.db.sql.dialect.mysql.util; import com.alibaba.druid.sql.SQLTransformUtils; import com.alibaba.druid.sql.SQLUtils; diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/sql/dialect/oracle/OracleToMySqlOutputVisitor.java b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/sql/dialect/oracle/OracleToMySqlOutputVisitor.java similarity index 94% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/sql/dialect/oracle/OracleToMySqlOutputVisitor.java rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/sql/dialect/oracle/OracleToMySqlOutputVisitor.java index d26257bf..4522065c 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/sql/dialect/oracle/OracleToMySqlOutputVisitor.java +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/sql/dialect/oracle/OracleToMySqlOutputVisitor.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.db.framework.db.sql.dialect.oracle; +package org.dromara.zyplayer.db.framework.db.sql.dialect.oracle; import com.alibaba.druid.DbType; import com.alibaba.druid.sql.ast.SQLExpr; @@ -17,10 +17,10 @@ import com.alibaba.druid.sql.dialect.oracle.ast.stmt.OracleUnique; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleOutputVisitor; import com.alibaba.druid.sql.parser.SQLParserUtils; import com.alibaba.druid.util.FnvHash; -import com.zyplayer.doc.db.framework.db.sql.dialect.oracle.function.OracleToMySqlFunctionTransform; -import com.zyplayer.doc.db.framework.db.sql.dialect.oracle.util.OracleSQLDataTypeTransformUtil; -import com.zyplayer.doc.db.framework.utils.MapCacheUtil; -import com.zyplayer.doc.db.framework.utils.SQLTransformUtils; +import org.dromara.zyplayer.db.framework.db.sql.dialect.oracle.function.OracleToMySqlFunctionTransform; +import org.dromara.zyplayer.db.framework.db.sql.dialect.oracle.util.OracleSQLDataTypeTransformUtil; +import org.dromara.zyplayer.db.framework.utils.MapCacheUtil; +import org.dromara.zyplayer.db.framework.utils.SQLTransformUtils; import java.util.List; import java.util.Objects; diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/sql/dialect/oracle/function/OracleToMySqlFunction.java b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/sql/dialect/oracle/function/OracleToMySqlFunction.java similarity index 91% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/sql/dialect/oracle/function/OracleToMySqlFunction.java rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/sql/dialect/oracle/function/OracleToMySqlFunction.java index adc55045..c497cd4d 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/sql/dialect/oracle/function/OracleToMySqlFunction.java +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/sql/dialect/oracle/function/OracleToMySqlFunction.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.db.framework.db.sql.dialect.oracle.function; +package org.dromara.zyplayer.db.framework.db.sql.dialect.oracle.function; import com.alibaba.druid.sql.ast.SQLObject; import com.alibaba.druid.sql.ast.expr.SQLBinaryOpExpr; @@ -6,7 +6,7 @@ import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr; import com.alibaba.druid.sql.ast.expr.SQLMethodInvokeExpr; import com.alibaba.druid.sql.ast.statement.SQLColumnDefinition; import com.alibaba.druid.sql.ast.statement.SQLSelectItem; -import com.zyplayer.doc.db.framework.db.sql.MethodInvoke; +import org.dromara.zyplayer.db.framework.db.sql.MethodInvoke; /** * oracle2mysql需要转换的函数 diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/sql/dialect/oracle/function/OracleToMySqlFunctionTransform.java b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/sql/dialect/oracle/function/OracleToMySqlFunctionTransform.java similarity index 83% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/sql/dialect/oracle/function/OracleToMySqlFunctionTransform.java rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/sql/dialect/oracle/function/OracleToMySqlFunctionTransform.java index da0afbb8..6de5bb4b 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/sql/dialect/oracle/function/OracleToMySqlFunctionTransform.java +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/sql/dialect/oracle/function/OracleToMySqlFunctionTransform.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.db.framework.db.sql.dialect.oracle.function; +package org.dromara.zyplayer.db.framework.db.sql.dialect.oracle.function; import com.alibaba.druid.sql.ast.expr.SQLMethodInvokeExpr; diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/sql/dialect/oracle/util/OracleSQLDataTypeTransformUtil.java b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/sql/dialect/oracle/util/OracleSQLDataTypeTransformUtil.java similarity index 99% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/sql/dialect/oracle/util/OracleSQLDataTypeTransformUtil.java rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/sql/dialect/oracle/util/OracleSQLDataTypeTransformUtil.java index b2ac7bd5..773635cc 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/sql/dialect/oracle/util/OracleSQLDataTypeTransformUtil.java +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/sql/dialect/oracle/util/OracleSQLDataTypeTransformUtil.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.db.framework.db.sql.dialect.oracle.util; +package org.dromara.zyplayer.db.framework.db.sql.dialect.oracle.util; import com.alibaba.druid.sql.SQLTransformUtils; import com.alibaba.druid.sql.SQLUtils; diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/sql/dialect/sqlserver/SqlServerToMySqlOutputVisitor.java b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/sql/dialect/sqlserver/SqlServerToMySqlOutputVisitor.java similarity index 93% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/sql/dialect/sqlserver/SqlServerToMySqlOutputVisitor.java rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/sql/dialect/sqlserver/SqlServerToMySqlOutputVisitor.java index ab3f28c3..495cd0f9 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/sql/dialect/sqlserver/SqlServerToMySqlOutputVisitor.java +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/sql/dialect/sqlserver/SqlServerToMySqlOutputVisitor.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.db.framework.db.sql.dialect.sqlserver; +package org.dromara.zyplayer.db.framework.db.sql.dialect.sqlserver; import com.alibaba.druid.DbType; import com.alibaba.druid.sql.ast.SQLExpr; @@ -10,10 +10,10 @@ import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlCreateTableStateme import com.alibaba.druid.sql.dialect.sqlserver.visitor.SQLServerOutputVisitor; import com.alibaba.druid.sql.parser.SQLParserUtils; import com.alibaba.druid.util.FnvHash; -import com.zyplayer.doc.db.framework.db.sql.dialect.sqlserver.function.SqlServerToMySqlFunctionTransform; -import com.zyplayer.doc.db.framework.db.sql.dialect.sqlserver.util.SqlServerSQLDataTypeTransformUtil; -import com.zyplayer.doc.db.framework.utils.MapCacheUtil; -import com.zyplayer.doc.db.framework.utils.SQLTransformUtils; +import org.dromara.zyplayer.db.framework.db.sql.dialect.sqlserver.function.SqlServerToMySqlFunctionTransform; +import org.dromara.zyplayer.db.framework.db.sql.dialect.sqlserver.util.SqlServerSQLDataTypeTransformUtil; +import org.dromara.zyplayer.db.framework.utils.MapCacheUtil; +import org.dromara.zyplayer.db.framework.utils.SQLTransformUtils; import java.util.List; import java.util.Objects; diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/sql/dialect/sqlserver/function/SqlServerToMySqlFunction.java b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/sql/dialect/sqlserver/function/SqlServerToMySqlFunction.java similarity index 54% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/sql/dialect/sqlserver/function/SqlServerToMySqlFunction.java rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/sql/dialect/sqlserver/function/SqlServerToMySqlFunction.java index 55b4a92c..af72fce7 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/sql/dialect/sqlserver/function/SqlServerToMySqlFunction.java +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/sql/dialect/sqlserver/function/SqlServerToMySqlFunction.java @@ -1,6 +1,6 @@ -package com.zyplayer.doc.db.framework.db.sql.dialect.sqlserver.function; +package org.dromara.zyplayer.db.framework.db.sql.dialect.sqlserver.function; -import com.zyplayer.doc.db.framework.db.sql.MethodInvoke; +import org.dromara.zyplayer.db.framework.db.sql.MethodInvoke; /** * sqlserver2mysql需要转换的函数 diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/sql/dialect/sqlserver/function/SqlServerToMySqlFunctionTransform.java b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/sql/dialect/sqlserver/function/SqlServerToMySqlFunctionTransform.java similarity index 71% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/sql/dialect/sqlserver/function/SqlServerToMySqlFunctionTransform.java rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/sql/dialect/sqlserver/function/SqlServerToMySqlFunctionTransform.java index 8d7fd9c1..a5a89dfc 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/sql/dialect/sqlserver/function/SqlServerToMySqlFunctionTransform.java +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/sql/dialect/sqlserver/function/SqlServerToMySqlFunctionTransform.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.db.framework.db.sql.dialect.sqlserver.function; +package org.dromara.zyplayer.db.framework.db.sql.dialect.sqlserver.function; /** * sqlserver2mysql需要转换的函数实现 diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/sql/dialect/sqlserver/util/SqlServerSQLDataTypeTransformUtil.java b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/sql/dialect/sqlserver/util/SqlServerSQLDataTypeTransformUtil.java similarity index 96% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/sql/dialect/sqlserver/util/SqlServerSQLDataTypeTransformUtil.java rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/sql/dialect/sqlserver/util/SqlServerSQLDataTypeTransformUtil.java index 8ccafdc0..3d24a516 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/sql/dialect/sqlserver/util/SqlServerSQLDataTypeTransformUtil.java +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/sql/dialect/sqlserver/util/SqlServerSQLDataTypeTransformUtil.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.db.framework.db.sql.dialect.sqlserver.util; +package org.dromara.zyplayer.db.framework.db.sql.dialect.sqlserver.util; import com.alibaba.druid.sql.SQLTransformUtils; import com.alibaba.druid.sql.ast.SQLDataType; diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/transfer/SqlParseUtil.java b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/transfer/SqlParseUtil.java similarity index 98% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/transfer/SqlParseUtil.java rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/transfer/SqlParseUtil.java index 6560f2f2..2792ed04 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/transfer/SqlParseUtil.java +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/transfer/SqlParseUtil.java @@ -1,7 +1,7 @@ -package com.zyplayer.doc.db.framework.db.transfer; +package org.dromara.zyplayer.db.framework.db.transfer; -import com.zyplayer.doc.db.framework.db.mapper.base.ExecuteParam; -import com.zyplayer.doc.db.framework.db.parser.FillParamUtil; +import org.dromara.zyplayer.db.framework.db.mapper.base.ExecuteParam; +import org.dromara.zyplayer.db.framework.db.parser.FillParamUtil; import net.sf.jsqlparser.JSQLParserException; import net.sf.jsqlparser.expression.Alias; import net.sf.jsqlparser.expression.Expression; diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/transfer/TransferDataServer.java b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/transfer/TransferDataServer.java similarity index 87% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/transfer/TransferDataServer.java rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/transfer/TransferDataServer.java index 13c9283a..35c4d9b7 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/transfer/TransferDataServer.java +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/transfer/TransferDataServer.java @@ -1,23 +1,23 @@ -package com.zyplayer.doc.db.framework.db.transfer; +package org.dromara.zyplayer.db.framework.db.transfer; import cn.hutool.core.date.DateTime; import cn.hutool.core.util.IdUtil; -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.DbTransferTask; -import com.zyplayer.doc.data.repository.support.consts.DocAuthConst; -import com.zyplayer.doc.data.repository.support.consts.DocSysModuleType; -import com.zyplayer.doc.data.repository.support.consts.DocSysType; -import com.zyplayer.doc.data.service.manage.DbTransferTaskService; -import com.zyplayer.doc.data.utils.ThreadPoolUtil; -import com.zyplayer.doc.db.framework.consts.DbAuthType; -import com.zyplayer.doc.db.framework.db.bean.DatabaseFactoryBean; -import com.zyplayer.doc.db.framework.db.bean.DatabaseRegistrationBean; -import com.zyplayer.doc.db.framework.db.mapper.base.ExecuteParam; -import com.zyplayer.doc.db.framework.db.mapper.base.ExecuteResult; -import com.zyplayer.doc.db.framework.db.mapper.base.ExecuteType; -import com.zyplayer.doc.db.framework.db.mapper.base.SqlExecutor; +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.DbTransferTask; +import org.dromara.zyplayer.data.repository.support.consts.DocAuthConst; +import org.dromara.zyplayer.data.repository.support.consts.DocSysModuleType; +import org.dromara.zyplayer.data.repository.support.consts.DocSysType; +import org.dromara.zyplayer.data.service.manage.DbTransferTaskService; +import org.dromara.zyplayer.data.utils.ThreadPoolUtil; +import org.dromara.zyplayer.db.framework.consts.DbAuthType; +import org.dromara.zyplayer.db.framework.db.bean.DatabaseFactoryBean; +import org.dromara.zyplayer.db.framework.db.bean.DatabaseRegistrationBean; +import org.dromara.zyplayer.db.framework.db.mapper.base.ExecuteParam; +import org.dromara.zyplayer.db.framework.db.mapper.base.ExecuteResult; +import org.dromara.zyplayer.db.framework.db.mapper.base.ExecuteType; +import org.dromara.zyplayer.db.framework.db.mapper.base.SqlExecutor; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.exception.ExceptionUtils; diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/transfer/TransferTaskStatus.java b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/transfer/TransferTaskStatus.java similarity index 89% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/transfer/TransferTaskStatus.java rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/transfer/TransferTaskStatus.java index 3ae8478e..c26df585 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/transfer/TransferTaskStatus.java +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/transfer/TransferTaskStatus.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.db.framework.db.transfer; +package org.dromara.zyplayer.db.framework.db.transfer; /** * 数据互导状态类 diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/vo/BackupJobVO.java b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/vo/BackupJobVO.java similarity index 95% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/vo/BackupJobVO.java rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/vo/BackupJobVO.java index 46b03181..05460cc8 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/vo/BackupJobVO.java +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/vo/BackupJobVO.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.db.framework.db.vo; +package org.dromara.zyplayer.db.framework.db.vo; import lombok.Data; diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/vo/BackupRespVO.java b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/vo/BackupRespVO.java similarity index 86% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/vo/BackupRespVO.java rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/vo/BackupRespVO.java index 83de4519..4a30ab86 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/vo/BackupRespVO.java +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/db/vo/BackupRespVO.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.db.framework.db.vo; +package org.dromara.zyplayer.db.framework.db.vo; import lombok.Data; diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/json/DocDbResponseJson.java b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/json/DocDbResponseJson.java similarity index 98% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/json/DocDbResponseJson.java rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/json/DocDbResponseJson.java index 4cd28e3a..09c7004c 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/json/DocDbResponseJson.java +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/json/DocDbResponseJson.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.db.framework.json; +package org.dromara.zyplayer.db.framework.json; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.serializer.SerializeConfig; diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/sse/controller/DbSseEmitterController.java b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/sse/controller/DbSseEmitterController.java similarity index 87% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/sse/controller/DbSseEmitterController.java rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/sse/controller/DbSseEmitterController.java index 59292780..e3a06dff 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/sse/controller/DbSseEmitterController.java +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/sse/controller/DbSseEmitterController.java @@ -1,8 +1,8 @@ -package com.zyplayer.doc.db.framework.sse.controller; +package org.dromara.zyplayer.db.framework.sse.controller; -import com.zyplayer.doc.core.annotation.AuthMan; -import com.zyplayer.doc.db.framework.sse.param.DbCommonSseParam; -import com.zyplayer.doc.db.framework.sse.service.DbSseEmitterService; +import org.dromara.zyplayer.core.annotation.AuthMan; +import org.dromara.zyplayer.db.framework.sse.param.DbCommonSseParam; +import org.dromara.zyplayer.db.framework.sse.service.DbSseEmitterService; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.mvc.method.annotation.SseEmitter; import javax.annotation.Resource; diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/sse/enums/DbSseEmitterParameterEnum.java b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/sse/enums/DbSseEmitterParameterEnum.java similarity index 88% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/sse/enums/DbSseEmitterParameterEnum.java rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/sse/enums/DbSseEmitterParameterEnum.java index 3f978cfd..6d3a9bcc 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/sse/enums/DbSseEmitterParameterEnum.java +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/sse/enums/DbSseEmitterParameterEnum.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.db.framework.sse.enums; +package org.dromara.zyplayer.db.framework.sse.enums; import lombok.Getter; diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/sse/param/DbCommonSseParam.java b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/sse/param/DbCommonSseParam.java similarity index 80% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/sse/param/DbCommonSseParam.java rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/sse/param/DbCommonSseParam.java index d13f6d1d..0572b11c 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/sse/param/DbCommonSseParam.java +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/sse/param/DbCommonSseParam.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.db.framework.sse.param; +package org.dromara.zyplayer.db.framework.sse.param; import lombok.Getter; import lombok.Setter; diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/sse/service/DbSseEmitterService.java b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/sse/service/DbSseEmitterService.java similarity index 91% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/sse/service/DbSseEmitterService.java rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/sse/service/DbSseEmitterService.java index 9b8f69ee..222645d2 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/sse/service/DbSseEmitterService.java +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/sse/service/DbSseEmitterService.java @@ -1,6 +1,6 @@ -package com.zyplayer.doc.db.framework.sse.service; +package org.dromara.zyplayer.db.framework.sse.service; -import com.zyplayer.doc.db.framework.sse.param.DbCommonSseParam; +import org.dromara.zyplayer.db.framework.sse.param.DbCommonSseParam; import org.springframework.web.servlet.mvc.method.annotation.SseEmitter; import java.util.function.Consumer; diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/sse/service/impl/DbSseEmitterServiceImpl.java b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/sse/service/impl/DbSseEmitterServiceImpl.java similarity index 90% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/sse/service/impl/DbSseEmitterServiceImpl.java rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/sse/service/impl/DbSseEmitterServiceImpl.java index 77b72235..aa4b6fd8 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/sse/service/impl/DbSseEmitterServiceImpl.java +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/sse/service/impl/DbSseEmitterServiceImpl.java @@ -1,12 +1,12 @@ -package com.zyplayer.doc.db.framework.sse.service.impl; +package org.dromara.zyplayer.db.framework.sse.service.impl; import cn.hutool.core.util.IdUtil; -import com.zyplayer.doc.data.config.security.DocUserDetails; -import com.zyplayer.doc.data.config.security.DocUserUtil; -import com.zyplayer.doc.db.framework.json.DocDbResponseJson; -import com.zyplayer.doc.db.framework.sse.param.DbCommonSseParam; -import com.zyplayer.doc.db.framework.sse.service.DbSseEmitterService; -import com.zyplayer.doc.db.framework.sse.util.DbSseCacheUtil; +import org.dromara.zyplayer.data.config.security.DocUserDetails; +import org.dromara.zyplayer.data.config.security.DocUserUtil; +import org.dromara.zyplayer.db.framework.json.DocDbResponseJson; +import org.dromara.zyplayer.db.framework.sse.param.DbCommonSseParam; +import org.dromara.zyplayer.db.framework.sse.service.DbSseEmitterService; +import org.dromara.zyplayer.db.framework.sse.util.DbSseCacheUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.web.servlet.mvc.method.annotation.SseEmitter; diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/sse/util/DbSseCacheUtil.java b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/sse/util/DbSseCacheUtil.java similarity index 96% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/sse/util/DbSseCacheUtil.java rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/sse/util/DbSseCacheUtil.java index cf2bcdc7..33fd94d4 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/sse/util/DbSseCacheUtil.java +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/sse/util/DbSseCacheUtil.java @@ -1,9 +1,9 @@ -package com.zyplayer.doc.db.framework.sse.util; +package org.dromara.zyplayer.db.framework.sse.util; import cn.hutool.core.util.StrUtil; -import com.zyplayer.doc.core.exception.ConfirmException; -import com.zyplayer.doc.db.framework.json.DocDbResponseJson; -import com.zyplayer.doc.db.framework.sse.enums.DbSseEmitterParameterEnum; +import org.dromara.zyplayer.core.exception.ConfirmException; +import org.dromara.zyplayer.db.framework.json.DocDbResponseJson; +import org.dromara.zyplayer.db.framework.sse.enums.DbSseEmitterParameterEnum; import lombok.extern.slf4j.Slf4j; import org.springframework.http.MediaType; import org.springframework.web.servlet.mvc.method.annotation.SseEmitter; diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/utils/DatabaseBackupUtils.java b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/utils/DatabaseBackupUtils.java similarity index 96% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/utils/DatabaseBackupUtils.java rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/utils/DatabaseBackupUtils.java index bc41537a..4b68970f 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/utils/DatabaseBackupUtils.java +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/utils/DatabaseBackupUtils.java @@ -1,11 +1,11 @@ -package com.zyplayer.doc.db.framework.utils; +package org.dromara.zyplayer.db.framework.utils; import cn.hutool.core.util.IdUtil; import com.alibaba.excel.util.DateUtils; -import com.zyplayer.doc.data.repository.manage.entity.BackupLog; -import com.zyplayer.doc.data.utils.CleanInputCache; -import com.zyplayer.doc.db.framework.db.vo.BackupJobVO; -import com.zyplayer.doc.db.framework.db.vo.BackupRespVO; +import org.dromara.zyplayer.data.repository.manage.entity.BackupLog; +import org.dromara.zyplayer.data.utils.CleanInputCache; +import org.dromara.zyplayer.db.framework.db.vo.BackupJobVO; +import org.dromara.zyplayer.db.framework.db.vo.BackupRespVO; import org.springframework.scheduling.annotation.Async; import java.io.*; import java.util.Date; diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/utils/JSONUtil.java b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/utils/JSONUtil.java similarity index 91% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/utils/JSONUtil.java rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/utils/JSONUtil.java index 95ba56a3..9f81a051 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/utils/JSONUtil.java +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/utils/JSONUtil.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.db.framework.utils; +package org.dromara.zyplayer.db.framework.utils; import com.alibaba.fastjson.serializer.SerializeConfig; import com.alibaba.fastjson.serializer.SimpleDateFormatSerializer; diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/utils/MapCacheUtil.java b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/utils/MapCacheUtil.java similarity index 94% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/utils/MapCacheUtil.java rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/utils/MapCacheUtil.java index ce87cf05..6e7a1dc0 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/utils/MapCacheUtil.java +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/utils/MapCacheUtil.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.db.framework.utils; +package org.dromara.zyplayer.db.framework.utils; import java.util.HashMap; import java.util.Map; diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/utils/PoiUtil.java b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/utils/PoiUtil.java similarity index 96% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/utils/PoiUtil.java rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/utils/PoiUtil.java index 8e02f662..19fb9845 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/utils/PoiUtil.java +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/utils/PoiUtil.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.db.framework.utils; +package org.dromara.zyplayer.db.framework.utils; import cn.hutool.core.date.DateTime; import cn.hutool.core.io.IoUtil; @@ -6,10 +6,10 @@ import com.alibaba.excel.EasyExcel; import com.alibaba.excel.ExcelWriter; import com.alibaba.excel.write.metadata.WriteSheet; import com.alibaba.fastjson.JSON; -import com.zyplayer.doc.core.util.ZyplayerDocVersion; -import com.zyplayer.doc.db.controller.vo.DatabaseExportVo; -import com.zyplayer.doc.db.controller.vo.TableColumnVo; -import com.zyplayer.doc.db.framework.db.dto.TableColumnDescDto; +import org.dromara.zyplayer.core.util.ZyplayerDocVersion; +import org.dromara.zyplayer.db.controller.vo.DatabaseExportVo; +import org.dromara.zyplayer.db.controller.vo.TableColumnVo; +import org.dromara.zyplayer.db.framework.db.dto.TableColumnDescDto; import org.apache.commons.lang3.StringUtils; import org.apache.poi.xwpf.usermodel.*; import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTTblWidth; diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/utils/QuartzManagerUtils.java b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/utils/QuartzManagerUtils.java similarity index 96% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/utils/QuartzManagerUtils.java rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/utils/QuartzManagerUtils.java index 7cb8b296..d42b96cd 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/utils/QuartzManagerUtils.java +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/utils/QuartzManagerUtils.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.db.framework.utils; +package org.dromara.zyplayer.db.framework.utils; import org.quartz.*; import org.slf4j.Logger; @@ -23,7 +23,7 @@ public class QuartzManagerUtils { /** * 执行任务类名 */ - public static final String CLASS_NAME = "com.zyplayer.doc.db.framework.db.job.BackupJob"; + public static final String CLASS_NAME = "org.dromara.zyplayer.db.framework.db.job.BackupJob"; diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/utils/SQLTransformUtils.java b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/utils/SQLTransformUtils.java similarity index 91% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/utils/SQLTransformUtils.java rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/utils/SQLTransformUtils.java index eb88098e..2b98087c 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/utils/SQLTransformUtils.java +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/utils/SQLTransformUtils.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.db.framework.utils; +package org.dromara.zyplayer.db.framework.utils; import com.alibaba.druid.DbType; import com.alibaba.druid.sql.SQLUtils; @@ -7,11 +7,11 @@ import com.alibaba.druid.sql.dialect.mysql.parser.MySqlLexer; import com.alibaba.druid.sql.dialect.oracle.parser.OracleLexer; import com.alibaba.druid.sql.dialect.sqlserver.parser.SQLServerLexer; import com.alibaba.druid.sql.parser.Keywords; -import com.zyplayer.doc.db.framework.db.enums.DatabaseProductEnum; -import com.zyplayer.doc.db.framework.db.sql.dialect.mysql.MySqlToOracleOutputVisitor; -import com.zyplayer.doc.db.framework.db.sql.dialect.mysql.MySqlToSqlServerOutputVisitor; -import com.zyplayer.doc.db.framework.db.sql.dialect.oracle.OracleToMySqlOutputVisitor; -import com.zyplayer.doc.db.framework.db.sql.dialect.sqlserver.SqlServerToMySqlOutputVisitor; +import org.dromara.zyplayer.db.framework.db.enums.DatabaseProductEnum; +import org.dromara.zyplayer.db.framework.db.sql.dialect.mysql.MySqlToOracleOutputVisitor; +import org.dromara.zyplayer.db.framework.db.sql.dialect.mysql.MySqlToSqlServerOutputVisitor; +import org.dromara.zyplayer.db.framework.db.sql.dialect.oracle.OracleToMySqlOutputVisitor; +import org.dromara.zyplayer.db.framework.db.sql.dialect.sqlserver.SqlServerToMySqlOutputVisitor; import org.springframework.util.StringUtils; import java.io.BufferedReader; diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/utils/SqlLogUtil.java b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/utils/SqlLogUtil.java similarity index 97% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/utils/SqlLogUtil.java rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/utils/SqlLogUtil.java index 2af8d7df..9e376c41 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/utils/SqlLogUtil.java +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/framework/utils/SqlLogUtil.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.db.framework.utils; +package org.dromara.zyplayer.db.framework.utils; import org.apache.ibatis.mapping.ParameterMapping; import org.slf4j.Logger; diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/service/backup/BackupTaskService.java b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/service/backup/BackupTaskService.java similarity index 69% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/service/backup/BackupTaskService.java rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/service/backup/BackupTaskService.java index 7da2b512..769dac9e 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/service/backup/BackupTaskService.java +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/service/backup/BackupTaskService.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.db.service.backup; +package org.dromara.zyplayer.db.service.backup; /** * 备份任务 diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/service/backup/impl/BackupTaskServiceImpl.java b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/service/backup/impl/BackupTaskServiceImpl.java similarity index 78% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/service/backup/impl/BackupTaskServiceImpl.java rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/service/backup/impl/BackupTaskServiceImpl.java index 47314911..f9361620 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/service/backup/impl/BackupTaskServiceImpl.java +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/service/backup/impl/BackupTaskServiceImpl.java @@ -1,11 +1,11 @@ -package com.zyplayer.doc.db.service.backup.impl; +package org.dromara.zyplayer.db.service.backup.impl; import cn.hutool.core.collection.CollectionUtil; import com.alibaba.fastjson.JSON; -import com.zyplayer.doc.data.repository.manage.entity.BackupTask; -import com.zyplayer.doc.data.repository.manage.mapper.BackupTaskMapper; -import com.zyplayer.doc.db.framework.utils.QuartzManagerUtils; -import com.zyplayer.doc.db.service.backup.BackupTaskService; +import org.dromara.zyplayer.data.repository.manage.entity.BackupTask; +import org.dromara.zyplayer.data.repository.manage.mapper.BackupTaskMapper; +import org.dromara.zyplayer.db.framework.utils.QuartzManagerUtils; +import org.dromara.zyplayer.db.service.backup.BackupTaskService; import org.quartz.Scheduler; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/service/common/ExecuteAuthService.java b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/service/common/ExecuteAuthService.java similarity index 64% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/service/common/ExecuteAuthService.java rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/service/common/ExecuteAuthService.java index d1e6ea7c..83bdd872 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/service/common/ExecuteAuthService.java +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/service/common/ExecuteAuthService.java @@ -1,12 +1,12 @@ -package com.zyplayer.doc.db.service.common; +package org.dromara.zyplayer.db.service.common; -import com.zyplayer.doc.core.exception.ConfirmException; -import com.zyplayer.doc.data.config.security.DocUserUtil; -import com.zyplayer.doc.data.repository.support.consts.DocAuthConst; -import com.zyplayer.doc.data.repository.support.consts.DocSysModuleType; -import com.zyplayer.doc.data.repository.support.consts.DocSysType; -import com.zyplayer.doc.db.framework.consts.DbAuthType; -import com.zyplayer.doc.db.framework.db.mapper.base.ExecuteType; +import org.dromara.zyplayer.core.exception.ConfirmException; +import org.dromara.zyplayer.data.config.security.DocUserUtil; +import org.dromara.zyplayer.data.repository.support.consts.DocAuthConst; +import org.dromara.zyplayer.data.repository.support.consts.DocSysModuleType; +import org.dromara.zyplayer.data.repository.support.consts.DocSysType; +import org.dromara.zyplayer.db.framework.consts.DbAuthType; +import org.dromara.zyplayer.db.framework.db.mapper.base.ExecuteType; import org.springframework.stereotype.Service; /** diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/service/database/DatabaseServiceFactory.java b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/service/database/DatabaseServiceFactory.java similarity index 78% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/service/database/DatabaseServiceFactory.java rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/service/database/DatabaseServiceFactory.java index fc00c34d..f3db078f 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/service/database/DatabaseServiceFactory.java +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/service/database/DatabaseServiceFactory.java @@ -1,11 +1,11 @@ -package com.zyplayer.doc.db.service.database; +package org.dromara.zyplayer.db.service.database; -import com.zyplayer.doc.core.exception.ConfirmException; -import com.zyplayer.doc.db.framework.db.bean.DatabaseFactoryBean; -import com.zyplayer.doc.db.framework.db.bean.DatabaseRegistrationBean; -import com.zyplayer.doc.db.framework.db.enums.DatabaseProductEnum; -import com.zyplayer.doc.db.service.download.BaseDownloadService; -import com.zyplayer.doc.db.service.download.DownloadService; +import org.dromara.zyplayer.core.exception.ConfirmException; +import org.dromara.zyplayer.db.framework.db.bean.DatabaseFactoryBean; +import org.dromara.zyplayer.db.framework.db.bean.DatabaseRegistrationBean; +import org.dromara.zyplayer.db.framework.db.enums.DatabaseProductEnum; +import org.dromara.zyplayer.db.service.download.BaseDownloadService; +import org.dromara.zyplayer.db.service.download.DownloadService; import org.springframework.stereotype.Service; import javax.annotation.PostConstruct; diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/service/database/DbBaseService.java b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/service/database/DbBaseService.java similarity index 89% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/service/database/DbBaseService.java rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/service/database/DbBaseService.java index 95289fc6..77ae5d3e 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/service/database/DbBaseService.java +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/service/database/DbBaseService.java @@ -1,29 +1,29 @@ -package com.zyplayer.doc.db.service.database; +package org.dromara.zyplayer.db.service.database; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.zyplayer.doc.core.exception.ConfirmException; -import com.zyplayer.doc.data.config.security.DocUserUtil; -import com.zyplayer.doc.data.repository.support.consts.DocAuthConst; -import com.zyplayer.doc.data.repository.support.consts.DocSysModuleType; -import com.zyplayer.doc.data.repository.support.consts.DocSysType; -import com.zyplayer.doc.db.controller.download.FormatDownloadConst; -import com.zyplayer.doc.db.controller.param.DataViewParam; -import com.zyplayer.doc.db.controller.param.ProcedureListParam; -import com.zyplayer.doc.db.controller.vo.TableColumnVo; -import com.zyplayer.doc.db.controller.vo.TableDdlVo; -import com.zyplayer.doc.db.controller.vo.TableStatusVo; -import com.zyplayer.doc.db.framework.consts.DbAuthType; -import com.zyplayer.doc.db.framework.db.bean.DatabaseFactoryBean; -import com.zyplayer.doc.db.framework.db.bean.DatabaseRegistrationBean; -import com.zyplayer.doc.db.framework.db.dto.*; -import com.zyplayer.doc.db.framework.db.enums.DatabaseProductEnum; -import com.zyplayer.doc.db.framework.db.mapper.base.BaseMapper; -import com.zyplayer.doc.db.framework.db.mapper.base.ExecuteParam; -import com.zyplayer.doc.db.framework.db.mapper.base.ExecuteResult; -import com.zyplayer.doc.db.framework.db.mapper.base.SqlExecutor; -import com.zyplayer.doc.db.service.download.BaseDownloadService; -import com.zyplayer.doc.db.service.download.DownloadService; +import org.dromara.zyplayer.core.exception.ConfirmException; +import org.dromara.zyplayer.data.config.security.DocUserUtil; +import org.dromara.zyplayer.data.repository.support.consts.DocAuthConst; +import org.dromara.zyplayer.data.repository.support.consts.DocSysModuleType; +import org.dromara.zyplayer.data.repository.support.consts.DocSysType; +import org.dromara.zyplayer.db.controller.download.FormatDownloadConst; +import org.dromara.zyplayer.db.controller.param.DataViewParam; +import org.dromara.zyplayer.db.controller.param.ProcedureListParam; +import org.dromara.zyplayer.db.controller.vo.TableColumnVo; +import org.dromara.zyplayer.db.controller.vo.TableDdlVo; +import org.dromara.zyplayer.db.controller.vo.TableStatusVo; +import org.dromara.zyplayer.db.framework.consts.DbAuthType; +import org.dromara.zyplayer.db.framework.db.bean.DatabaseFactoryBean; +import org.dromara.zyplayer.db.framework.db.bean.DatabaseRegistrationBean; +import org.dromara.zyplayer.db.framework.db.dto.*; +import org.dromara.zyplayer.db.framework.db.enums.DatabaseProductEnum; +import org.dromara.zyplayer.db.framework.db.mapper.base.BaseMapper; +import org.dromara.zyplayer.db.framework.db.mapper.base.ExecuteParam; +import org.dromara.zyplayer.db.framework.db.mapper.base.ExecuteResult; +import org.dromara.zyplayer.db.framework.db.mapper.base.SqlExecutor; +import org.dromara.zyplayer.db.service.download.BaseDownloadService; +import org.dromara.zyplayer.db.service.download.DownloadService; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/service/database/DmServiceImpl.java b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/service/database/DmServiceImpl.java similarity index 91% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/service/database/DmServiceImpl.java rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/service/database/DmServiceImpl.java index d5955ab6..1e2a3c4d 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/service/database/DmServiceImpl.java +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/service/database/DmServiceImpl.java @@ -1,7 +1,7 @@ -package com.zyplayer.doc.db.service.database; +package org.dromara.zyplayer.db.service.database; -import com.zyplayer.doc.db.controller.param.DataViewParam; -import com.zyplayer.doc.db.framework.db.enums.DatabaseProductEnum; +import org.dromara.zyplayer.db.controller.param.DataViewParam; +import org.dromara.zyplayer.db.framework.db.enums.DatabaseProductEnum; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/service/database/HiveServiceImpl.java b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/service/database/HiveServiceImpl.java similarity index 81% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/service/database/HiveServiceImpl.java rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/service/database/HiveServiceImpl.java index 929cda98..9a58df8e 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/service/database/HiveServiceImpl.java +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/service/database/HiveServiceImpl.java @@ -1,12 +1,12 @@ -package com.zyplayer.doc.db.service.database; +package org.dromara.zyplayer.db.service.database; -import com.zyplayer.doc.core.exception.ConfirmException; -import com.zyplayer.doc.db.controller.vo.TableDdlVo; -import com.zyplayer.doc.db.framework.db.dto.QueryTableColumnDescDto; -import com.zyplayer.doc.db.framework.db.dto.TableDescDto; -import com.zyplayer.doc.db.framework.db.dto.TableInfoDto; -import com.zyplayer.doc.db.framework.db.enums.DatabaseProductEnum; -import com.zyplayer.doc.db.framework.db.mapper.base.BaseMapper; +import org.dromara.zyplayer.core.exception.ConfirmException; +import org.dromara.zyplayer.db.controller.vo.TableDdlVo; +import org.dromara.zyplayer.db.framework.db.dto.QueryTableColumnDescDto; +import org.dromara.zyplayer.db.framework.db.dto.TableDescDto; +import org.dromara.zyplayer.db.framework.db.dto.TableInfoDto; +import org.dromara.zyplayer.db.framework.db.enums.DatabaseProductEnum; +import org.dromara.zyplayer.db.framework.db.mapper.base.BaseMapper; import org.apache.commons.collections.CollectionUtils; import org.springframework.stereotype.Service; diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/service/database/MysqlServiceImpl.java b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/service/database/MysqlServiceImpl.java similarity index 92% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/service/database/MysqlServiceImpl.java rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/service/database/MysqlServiceImpl.java index 32ffa571..e3447507 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/service/database/MysqlServiceImpl.java +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/service/database/MysqlServiceImpl.java @@ -1,17 +1,17 @@ -package com.zyplayer.doc.db.service.database; +package org.dromara.zyplayer.db.service.database; import cn.hutool.core.util.IdUtil; -import com.zyplayer.doc.db.controller.param.DataViewParam; -import com.zyplayer.doc.db.controller.vo.TableDdlVo; -import com.zyplayer.doc.db.framework.db.dto.ColumnInfoDto; -import com.zyplayer.doc.db.framework.db.dto.ProcedureDto; -import com.zyplayer.doc.db.framework.db.enums.DatabaseProductEnum; -import com.zyplayer.doc.db.framework.db.mapper.base.BaseMapper; -import com.zyplayer.doc.db.framework.db.mapper.base.ExecuteParam; -import com.zyplayer.doc.db.framework.db.mapper.base.ExecuteResult; -import com.zyplayer.doc.db.framework.db.mapper.base.ExecuteType; -import com.zyplayer.doc.db.framework.db.mapper.mysql.MysqlMapper; -import com.zyplayer.doc.db.framework.utils.SQLTransformUtils; +import org.dromara.zyplayer.db.controller.param.DataViewParam; +import org.dromara.zyplayer.db.controller.vo.TableDdlVo; +import org.dromara.zyplayer.db.framework.db.dto.ColumnInfoDto; +import org.dromara.zyplayer.db.framework.db.dto.ProcedureDto; +import org.dromara.zyplayer.db.framework.db.enums.DatabaseProductEnum; +import org.dromara.zyplayer.db.framework.db.mapper.base.BaseMapper; +import org.dromara.zyplayer.db.framework.db.mapper.base.ExecuteParam; +import org.dromara.zyplayer.db.framework.db.mapper.base.ExecuteResult; +import org.dromara.zyplayer.db.framework.db.mapper.base.ExecuteType; +import org.dromara.zyplayer.db.framework.db.mapper.mysql.MysqlMapper; +import org.dromara.zyplayer.db.framework.utils.SQLTransformUtils; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/service/database/OracleServiceImpl.java b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/service/database/OracleServiceImpl.java similarity index 92% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/service/database/OracleServiceImpl.java rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/service/database/OracleServiceImpl.java index df467fad..9a4bb27c 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/service/database/OracleServiceImpl.java +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/service/database/OracleServiceImpl.java @@ -1,11 +1,11 @@ -package com.zyplayer.doc.db.service.database; +package org.dromara.zyplayer.db.service.database; import com.alibaba.druid.sql.SQLUtils; -import com.zyplayer.doc.db.controller.param.DataViewParam; -import com.zyplayer.doc.db.controller.vo.TableDdlVo; -import com.zyplayer.doc.db.framework.db.enums.DatabaseProductEnum; -import com.zyplayer.doc.db.framework.db.mapper.base.BaseMapper; -import com.zyplayer.doc.db.framework.utils.SQLTransformUtils; +import org.dromara.zyplayer.db.controller.param.DataViewParam; +import org.dromara.zyplayer.db.controller.vo.TableDdlVo; +import org.dromara.zyplayer.db.framework.db.enums.DatabaseProductEnum; +import org.dromara.zyplayer.db.framework.db.mapper.base.BaseMapper; +import org.dromara.zyplayer.db.framework.utils.SQLTransformUtils; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/service/database/PostgresqlServiceImpl.java b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/service/database/PostgresqlServiceImpl.java similarity index 90% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/service/database/PostgresqlServiceImpl.java rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/service/database/PostgresqlServiceImpl.java index 42bb93f3..21255254 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/service/database/PostgresqlServiceImpl.java +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/service/database/PostgresqlServiceImpl.java @@ -1,7 +1,7 @@ -package com.zyplayer.doc.db.service.database; +package org.dromara.zyplayer.db.service.database; -import com.zyplayer.doc.db.controller.param.DataViewParam; -import com.zyplayer.doc.db.framework.db.enums.DatabaseProductEnum; +import org.dromara.zyplayer.db.controller.param.DataViewParam; +import org.dromara.zyplayer.db.framework.db.enums.DatabaseProductEnum; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/service/database/SqlserverServiceImpl.java b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/service/database/SqlserverServiceImpl.java similarity index 91% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/service/database/SqlserverServiceImpl.java rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/service/database/SqlserverServiceImpl.java index eddb5f41..61043b3a 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/service/database/SqlserverServiceImpl.java +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/service/database/SqlserverServiceImpl.java @@ -1,14 +1,14 @@ -package com.zyplayer.doc.db.service.database; +package org.dromara.zyplayer.db.service.database; -import com.zyplayer.doc.db.controller.param.DataViewParam; -import com.zyplayer.doc.db.controller.vo.TableColumnVo; -import com.zyplayer.doc.db.controller.vo.TableDdlVo; -import com.zyplayer.doc.db.framework.db.dto.TableColumnDescDto; -import com.zyplayer.doc.db.framework.db.enums.DatabaseProductEnum; -import com.zyplayer.doc.db.framework.db.mapper.base.BaseMapper; -import com.zyplayer.doc.db.framework.db.mapper.sqlserver.SqlServerMapper; -import com.zyplayer.doc.db.framework.utils.SQLTransformUtils; -import com.zyplayer.doc.db.service.download.SqlserverDownloadService; +import org.dromara.zyplayer.db.controller.param.DataViewParam; +import org.dromara.zyplayer.db.controller.vo.TableColumnVo; +import org.dromara.zyplayer.db.controller.vo.TableDdlVo; +import org.dromara.zyplayer.db.framework.db.dto.TableColumnDescDto; +import org.dromara.zyplayer.db.framework.db.enums.DatabaseProductEnum; +import org.dromara.zyplayer.db.framework.db.mapper.base.BaseMapper; +import org.dromara.zyplayer.db.framework.db.mapper.sqlserver.SqlServerMapper; +import org.dromara.zyplayer.db.framework.utils.SQLTransformUtils; +import org.dromara.zyplayer.db.service.download.SqlserverDownloadService; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/service/download/BaseDownloadService.java b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/service/download/BaseDownloadService.java similarity index 93% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/service/download/BaseDownloadService.java rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/service/download/BaseDownloadService.java index 41048b19..baf33ea4 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/service/download/BaseDownloadService.java +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/service/download/BaseDownloadService.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.db.service.download; +package org.dromara.zyplayer.db.service.download; import cn.hutool.core.date.DateTime; import cn.hutool.core.io.FileUtil; @@ -7,14 +7,14 @@ import cn.hutool.core.util.CharsetUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ZipUtil; import com.alibaba.fastjson.JSONObject; -import com.zyplayer.doc.db.controller.param.DataViewParam; -import com.zyplayer.doc.db.controller.vo.TableDdlVo; -import com.zyplayer.doc.db.framework.db.dto.TableColumnDescDto; -import com.zyplayer.doc.db.framework.db.enums.DatabaseProductEnum; -import com.zyplayer.doc.db.framework.db.mapper.base.ExecuteParam; -import com.zyplayer.doc.db.framework.db.mapper.base.SqlExecutor; -import com.zyplayer.doc.db.service.database.DatabaseServiceFactory; -import com.zyplayer.doc.db.service.database.DbBaseService; +import org.dromara.zyplayer.db.controller.param.DataViewParam; +import org.dromara.zyplayer.db.controller.vo.TableDdlVo; +import org.dromara.zyplayer.db.framework.db.dto.TableColumnDescDto; +import org.dromara.zyplayer.db.framework.db.enums.DatabaseProductEnum; +import org.dromara.zyplayer.db.framework.db.mapper.base.ExecuteParam; +import org.dromara.zyplayer.db.framework.db.mapper.base.SqlExecutor; +import org.dromara.zyplayer.db.service.database.DatabaseServiceFactory; +import org.dromara.zyplayer.db.service.database.DbBaseService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/service/download/DownloadService.java b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/service/download/DownloadService.java similarity index 77% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/service/download/DownloadService.java rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/service/download/DownloadService.java index a4ad77de..fbdc4683 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/service/download/DownloadService.java +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/service/download/DownloadService.java @@ -1,9 +1,9 @@ -package com.zyplayer.doc.db.service.download; +package org.dromara.zyplayer.db.service.download; -import com.zyplayer.doc.db.controller.param.DataViewParam; -import com.zyplayer.doc.db.framework.db.dto.TableColumnDescDto; -import com.zyplayer.doc.db.framework.db.enums.DatabaseProductEnum; -import com.zyplayer.doc.db.framework.db.mapper.base.ExecuteParam; +import org.dromara.zyplayer.db.controller.param.DataViewParam; +import org.dromara.zyplayer.db.framework.db.dto.TableColumnDescDto; +import org.dromara.zyplayer.db.framework.db.enums.DatabaseProductEnum; +import org.dromara.zyplayer.db.framework.db.mapper.base.ExecuteParam; import org.springframework.stereotype.Service; import java.util.List; diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/service/download/SqlserverDownloadService.java b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/service/download/SqlserverDownloadService.java similarity index 91% rename from zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/service/download/SqlserverDownloadService.java rename to zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/service/download/SqlserverDownloadService.java index 93a9935f..df9fad1d 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/service/download/SqlserverDownloadService.java +++ b/zyplayer-doc-db/src/main/java/org/dromara/zyplayer/db/service/download/SqlserverDownloadService.java @@ -1,14 +1,14 @@ -package com.zyplayer.doc.db.service.download; +package org.dromara.zyplayer.db.service.download; import com.alibaba.fastjson.JSONObject; -import com.zyplayer.doc.db.controller.param.DataViewParam; -import com.zyplayer.doc.db.controller.vo.TableDdlVo; -import com.zyplayer.doc.db.framework.db.dto.TableColumnDescDto; -import com.zyplayer.doc.db.framework.db.enums.DatabaseProductEnum; -import com.zyplayer.doc.db.framework.db.mapper.base.ExecuteParam; -import com.zyplayer.doc.db.framework.db.mapper.base.SqlExecutor; -import com.zyplayer.doc.db.service.database.DatabaseServiceFactory; -import com.zyplayer.doc.db.service.database.DbBaseService; +import org.dromara.zyplayer.db.controller.param.DataViewParam; +import org.dromara.zyplayer.db.controller.vo.TableDdlVo; +import org.dromara.zyplayer.db.framework.db.dto.TableColumnDescDto; +import org.dromara.zyplayer.db.framework.db.enums.DatabaseProductEnum; +import org.dromara.zyplayer.db.framework.db.mapper.base.ExecuteParam; +import org.dromara.zyplayer.db.framework.db.mapper.base.SqlExecutor; +import org.dromara.zyplayer.db.service.database.DatabaseServiceFactory; +import org.dromara.zyplayer.db.service.database.DbBaseService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; diff --git a/zyplayer-doc-manage/pom.xml b/zyplayer-doc-manage/pom.xml index 1378784d..998d97e6 100644 --- a/zyplayer-doc-manage/pom.xml +++ b/zyplayer-doc-manage/pom.xml @@ -9,7 +9,7 @@ 定位为所有文档的管理项目，API接口文档、数据库文档、、、、等 - com.zyplayer + org.dromara zyplayer-doc 1.0.0 @@ -34,23 +34,23 @@ spring-boot-starter-web - com.zyplayer + org.dromara zyplayer-doc-core - com.zyplayer + org.dromara zyplayer-doc-db - com.zyplayer + org.dromara zyplayer-doc-wiki - com.zyplayer + org.dromara zyplayer-doc-data - com.zyplayer + org.dromara zyplayer-doc-api @@ -98,7 +98,7 @@ spring-boot-maven-plugin 2.1.6.RELEASE - com.zyplayer.doc.manage.Application + org.dromara.zyplayer.manage.Application diff --git a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework/config/ZyplayerDocConfig.java b/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework/config/ZyplayerDocConfig.java deleted file mode 100644 index 9ef8b22b..00000000 --- a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework/config/ZyplayerDocConfig.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.zyplayer.doc.manage.framework.config; - -import com.zyplayer.doc.api.framework.config.EnableDocApi; -import com.zyplayer.doc.db.framework.configuration.EnableDocDb; -import com.zyplayer.doc.wiki.framework.config.EnableDocWiki; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; -import org.springframework.context.annotation.Configuration; - -/** - * 按需开启zyplayer-doc所有的服务 - * - * @author 暮光：城中城 - * @author Sh1yu 2023年6月15日 - * @since 2019年3月31日 - * 规范：添加模块的类，命名需要和前端接受模块开启状态的参数一致，即 enbaleXxxxx enable模块名 - */ -@Configuration -public class ZyplayerDocConfig { - @EnableDocWiki - //wiki模块加载注解条件化，配合配置文件决定是否加载 - @ConditionalOnProperty(prefix = "zyplayer.doc.manage.enable", name = "wiki", matchIfMissing = true) - public static class enableWiki { - } - - @EnableDocDb - //db模块加载注解条件化，配合配置文件决定是否加载 - @ConditionalOnProperty(prefix = "zyplayer.doc.manage.enable", name = "db", matchIfMissing = true) - public static class enableDb { - } - - @EnableDocApi - //api模块加载注解条件化，配合配置文件决定是否加载 - @ConditionalOnProperty(prefix = "zyplayer.doc.manage.enable", name = "api", matchIfMissing = true) - public static class enableApi { - } -} diff --git a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/Application.java b/zyplayer-doc-manage/src/main/java/org/dromara/zyplayer/manage/Application.java similarity index 83% rename from zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/Application.java rename to zyplayer-doc-manage/src/main/java/org/dromara/zyplayer/manage/Application.java index f2d059cc..d674ce22 100644 --- a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/Application.java +++ b/zyplayer-doc-manage/src/main/java/org/dromara/zyplayer/manage/Application.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.manage; +package org.dromara.zyplayer.manage; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -20,12 +20,11 @@ import org.springframework.scheduling.annotation.EnableScheduling; @EnableScheduling @SpringBootApplication @ComponentScan(basePackages = { - "com.zyplayer.doc.manage", - "com.zyplayer.doc.data", - "com.zyplayer.doc.core" + "org.dromara.zyplayer.manage", + "org.dromara.zyplayer.data", + "org.dromara.zyplayer.core" }) public class Application extends SpringBootServletInitializer { - private static final Logger logger = LoggerFactory.getLogger(Application.class); @Override @@ -34,7 +33,7 @@ public class Application extends SpringBootServletInitializer { } public static void main(String[] args) { - ConfigurableApplicationContext application = SpringApplication.run(Application.class, args); + SpringApplication.run(Application.class, args); } } diff --git a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework/config/WebMvcConfig.java b/zyplayer-doc-manage/src/main/java/org/dromara/zyplayer/manage/framework/config/WebMvcConfig.java similarity index 93% rename from zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework/config/WebMvcConfig.java rename to zyplayer-doc-manage/src/main/java/org/dromara/zyplayer/manage/framework/config/WebMvcConfig.java index 770ad537..1c4786cf 100644 --- a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework/config/WebMvcConfig.java +++ b/zyplayer-doc-manage/src/main/java/org/dromara/zyplayer/manage/framework/config/WebMvcConfig.java @@ -1,10 +1,10 @@ -package com.zyplayer.doc.manage.framework.config; +package org.dromara.zyplayer.manage.framework.config; import com.alibaba.fastjson.serializer.SerializerFeature; import com.alibaba.fastjson.support.config.FastJsonConfig; import com.alibaba.fastjson.support.spring.FastJsonHttpMessageConverter; -import com.zyplayer.doc.manage.framework.interceptor.ModuleMissingInterceptor; -import com.zyplayer.doc.manage.framework.interceptor.UserLoginInterceptor; +import org.dromara.zyplayer.manage.framework.interceptor.ModuleMissingInterceptor; +import org.dromara.zyplayer.manage.framework.interceptor.UserLoginInterceptor; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.format.FormatterRegistry; diff --git a/zyplayer-doc-manage/src/main/java/org/dromara/zyplayer/manage/framework/config/ZyplayerDocConfig.java b/zyplayer-doc-manage/src/main/java/org/dromara/zyplayer/manage/framework/config/ZyplayerDocConfig.java new file mode 100644 index 00000000..84b49687 --- /dev/null +++ b/zyplayer-doc-manage/src/main/java/org/dromara/zyplayer/manage/framework/config/ZyplayerDocConfig.java @@ -0,0 +1,34 @@ +package org.dromara.zyplayer.manage.framework.config; + +import org.dromara.zyplayer.api.framework.config.EnableDocApi; +import org.dromara.zyplayer.db.framework.configuration.EnableDocDb; +import org.dromara.zyplayer.wiki.framework.config.EnableDocWiki; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.context.annotation.Configuration; + +/** + * 按需开启zyplayer-doc所有的服务 + * + * @author 暮光：城中城 + * @author Sh1yu 2023年6月15日 + * @since 2019年3月31日 + * 规范：添加模块的类，命名需要和前端接受模块开启状态的参数一致，即 enbaleXxxxx enable模块名 + */ +@Configuration +public class ZyplayerDocConfig { + + @EnableDocWiki + @ConditionalOnProperty(prefix = "zyplayer.doc.manage.enable", name = "wiki", matchIfMissing = true) + public static class enableWiki { + } + + @EnableDocDb + @ConditionalOnProperty(prefix = "zyplayer.doc.manage.enable", name = "db", matchIfMissing = true) + public static class enableDb { + } + + @EnableDocApi + @ConditionalOnProperty(prefix = "zyplayer.doc.manage.enable", name = "api", matchIfMissing = true) + public static class enableApi { + } +} diff --git a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework/config/ZyplayerModuleKeeper.java b/zyplayer-doc-manage/src/main/java/org/dromara/zyplayer/manage/framework/config/ZyplayerModuleKeeper.java similarity index 97% rename from zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework/config/ZyplayerModuleKeeper.java rename to zyplayer-doc-manage/src/main/java/org/dromara/zyplayer/manage/framework/config/ZyplayerModuleKeeper.java index 23023714..2f6a0aa0 100644 --- a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework/config/ZyplayerModuleKeeper.java +++ b/zyplayer-doc-manage/src/main/java/org/dromara/zyplayer/manage/framework/config/ZyplayerModuleKeeper.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.manage.framework.config; +package org.dromara.zyplayer.manage.framework.config; import org.springframework.beans.BeansException; diff --git a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework/console/ApplicationInfoConsolePrint.java b/zyplayer-doc-manage/src/main/java/org/dromara/zyplayer/manage/framework/console/ApplicationInfoConsolePrint.java similarity index 91% rename from zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework/console/ApplicationInfoConsolePrint.java rename to zyplayer-doc-manage/src/main/java/org/dromara/zyplayer/manage/framework/console/ApplicationInfoConsolePrint.java index d76dd4be..62b8acde 100644 --- a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework/console/ApplicationInfoConsolePrint.java +++ b/zyplayer-doc-manage/src/main/java/org/dromara/zyplayer/manage/framework/console/ApplicationInfoConsolePrint.java @@ -1,6 +1,6 @@ -package com.zyplayer.doc.manage.framework.console; +package org.dromara.zyplayer.manage.framework.console; -import com.zyplayer.doc.core.util.ZyplayerDocVersion; +import org.dromara.zyplayer.core.util.ZyplayerDocVersion; import org.springframework.core.env.Environment; import org.springframework.stereotype.Component; diff --git a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework/console/IConsolePrint.java b/zyplayer-doc-manage/src/main/java/org/dromara/zyplayer/manage/framework/console/IConsolePrint.java similarity index 81% rename from zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework/console/IConsolePrint.java rename to zyplayer-doc-manage/src/main/java/org/dromara/zyplayer/manage/framework/console/IConsolePrint.java index 8389aa7f..af8e650d 100644 --- a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework/console/IConsolePrint.java +++ b/zyplayer-doc-manage/src/main/java/org/dromara/zyplayer/manage/framework/console/IConsolePrint.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.manage.framework.console; +package org.dromara.zyplayer.manage.framework.console; import org.springframework.core.Ordered; diff --git a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework/console/ModuleInfoConsolePrint.java b/zyplayer-doc-manage/src/main/java/org/dromara/zyplayer/manage/framework/console/ModuleInfoConsolePrint.java similarity index 92% rename from zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework/console/ModuleInfoConsolePrint.java rename to zyplayer-doc-manage/src/main/java/org/dromara/zyplayer/manage/framework/console/ModuleInfoConsolePrint.java index 00398e4e..d32ec028 100644 --- a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework/console/ModuleInfoConsolePrint.java +++ b/zyplayer-doc-manage/src/main/java/org/dromara/zyplayer/manage/framework/console/ModuleInfoConsolePrint.java @@ -1,6 +1,6 @@ -package com.zyplayer.doc.manage.framework.console; +package org.dromara.zyplayer.manage.framework.console; -import com.zyplayer.doc.manage.framework.config.ZyplayerModuleKeeper; +import org.dromara.zyplayer.manage.framework.config.ZyplayerModuleKeeper; import org.springframework.stereotype.Component; import javax.annotation.Resource; diff --git a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework/console/ZyplayerConsolePrint.java b/zyplayer-doc-manage/src/main/java/org/dromara/zyplayer/manage/framework/console/ZyplayerConsolePrint.java similarity index 93% rename from zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework/console/ZyplayerConsolePrint.java rename to zyplayer-doc-manage/src/main/java/org/dromara/zyplayer/manage/framework/console/ZyplayerConsolePrint.java index 5667e0f6..f4eea02a 100644 --- a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework/console/ZyplayerConsolePrint.java +++ b/zyplayer-doc-manage/src/main/java/org/dromara/zyplayer/manage/framework/console/ZyplayerConsolePrint.java @@ -1,9 +1,8 @@ -package com.zyplayer.doc.manage.framework.console; +package org.dromara.zyplayer.manage.framework.console; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.ObjectProvider; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.CommandLineRunner; import org.springframework.stereotype.Component; diff --git a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework/exception/GlobalHandlerExceptionResolver.java b/zyplayer-doc-manage/src/main/java/org/dromara/zyplayer/manage/framework/exception/GlobalHandlerExceptionResolver.java similarity index 88% rename from zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework/exception/GlobalHandlerExceptionResolver.java rename to zyplayer-doc-manage/src/main/java/org/dromara/zyplayer/manage/framework/exception/GlobalHandlerExceptionResolver.java index 4f9ac5f1..8a6de189 100644 --- a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework/exception/GlobalHandlerExceptionResolver.java +++ b/zyplayer-doc-manage/src/main/java/org/dromara/zyplayer/manage/framework/exception/GlobalHandlerExceptionResolver.java @@ -1,50 +1,50 @@ -package com.zyplayer.doc.manage.framework.exception; - -import com.zyplayer.doc.core.exception.ConfirmException; -import com.zyplayer.doc.core.json.DocResponseJson; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.stereotype.Component; -import org.springframework.web.HttpMediaTypeNotAcceptableException; -import org.springframework.web.servlet.ModelAndView; -import org.springframework.web.servlet.handler.SimpleMappingExceptionResolver; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -/** - * 全局异常处理器 - * - * @author 暮光：城中城 - * @since 2018年12月8日 - */ -@Component -public class GlobalHandlerExceptionResolver extends SimpleMappingExceptionResolver { - private static final Logger logger = LoggerFactory.getLogger(GlobalHandlerExceptionResolver.class); - - @Override - public ModelAndView resolveException(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) { - response.setCharacterEncoding("UTF-8"); - response.setStatus(HttpStatus.OK.value()); - response.setContentType(MediaType.APPLICATION_JSON_VALUE); - response.setHeader("Cache-Control", "no-cache, must-revalidate"); - DocResponseJson responseJson; - // 无需处理的异常 - if (ex instanceof HttpMediaTypeNotAcceptableException) { - responseJson = DocResponseJson.warn("系统错误"); - } else { - // 其他异常 - logger.error("---自定义异常处理---", ex); - if (ex instanceof ConfirmException) { - responseJson = DocResponseJson.warn(ex.getMessage()); - } else { - responseJson = DocResponseJson.warn("系统错误"); - } - } - responseJson.send(response); - return new ModelAndView(); - } -} - +package org.dromara.zyplayer.manage.framework.exception; + +import org.dromara.zyplayer.core.exception.ConfirmException; +import org.dromara.zyplayer.core.json.DocResponseJson; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; +import org.springframework.stereotype.Component; +import org.springframework.web.HttpMediaTypeNotAcceptableException; +import org.springframework.web.servlet.ModelAndView; +import org.springframework.web.servlet.handler.SimpleMappingExceptionResolver; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +/** + * 全局异常处理器 + * + * @author 暮光：城中城 + * @since 2018年12月8日 + */ +@Component +public class GlobalHandlerExceptionResolver extends SimpleMappingExceptionResolver { + private static final Logger logger = LoggerFactory.getLogger(GlobalHandlerExceptionResolver.class); + + @Override + public ModelAndView resolveException(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) { + response.setCharacterEncoding("UTF-8"); + response.setStatus(HttpStatus.OK.value()); + response.setContentType(MediaType.APPLICATION_JSON_VALUE); + response.setHeader("Cache-Control", "no-cache, must-revalidate"); + DocResponseJson responseJson; + // 无需处理的异常 + if (ex instanceof HttpMediaTypeNotAcceptableException) { + responseJson = DocResponseJson.warn("系统错误"); + } else { + // 其他异常 + logger.error("---自定义异常处理---", ex); + if (ex instanceof ConfirmException) { + responseJson = DocResponseJson.warn(ex.getMessage()); + } else { + responseJson = DocResponseJson.warn("系统错误"); + } + } + responseJson.send(response); + return new ModelAndView(); + } +} + diff --git a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework/interceptor/ModuleMissingInterceptor.java b/zyplayer-doc-manage/src/main/java/org/dromara/zyplayer/manage/framework/interceptor/ModuleMissingInterceptor.java similarity index 90% rename from zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework/interceptor/ModuleMissingInterceptor.java rename to zyplayer-doc-manage/src/main/java/org/dromara/zyplayer/manage/framework/interceptor/ModuleMissingInterceptor.java index 4a01d68b..ed534594 100644 --- a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework/interceptor/ModuleMissingInterceptor.java +++ b/zyplayer-doc-manage/src/main/java/org/dromara/zyplayer/manage/framework/interceptor/ModuleMissingInterceptor.java @@ -1,8 +1,8 @@ -package com.zyplayer.doc.manage.framework.interceptor; +package org.dromara.zyplayer.manage.framework.interceptor; -import com.zyplayer.doc.core.json.DocResponseJson; -import com.zyplayer.doc.manage.framework.config.ZyplayerDocConfig; -import com.zyplayer.doc.manage.framework.config.ZyplayerModuleKeeper; +import org.dromara.zyplayer.core.json.DocResponseJson; +import org.dromara.zyplayer.manage.framework.config.ZyplayerDocConfig; +import org.dromara.zyplayer.manage.framework.config.ZyplayerModuleKeeper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; diff --git a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework/interceptor/UserLoginInterceptor.java b/zyplayer-doc-manage/src/main/java/org/dromara/zyplayer/manage/framework/interceptor/UserLoginInterceptor.java similarity index 91% rename from zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework/interceptor/UserLoginInterceptor.java rename to zyplayer-doc-manage/src/main/java/org/dromara/zyplayer/manage/framework/interceptor/UserLoginInterceptor.java index 831bd3a3..338a0a30 100644 --- a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework/interceptor/UserLoginInterceptor.java +++ b/zyplayer-doc-manage/src/main/java/org/dromara/zyplayer/manage/framework/interceptor/UserLoginInterceptor.java @@ -1,11 +1,11 @@ -package com.zyplayer.doc.manage.framework.interceptor; +package org.dromara.zyplayer.manage.framework.interceptor; import cn.hutool.extra.servlet.ServletUtil; -import com.zyplayer.doc.core.annotation.AuthMan; -import com.zyplayer.doc.core.json.DocResponseJson; -import com.zyplayer.doc.core.json.HttpConst; -import com.zyplayer.doc.data.config.security.DocUserDetails; -import com.zyplayer.doc.data.config.security.DocUserUtil; +import org.dromara.zyplayer.core.annotation.AuthMan; +import org.dromara.zyplayer.core.json.DocResponseJson; +import org.dromara.zyplayer.core.json.HttpConst; +import org.dromara.zyplayer.data.config.security.DocUserDetails; +import org.dromara.zyplayer.data.config.security.DocUserUtil; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework/upgrade/SchedulerTask.java b/zyplayer-doc-manage/src/main/java/org/dromara/zyplayer/manage/framework/upgrade/SchedulerTask.java similarity index 93% rename from zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework/upgrade/SchedulerTask.java rename to zyplayer-doc-manage/src/main/java/org/dromara/zyplayer/manage/framework/upgrade/SchedulerTask.java index 404a6b95..15afe13f 100644 --- a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework/upgrade/SchedulerTask.java +++ b/zyplayer-doc-manage/src/main/java/org/dromara/zyplayer/manage/framework/upgrade/SchedulerTask.java @@ -1,8 +1,8 @@ -package com.zyplayer.doc.manage.framework.upgrade; +package org.dromara.zyplayer.manage.framework.upgrade; import cn.hutool.http.HttpRequest; import com.alibaba.fastjson.JSON; -import com.zyplayer.doc.core.util.ZyplayerDocVersion; +import org.dromara.zyplayer.core.util.ZyplayerDocVersion; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework/upgrade/UpgradeInfo.java b/zyplayer-doc-manage/src/main/java/org/dromara/zyplayer/manage/framework/upgrade/UpgradeInfo.java similarity index 83% rename from zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework/upgrade/UpgradeInfo.java rename to zyplayer-doc-manage/src/main/java/org/dromara/zyplayer/manage/framework/upgrade/UpgradeInfo.java index b0cccd06..2c912310 100644 --- a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework/upgrade/UpgradeInfo.java +++ b/zyplayer-doc-manage/src/main/java/org/dromara/zyplayer/manage/framework/upgrade/UpgradeInfo.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.manage.framework.upgrade; +package org.dromara.zyplayer.manage.framework.upgrade; import lombok.*; diff --git a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework/upgrade/UpgradeSystemDdlTask.java b/zyplayer-doc-manage/src/main/java/org/dromara/zyplayer/manage/framework/upgrade/UpgradeSystemDdlTask.java similarity index 92% rename from zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework/upgrade/UpgradeSystemDdlTask.java rename to zyplayer-doc-manage/src/main/java/org/dromara/zyplayer/manage/framework/upgrade/UpgradeSystemDdlTask.java index 8699ed4c..5146f0ea 100644 --- a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework/upgrade/UpgradeSystemDdlTask.java +++ b/zyplayer-doc-manage/src/main/java/org/dromara/zyplayer/manage/framework/upgrade/UpgradeSystemDdlTask.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.manage.framework.upgrade; +package org.dromara.zyplayer.manage.framework.upgrade; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.ast.statement.*; @@ -6,11 +6,11 @@ import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import org.apache.ibatis.session.Configuration; import org.apache.ibatis.session.SqlSessionFactory; import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean; -import com.zyplayer.doc.core.enums.SystemConfigEnum; -import com.zyplayer.doc.core.util.UpgradeInfo; -import com.zyplayer.doc.core.util.ZyplayerDocVersion; -import com.zyplayer.doc.data.repository.manage.mapper.UserInfoMapper; -import com.zyplayer.doc.data.service.manage.SystemConfigService; +import org.dromara.zyplayer.core.enums.SystemConfigEnum; +import org.dromara.zyplayer.core.util.UpgradeInfo; +import org.dromara.zyplayer.core.util.ZyplayerDocVersion; +import org.dromara.zyplayer.data.repository.manage.mapper.UserInfoMapper; +import org.dromara.zyplayer.data.service.manage.SystemConfigService; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; @@ -53,11 +53,8 @@ public class UpgradeSystemDdlTask { @PostConstruct public void init() { try { - - SqlSessionFactory sqlSessionFactory = mybatisSqlSessionFactoryBean.getObject(); - Configuration c = sqlSessionFactory.getConfiguration(); - String databaseId = c.getDatabaseId(); - + SqlSessionFactory sqlSessionFactory = mybatisSqlSessionFactoryBean.getObject(); + String databaseId = sqlSessionFactory.getConfiguration().getDatabaseId(); String nowVersion = systemConfigService.getConfigValue(SystemConfigEnum.DOC_SYSTEM_VERSION); if (Objects.equals(nowVersion, ZyplayerDocVersion.version)) { logger.info("当前数据库DDL已是最新版本：" + nowVersion); @@ -92,8 +89,8 @@ public class UpgradeSystemDdlTask { public void initDatabase(String databaseId) { String sql = loadDDLFile("sql/full/full.sql"); if (!"mysql".equals(databaseId)) { - sql = loadDDLFile("sql/full/"+databaseId+"_full.sql"); - } + sql = loadDDLFile("sql/full/" + databaseId + "_full.sql"); + } if (StringUtils.isBlank(sql)) { logger.error("初始化数据库DDL失败，未找到当前版本的DDL脚本"); return; @@ -145,9 +142,9 @@ public class UpgradeSystemDdlTask { logger.info("升级数据库DDL开始：" + version); String sql = loadDDLFile("sql/upgrade/" + version + ".sql"); if (!"mysql".equals(databaseId)) { - sql = loadDDLFile("sql/upgrade/"+databaseId+"/" + version + ".sql"); - } - + sql = loadDDLFile("sql/upgrade/" + databaseId + "/" + version + ".sql"); + } + if (StringUtils.isBlank(sql)) { logger.info("未找到当前版本的DDL脚本：" + version); return; @@ -184,8 +181,8 @@ public class UpgradeSystemDdlTask { } String sql = loadDDLFile("sql/upgrade/" + upgradeInfo.getVersion() + ".sql"); if (!"mysql".equals(databaseId)) { - sql = loadDDLFile("sql/upgrade/"+databaseId+"/" + upgradeInfo.getVersion() + ".sql"); - } + sql = loadDDLFile("sql/upgrade/" + databaseId + "/" + upgradeInfo.getVersion() + ".sql"); + } if (StringUtils.isBlank(sql)) { return; } diff --git a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework/upgrade/UpgradeUtil.java b/zyplayer-doc-manage/src/main/java/org/dromara/zyplayer/manage/framework/upgrade/UpgradeUtil.java similarity index 69% rename from zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework/upgrade/UpgradeUtil.java rename to zyplayer-doc-manage/src/main/java/org/dromara/zyplayer/manage/framework/upgrade/UpgradeUtil.java index 11e6f2ad..029a354b 100644 --- a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework/upgrade/UpgradeUtil.java +++ b/zyplayer-doc-manage/src/main/java/org/dromara/zyplayer/manage/framework/upgrade/UpgradeUtil.java @@ -1,6 +1,6 @@ -package com.zyplayer.doc.manage.framework.upgrade; +package org.dromara.zyplayer.manage.framework.upgrade; -import com.zyplayer.doc.core.util.ZyplayerDocVersion; +import org.dromara.zyplayer.core.util.ZyplayerDocVersion; /** * 升级工具类 diff --git a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/AuthInfoController.java b/zyplayer-doc-manage/src/main/java/org/dromara/zyplayer/manage/web/AuthInfoController.java similarity index 76% rename from zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/AuthInfoController.java rename to zyplayer-doc-manage/src/main/java/org/dromara/zyplayer/manage/web/AuthInfoController.java index 53a60bab..accbd81e 100644 --- a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/AuthInfoController.java +++ b/zyplayer-doc-manage/src/main/java/org/dromara/zyplayer/manage/web/AuthInfoController.java @@ -1,13 +1,13 @@ -package com.zyplayer.doc.manage.web; +package org.dromara.zyplayer.manage.web; -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.AuthInfo; -import com.zyplayer.doc.data.repository.support.consts.DocAuthConst; -import com.zyplayer.doc.data.service.manage.AuthInfoService; +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.AuthInfo; +import org.dromara.zyplayer.data.repository.support.consts.DocAuthConst; +import org.dromara.zyplayer.data.service.manage.AuthInfoService; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/DocSystemController.java b/zyplayer-doc-manage/src/main/java/org/dromara/zyplayer/manage/web/DocSystemController.java similarity index 96% rename from zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/DocSystemController.java rename to zyplayer-doc-manage/src/main/java/org/dromara/zyplayer/manage/web/DocSystemController.java index 85ccdc96..f2d1e4c4 100644 --- a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/DocSystemController.java +++ b/zyplayer-doc-manage/src/main/java/org/dromara/zyplayer/manage/web/DocSystemController.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.manage.web; +package org.dromara.zyplayer.manage.web; import org.springframework.http.HttpStatus; import org.springframework.stereotype.Controller; diff --git a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/LoginController.java b/zyplayer-doc-manage/src/main/java/org/dromara/zyplayer/manage/web/LoginController.java similarity index 87% rename from zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/LoginController.java rename to zyplayer-doc-manage/src/main/java/org/dromara/zyplayer/manage/web/LoginController.java index cad292f2..cf13672f 100644 --- a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/LoginController.java +++ b/zyplayer-doc-manage/src/main/java/org/dromara/zyplayer/manage/web/LoginController.java @@ -1,15 +1,15 @@ -package com.zyplayer.doc.manage.web; +package org.dromara.zyplayer.manage.web; import cn.hutool.core.util.IdUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -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.config.security.UserAuthInfo; -import com.zyplayer.doc.data.repository.manage.entity.UserInfo; -import com.zyplayer.doc.data.service.manage.UserAuthService; -import com.zyplayer.doc.data.service.manage.UserInfoService; -import com.zyplayer.doc.manage.web.param.LdapPerson; +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.config.security.UserAuthInfo; +import org.dromara.zyplayer.data.repository.manage.entity.UserInfo; +import org.dromara.zyplayer.data.service.manage.UserAuthService; +import org.dromara.zyplayer.data.service.manage.UserInfoService; +import org.dromara.zyplayer.manage.web.param.LdapPerson; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/SystemInfoController.java b/zyplayer-doc-manage/src/main/java/org/dromara/zyplayer/manage/web/SystemInfoController.java similarity index 74% rename from zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/SystemInfoController.java rename to zyplayer-doc-manage/src/main/java/org/dromara/zyplayer/manage/web/SystemInfoController.java index accea999..e5c94691 100644 --- a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/SystemInfoController.java +++ b/zyplayer-doc-manage/src/main/java/org/dromara/zyplayer/manage/web/SystemInfoController.java @@ -1,9 +1,9 @@ -package com.zyplayer.doc.manage.web; +package org.dromara.zyplayer.manage.web; -import com.zyplayer.doc.core.json.DocResponseJson; -import com.zyplayer.doc.core.json.ResponseJson; -import com.zyplayer.doc.manage.framework.config.ZyplayerModuleKeeper; -import com.zyplayer.doc.manage.framework.upgrade.UpgradeUtil; +import org.dromara.zyplayer.core.json.DocResponseJson; +import org.dromara.zyplayer.core.json.ResponseJson; +import org.dromara.zyplayer.manage.framework.config.ZyplayerModuleKeeper; +import org.dromara.zyplayer.manage.framework.upgrade.UpgradeUtil; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/UserAuthController.java b/zyplayer-doc-manage/src/main/java/org/dromara/zyplayer/manage/web/UserAuthController.java similarity index 75% rename from zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/UserAuthController.java rename to zyplayer-doc-manage/src/main/java/org/dromara/zyplayer/manage/web/UserAuthController.java index 307793d1..9ef59360 100644 --- a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/UserAuthController.java +++ b/zyplayer-doc-manage/src/main/java/org/dromara/zyplayer/manage/web/UserAuthController.java @@ -1,16 +1,16 @@ -package com.zyplayer.doc.manage.web; +package org.dromara.zyplayer.manage.web; 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.repository.manage.entity.AuthInfo; -import com.zyplayer.doc.data.repository.manage.entity.UserAuth; -import com.zyplayer.doc.data.repository.support.consts.DocAuthConst; -import com.zyplayer.doc.data.service.manage.AuthInfoService; -import com.zyplayer.doc.data.service.manage.UserAuthService; +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.AuthInfo; +import org.dromara.zyplayer.data.repository.manage.entity.UserAuth; +import org.dromara.zyplayer.data.repository.support.consts.DocAuthConst; +import org.dromara.zyplayer.data.service.manage.AuthInfoService; +import org.dromara.zyplayer.data.service.manage.UserAuthService; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/UserGroupController.java b/zyplayer-doc-manage/src/main/java/org/dromara/zyplayer/manage/web/UserGroupController.java similarity index 80% rename from zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/UserGroupController.java rename to zyplayer-doc-manage/src/main/java/org/dromara/zyplayer/manage/web/UserGroupController.java index 44f4a0eb..c0ed3e1e 100644 --- a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/UserGroupController.java +++ b/zyplayer-doc-manage/src/main/java/org/dromara/zyplayer/manage/web/UserGroupController.java @@ -1,18 +1,18 @@ -package com.zyplayer.doc.manage.web; +package org.dromara.zyplayer.manage.web; 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.repository.manage.entity.UserGroup; -import com.zyplayer.doc.data.repository.manage.entity.UserGroupRelation; -import com.zyplayer.doc.data.repository.manage.entity.UserInfo; -import com.zyplayer.doc.data.repository.manage.mapper.UserGroupMapper; -import com.zyplayer.doc.data.repository.support.consts.DocAuthConst; -import com.zyplayer.doc.data.service.manage.UserGroupRelationService; -import com.zyplayer.doc.data.service.manage.UserGroupService; +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.UserGroup; +import org.dromara.zyplayer.data.repository.manage.entity.UserGroupRelation; +import org.dromara.zyplayer.data.repository.manage.entity.UserInfo; +import org.dromara.zyplayer.data.repository.manage.mapper.UserGroupMapper; +import org.dromara.zyplayer.data.repository.support.consts.DocAuthConst; +import org.dromara.zyplayer.data.service.manage.UserGroupRelationService; +import org.dromara.zyplayer.data.service.manage.UserGroupService; import org.apache.commons.lang3.StringUtils; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/UserInfoController.java b/zyplayer-doc-manage/src/main/java/org/dromara/zyplayer/manage/web/UserInfoController.java similarity index 89% rename from zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/UserInfoController.java rename to zyplayer-doc-manage/src/main/java/org/dromara/zyplayer/manage/web/UserInfoController.java index d23879ac..3f8bf98f 100644 --- a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/UserInfoController.java +++ b/zyplayer-doc-manage/src/main/java/org/dromara/zyplayer/manage/web/UserInfoController.java @@ -1,26 +1,26 @@ -package com.zyplayer.doc.manage.web; +package org.dromara.zyplayer.manage.web; import cn.hutool.core.util.RandomUtil; 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.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.support.consts.DocAuthConst; -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.manage.web.param.UserListParam; -import com.zyplayer.doc.manage.web.vo.AuthInfoVo; -import com.zyplayer.doc.manage.web.vo.UserAuthVo; -import com.zyplayer.doc.manage.web.vo.UserInfoAuthVo; +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.support.consts.DocAuthConst; +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.manage.web.param.UserListParam; +import org.dromara.zyplayer.manage.web.vo.AuthInfoVo; +import org.dromara.zyplayer.manage.web.vo.UserAuthVo; +import org.dromara.zyplayer.manage.web.vo.UserInfoAuthVo; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.util.DigestUtils; diff --git a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/UserMessageController.java b/zyplayer-doc-manage/src/main/java/org/dromara/zyplayer/manage/web/UserMessageController.java similarity index 84% rename from zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/UserMessageController.java rename to zyplayer-doc-manage/src/main/java/org/dromara/zyplayer/manage/web/UserMessageController.java index e242e242..2d1fa532 100644 --- a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/UserMessageController.java +++ b/zyplayer-doc-manage/src/main/java/org/dromara/zyplayer/manage/web/UserMessageController.java @@ -1,15 +1,15 @@ -package com.zyplayer.doc.manage.web; +package org.dromara.zyplayer.manage.web; 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.UserMessage; -import com.zyplayer.doc.data.service.manage.UserMessageService; +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.service.manage.UserMessageService; import org.apache.commons.lang3.StringUtils; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/param/LdapPerson.java b/zyplayer-doc-manage/src/main/java/org/dromara/zyplayer/manage/web/param/LdapPerson.java similarity index 89% rename from zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/param/LdapPerson.java rename to zyplayer-doc-manage/src/main/java/org/dromara/zyplayer/manage/web/param/LdapPerson.java index ffce8750..dcd6f17f 100644 --- a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/param/LdapPerson.java +++ b/zyplayer-doc-manage/src/main/java/org/dromara/zyplayer/manage/web/param/LdapPerson.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.manage.web.param; +package org.dromara.zyplayer.manage.web.param; import lombok.Data; diff --git a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/param/UserListParam.java b/zyplayer-doc-manage/src/main/java/org/dromara/zyplayer/manage/web/param/UserListParam.java similarity index 84% rename from zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/param/UserListParam.java rename to zyplayer-doc-manage/src/main/java/org/dromara/zyplayer/manage/web/param/UserListParam.java index 76fbb276..9f90d5b9 100644 --- a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/param/UserListParam.java +++ b/zyplayer-doc-manage/src/main/java/org/dromara/zyplayer/manage/web/param/UserListParam.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.manage.web.param; +package org.dromara.zyplayer.manage.web.param; import lombok.*; diff --git a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/vo/AuthInfoVo.java b/zyplayer-doc-manage/src/main/java/org/dromara/zyplayer/manage/web/vo/AuthInfoVo.java similarity index 90% rename from zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/vo/AuthInfoVo.java rename to zyplayer-doc-manage/src/main/java/org/dromara/zyplayer/manage/web/vo/AuthInfoVo.java index 2345ca2e..36b5ce1e 100644 --- a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/vo/AuthInfoVo.java +++ b/zyplayer-doc-manage/src/main/java/org/dromara/zyplayer/manage/web/vo/AuthInfoVo.java @@ -1,8 +1,8 @@ -package com.zyplayer.doc.manage.web.vo; +package org.dromara.zyplayer.manage.web.vo; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import com.zyplayer.doc.data.repository.manage.entity.AuthInfo; +import org.dromara.zyplayer.data.repository.manage.entity.AuthInfo; import lombok.*; import java.io.Serializable; diff --git a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/vo/UserAuthVo.java b/zyplayer-doc-manage/src/main/java/org/dromara/zyplayer/manage/web/vo/UserAuthVo.java similarity index 79% rename from zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/vo/UserAuthVo.java rename to zyplayer-doc-manage/src/main/java/org/dromara/zyplayer/manage/web/vo/UserAuthVo.java index 82ea88b0..3559174a 100644 --- a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/vo/UserAuthVo.java +++ b/zyplayer-doc-manage/src/main/java/org/dromara/zyplayer/manage/web/vo/UserAuthVo.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.manage.web.vo; +package org.dromara.zyplayer.manage.web.vo; import lombok.*; diff --git a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/vo/UserInfoAuthVo.java b/zyplayer-doc-manage/src/main/java/org/dromara/zyplayer/manage/web/vo/UserInfoAuthVo.java similarity index 64% rename from zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/vo/UserInfoAuthVo.java rename to zyplayer-doc-manage/src/main/java/org/dromara/zyplayer/manage/web/vo/UserInfoAuthVo.java index f2e94413..b43ea239 100644 --- a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/vo/UserInfoAuthVo.java +++ b/zyplayer-doc-manage/src/main/java/org/dromara/zyplayer/manage/web/vo/UserInfoAuthVo.java @@ -1,6 +1,6 @@ -package com.zyplayer.doc.manage.web.vo; +package org.dromara.zyplayer.manage.web.vo; -import com.zyplayer.doc.data.repository.manage.entity.UserInfo; +import org.dromara.zyplayer.data.repository.manage.entity.UserInfo; import lombok.*; /** diff --git a/zyplayer-doc-manage/src/main/resources/logback.xml b/zyplayer-doc-manage/src/main/resources/logback.xml index b44b2f28..bf2c5bf0 100644 --- a/zyplayer-doc-manage/src/main/resources/logback.xml +++ b/zyplayer-doc-manage/src/main/resources/logback.xml @@ -19,7 +19,7 @@ ${outPattern} - + diff --git a/zyplayer-doc-other/pom.xml b/zyplayer-doc-other/pom.xml index e0ca4ed2..549994e7 100644 --- a/zyplayer-doc-other/pom.xml +++ b/zyplayer-doc-other/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> zyplayer-doc - com.zyplayer + org.dromara 1.0.0 4.0.0 diff --git a/zyplayer-doc-wiki/pom.xml b/zyplayer-doc-wiki/pom.xml index bc0b12ac..fa6e3acf 100644 --- a/zyplayer-doc-wiki/pom.xml +++ b/zyplayer-doc-wiki/pom.xml @@ -21,7 +21,7 @@ - com.zyplayer + org.dromara zyplayer-doc 1.0.0 @@ -42,11 +42,11 @@ spring-boot-starter-web - com.zyplayer + org.dromara zyplayer-doc-data - com.zyplayer + org.dromara zyplayer-doc-core diff --git a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/batch/BatchDocImportManager.java b/zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/batch/BatchDocImportManager.java similarity index 85% rename from zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/batch/BatchDocImportManager.java rename to zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/batch/BatchDocImportManager.java index c80ca715..3cc8ef27 100644 --- a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/batch/BatchDocImportManager.java +++ b/zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/batch/BatchDocImportManager.java @@ -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; diff --git a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/batch/entry/DocEntry.java b/zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/batch/entry/DocEntry.java similarity index 93% rename from zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/batch/entry/DocEntry.java rename to zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/batch/entry/DocEntry.java index 77ea0ab8..55e0d45e 100644 --- a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/batch/entry/DocEntry.java +++ b/zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/batch/entry/DocEntry.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.wiki.batch.entry; +package org.dromara.zyplayer.wiki.batch.entry; import java.util.LinkedList; diff --git a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/batch/entry/MediaEntry.java b/zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/batch/entry/MediaEntry.java similarity index 94% rename from zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/batch/entry/MediaEntry.java rename to zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/batch/entry/MediaEntry.java index 4577d2de..143518e6 100644 --- a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/batch/entry/MediaEntry.java +++ b/zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/batch/entry/MediaEntry.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.wiki.batch.entry; +package org.dromara.zyplayer.wiki.batch.entry; /** * 媒体实体 diff --git a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/batch/strategy/ConditionalStrategySelector.java b/zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/batch/strategy/ConditionalStrategySelector.java similarity index 95% rename from zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/batch/strategy/ConditionalStrategySelector.java rename to zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/batch/strategy/ConditionalStrategySelector.java index 43432942..ed116e86 100644 --- a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/batch/strategy/ConditionalStrategySelector.java +++ b/zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/batch/strategy/ConditionalStrategySelector.java @@ -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; diff --git a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/batch/strategy/base/IConditionalStrategy.java b/zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/batch/strategy/base/IConditionalStrategy.java similarity index 81% rename from zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/batch/strategy/base/IConditionalStrategy.java rename to zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/batch/strategy/base/IConditionalStrategy.java index f79215a8..b3de1293 100644 --- a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/batch/strategy/base/IConditionalStrategy.java +++ b/zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/batch/strategy/base/IConditionalStrategy.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.wiki.batch.strategy.base; +package org.dromara.zyplayer.wiki.batch.strategy.base; /** diff --git a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/batch/strategy/comb/ICombDependencyStrategy.java b/zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/batch/strategy/comb/ICombDependencyStrategy.java similarity index 59% rename from zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/batch/strategy/comb/ICombDependencyStrategy.java rename to zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/batch/strategy/comb/ICombDependencyStrategy.java index e0115b96..5f80269a 100644 --- a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/batch/strategy/comb/ICombDependencyStrategy.java +++ b/zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/batch/strategy/comb/ICombDependencyStrategy.java @@ -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; diff --git a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/batch/strategy/comb/MDCombDependencyStrategy.java b/zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/batch/strategy/comb/MDCombDependencyStrategy.java similarity index 91% rename from zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/batch/strategy/comb/MDCombDependencyStrategy.java rename to zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/batch/strategy/comb/MDCombDependencyStrategy.java index 0cf044d0..3d5407b2 100644 --- a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/batch/strategy/comb/MDCombDependencyStrategy.java +++ b/zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/batch/strategy/comb/MDCombDependencyStrategy.java @@ -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; diff --git a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/batch/strategy/file/IFileStrategy.java b/zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/batch/strategy/file/IFileStrategy.java similarity index 62% rename from zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/batch/strategy/file/IFileStrategy.java rename to zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/batch/strategy/file/IFileStrategy.java index b1c7f1fe..8eef50e5 100644 --- a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/batch/strategy/file/IFileStrategy.java +++ b/zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/batch/strategy/file/IFileStrategy.java @@ -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; diff --git a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/batch/strategy/file/MDFileStrategy.java b/zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/batch/strategy/file/MDFileStrategy.java similarity index 81% rename from zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/batch/strategy/file/MDFileStrategy.java rename to zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/batch/strategy/file/MDFileStrategy.java index 20cb4909..ecf1b5df 100644 --- a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/batch/strategy/file/MDFileStrategy.java +++ b/zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/batch/strategy/file/MDFileStrategy.java @@ -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; diff --git a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/batch/strategy/file/ZIPFileStrategy.java b/zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/batch/strategy/file/ZIPFileStrategy.java similarity index 85% rename from zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/batch/strategy/file/ZIPFileStrategy.java rename to zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/batch/strategy/file/ZIPFileStrategy.java index d7dd97b1..232e9608 100644 --- a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/batch/strategy/file/ZIPFileStrategy.java +++ b/zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/batch/strategy/file/ZIPFileStrategy.java @@ -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; diff --git a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiCommonController.java b/zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/controller/WikiCommonController.java similarity index 81% rename from zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiCommonController.java rename to zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/controller/WikiCommonController.java index 39bc4d76..5efe83be 100644 --- a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiCommonController.java +++ b/zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/controller/WikiCommonController.java @@ -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; diff --git a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiOpenApiController.java b/zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/controller/WikiOpenApiController.java similarity index 86% rename from zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiOpenApiController.java rename to zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/controller/WikiOpenApiController.java index 5670092f..1b071c51 100644 --- a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiOpenApiController.java +++ b/zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/controller/WikiOpenApiController.java @@ -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; diff --git a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageAuthController.java b/zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/controller/WikiPageAuthController.java similarity index 82% rename from zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageAuthController.java rename to zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/controller/WikiPageAuthController.java index 655fa82a..0c2e0f3d 100644 --- a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageAuthController.java +++ b/zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/controller/WikiPageAuthController.java @@ -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; diff --git a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageCommentController.java b/zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/controller/WikiPageCommentController.java similarity index 83% rename from zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageCommentController.java rename to zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/controller/WikiPageCommentController.java index 60bf9f74..c19d33cd 100644 --- a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageCommentController.java +++ b/zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/controller/WikiPageCommentController.java @@ -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; diff --git a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageController.java b/zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/controller/WikiPageController.java similarity index 91% rename from zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageController.java rename to zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/controller/WikiPageController.java index 12e7011a..a780d294 100644 --- a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageController.java +++ b/zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/controller/WikiPageController.java @@ -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; diff --git a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageFileController.java b/zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/controller/WikiPageFileController.java similarity index 82% rename from zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageFileController.java rename to zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/controller/WikiPageFileController.java index e6c907c2..c93fbcf5 100644 --- a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageFileController.java +++ b/zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/controller/WikiPageFileController.java @@ -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; diff --git a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageHistoryController.java b/zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/controller/WikiPageHistoryController.java similarity index 80% rename from zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageHistoryController.java rename to zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/controller/WikiPageHistoryController.java index 6a2bebee..66845866 100644 --- a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageHistoryController.java +++ b/zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/controller/WikiPageHistoryController.java @@ -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; diff --git a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageTemplateController.java b/zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/controller/WikiPageTemplateController.java similarity index 82% rename from zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageTemplateController.java rename to zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/controller/WikiPageTemplateController.java index 844973cc..00e1abb9 100644 --- a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageTemplateController.java +++ b/zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/controller/WikiPageTemplateController.java @@ -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; diff --git a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageZanController.java b/zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/controller/WikiPageZanController.java similarity index 75% rename from zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageZanController.java rename to zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/controller/WikiPageZanController.java index 13eaf760..f28dce1f 100644 --- a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageZanController.java +++ b/zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/controller/WikiPageZanController.java @@ -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; diff --git a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiSpaceController.java b/zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/controller/WikiSpaceController.java similarity index 89% rename from zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiSpaceController.java rename to zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/controller/WikiSpaceController.java index 6c3afa1b..88413d14 100644 --- a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiSpaceController.java +++ b/zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/controller/WikiSpaceController.java @@ -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; diff --git a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/vo/UserPageAuthVo.java b/zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/controller/vo/UserPageAuthVo.java similarity index 88% rename from zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/vo/UserPageAuthVo.java rename to zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/controller/vo/UserPageAuthVo.java index 18318005..c17be7ed 100644 --- a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/vo/UserPageAuthVo.java +++ b/zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/controller/vo/UserPageAuthVo.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.wiki.controller.vo; +package org.dromara.zyplayer.wiki.controller.vo; import lombok.Data; diff --git a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/vo/UserSpaceAuthVo.java b/zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/controller/vo/UserSpaceAuthVo.java similarity index 88% rename from zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/vo/UserSpaceAuthVo.java rename to zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/controller/vo/UserSpaceAuthVo.java index c6dd4efb..c64896ee 100644 --- a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/vo/UserSpaceAuthVo.java +++ b/zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/controller/vo/UserSpaceAuthVo.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.wiki.controller.vo; +package org.dromara.zyplayer.wiki.controller.vo; import lombok.Data; diff --git a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/vo/WikiPageCommentVo.java b/zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/controller/vo/WikiPageCommentVo.java similarity index 66% rename from zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/vo/WikiPageCommentVo.java rename to zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/controller/vo/WikiPageCommentVo.java index 7b8ee508..0d600192 100644 --- a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/vo/WikiPageCommentVo.java +++ b/zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/controller/vo/WikiPageCommentVo.java @@ -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; diff --git a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/vo/WikiPageContentVo.java b/zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/controller/vo/WikiPageContentVo.java similarity index 64% rename from zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/vo/WikiPageContentVo.java rename to zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/controller/vo/WikiPageContentVo.java index eb210b79..882821db 100644 --- a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/vo/WikiPageContentVo.java +++ b/zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/controller/vo/WikiPageContentVo.java @@ -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; diff --git a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/vo/WikiPageVo.java b/zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/controller/vo/WikiPageVo.java similarity index 94% rename from zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/vo/WikiPageVo.java rename to zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/controller/vo/WikiPageVo.java index dd349e15..9df748e6 100644 --- a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/vo/WikiPageVo.java +++ b/zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/controller/vo/WikiPageVo.java @@ -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; diff --git a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/vo/WikiSpaceVo.java b/zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/controller/vo/WikiSpaceVo.java similarity index 91% rename from zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/vo/WikiSpaceVo.java rename to zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/controller/vo/WikiSpaceVo.java index 0f8d5145..44703b49 100644 --- a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/vo/WikiSpaceVo.java +++ b/zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/controller/vo/WikiSpaceVo.java @@ -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; diff --git a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/framework/common/MDToText.java b/zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/framework/common/MDToText.java similarity index 94% rename from zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/framework/common/MDToText.java rename to zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/framework/common/MDToText.java index 7e4ca92e..ec762cf9 100644 --- a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/framework/common/MDToText.java +++ b/zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/framework/common/MDToText.java @@ -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="]*?>[\\s\\S]*?<\\/script>"; - //定义style的正则表达式，去除style样式，防止css代码过多时只截取到css样式代码 - String styleRegex="]*?>[\\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); - } - - -} \ No newline at end of file +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="]*?>[\\s\\S]*?<\\/script>"; + //定义style的正则表达式，去除style样式，防止css代码过多时只截取到css样式代码 + String styleRegex="]*?>[\\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); + } + + +} diff --git a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/framework/config/CheckWikiFileSavePath.java b/zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/framework/config/CheckWikiFileSavePath.java similarity index 96% rename from zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/framework/config/CheckWikiFileSavePath.java rename to zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/framework/config/CheckWikiFileSavePath.java index e5bcc285..697522e2 100644 --- a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/framework/config/CheckWikiFileSavePath.java +++ b/zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/framework/config/CheckWikiFileSavePath.java @@ -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; diff --git a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/framework/config/EnableDocWiki.java b/zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/framework/config/EnableDocWiki.java similarity index 87% rename from zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/framework/config/EnableDocWiki.java rename to zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/framework/config/EnableDocWiki.java index c1620e74..eb108385 100644 --- a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/framework/config/EnableDocWiki.java +++ b/zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/framework/config/EnableDocWiki.java @@ -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 { } diff --git a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/framework/consts/Const.java b/zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/framework/consts/Const.java similarity index 99% rename from zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/framework/consts/Const.java rename to zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/framework/consts/Const.java index e1e61d77..c4884576 100644 --- a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/framework/consts/Const.java +++ b/zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/framework/consts/Const.java @@ -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; diff --git a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/framework/consts/SpaceType.java b/zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/framework/consts/SpaceType.java similarity index 95% rename from zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/framework/consts/SpaceType.java rename to zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/framework/consts/SpaceType.java index 5d9a3e47..accb3e86 100644 --- a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/framework/consts/SpaceType.java +++ b/zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/framework/consts/SpaceType.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.wiki.framework.consts; +package org.dromara.zyplayer.wiki.framework.consts; import java.util.Objects; diff --git a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/framework/consts/WikiAuthType.java b/zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/framework/consts/WikiAuthType.java similarity index 93% rename from zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/framework/consts/WikiAuthType.java rename to zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/framework/consts/WikiAuthType.java index a127cb3c..103dc214 100644 --- a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/framework/consts/WikiAuthType.java +++ b/zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/framework/consts/WikiAuthType.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.wiki.framework.consts; +package org.dromara.zyplayer.wiki.framework.consts; /** * wiki权限类型 diff --git a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/service/WikiPageFileServiceEx.java b/zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/service/WikiPageFileServiceEx.java similarity index 85% rename from zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/service/WikiPageFileServiceEx.java rename to zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/service/WikiPageFileServiceEx.java index 04d5a263..52af6d7a 100644 --- a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/service/WikiPageFileServiceEx.java +++ b/zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/service/WikiPageFileServiceEx.java @@ -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; diff --git a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/service/WikiPageUploadService.java b/zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/service/WikiPageUploadService.java similarity index 85% rename from zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/service/WikiPageUploadService.java rename to zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/service/WikiPageUploadService.java index 71213682..02e04146 100644 --- a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/service/WikiPageUploadService.java +++ b/zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/service/WikiPageUploadService.java @@ -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; diff --git a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/service/WikiPageWebService.java b/zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/service/WikiPageWebService.java similarity index 88% rename from zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/service/WikiPageWebService.java rename to zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/service/WikiPageWebService.java index e2ec3c65..f9deaed4 100644 --- a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/service/WikiPageWebService.java +++ b/zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/service/WikiPageWebService.java @@ -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; diff --git a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/service/common/WikiPageAuthService.java b/zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/service/common/WikiPageAuthService.java similarity index 92% rename from zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/service/common/WikiPageAuthService.java rename to zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/service/common/WikiPageAuthService.java index bc11dd34..9eafd726 100644 --- a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/service/common/WikiPageAuthService.java +++ b/zyplayer-doc-wiki/src/main/java/org/dromara/zyplayer/wiki/service/common/WikiPageAuthService.java @@ -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;