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

修改包名为 org.dromara

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

14
zyplayer-doc-manage/pom.xml
View File

@@ -9,7 +9,7 @@
<description>定位为所有文档的管理项目，API接口文档、数据库文档、、、、等</description>
<parent>
<groupId>com.zyplayer</groupId>
<groupId>org.dromara</groupId>
<artifactId>zyplayer-doc</artifactId>
<version>1.0.0</version>
</parent>
@@ -34,23 +34,23 @@
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<dependency>
<groupId>com.zyplayer</groupId>
<groupId>org.dromara</groupId>
<artifactId>zyplayer-doc-core</artifactId>
</dependency>
<dependency>
<groupId>com.zyplayer</groupId>
<groupId>org.dromara</groupId>
<artifactId>zyplayer-doc-db</artifactId>
</dependency>
<dependency>
<groupId>com.zyplayer</groupId>
<groupId>org.dromara</groupId>
<artifactId>zyplayer-doc-wiki</artifactId>
</dependency>
<dependency>
<groupId>com.zyplayer</groupId>
<groupId>org.dromara</groupId>
<artifactId>zyplayer-doc-data</artifactId>
</dependency>
<dependency>
<groupId>com.zyplayer</groupId>
<groupId>org.dromara</groupId>
<artifactId>zyplayer-doc-api</artifactId>
</dependency>
<dependency>
@@ -98,7 +98,7 @@
<artifactId>spring-boot-maven-plugin</artifactId>
<version>2.1.6.RELEASE</version>
<configuration>
<mainClass>com.zyplayer.doc.manage.Application</mainClass>
<mainClass>org.dromara.zyplayer.manage.Application</mainClass>
</configuration>
<executions>
<execution>

36
zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework/config/ZyplayerDocConfig.java
View File

@@ -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 {
}
}

11
zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/Application.java → zyplayer-doc-manage/src/main/java/org/dromara/zyplayer/manage/Application.java
View File

@@ -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);
}
}

6
zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework/config/WebMvcConfig.java → zyplayer-doc-manage/src/main/java/org/dromara/zyplayer/manage/framework/config/WebMvcConfig.java
View File

@@ -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;

34
zyplayer-doc-manage/src/main/java/org/dromara/zyplayer/manage/framework/config/ZyplayerDocConfig.java Normal file
View File

@@ -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 {
}
}

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

@@ -1,4 +1,4 @@
package com.zyplayer.doc.manage.framework.config;
package org.dromara.zyplayer.manage.framework.config;
import org.springframework.beans.BeansException;

4
zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework/console/ApplicationInfoConsolePrint.java → zyplayer-doc-manage/src/main/java/org/dromara/zyplayer/manage/framework/console/ApplicationInfoConsolePrint.java
View File

@@ -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;

2
zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework/console/IConsolePrint.java → zyplayer-doc-manage/src/main/java/org/dromara/zyplayer/manage/framework/console/IConsolePrint.java
View File

@@ -1,4 +1,4 @@
package com.zyplayer.doc.manage.framework.console;
package org.dromara.zyplayer.manage.framework.console;
import org.springframework.core.Ordered;

4
zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework/console/ModuleInfoConsolePrint.java → zyplayer-doc-manage/src/main/java/org/dromara/zyplayer/manage/framework/console/ModuleInfoConsolePrint.java
View File

@@ -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;

3
zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework/console/ZyplayerConsolePrint.java → zyplayer-doc-manage/src/main/java/org/dromara/zyplayer/manage/framework/console/ZyplayerConsolePrint.java
View File

@@ -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;

100
zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework/exception/GlobalHandlerExceptionResolver.java → zyplayer-doc-manage/src/main/java/org/dromara/zyplayer/manage/framework/exception/GlobalHandlerExceptionResolver.java
View File

@@ -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<Object> 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<Object> 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();
}
}

8
zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework/interceptor/ModuleMissingInterceptor.java → zyplayer-doc-manage/src/main/java/org/dromara/zyplayer/manage/framework/interceptor/ModuleMissingInterceptor.java
View File

@@ -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;

12
zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework/interceptor/UserLoginInterceptor.java → zyplayer-doc-manage/src/main/java/org/dromara/zyplayer/manage/framework/interceptor/UserLoginInterceptor.java
View File

@@ -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;

4
zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework/upgrade/SchedulerTask.java → zyplayer-doc-manage/src/main/java/org/dromara/zyplayer/manage/framework/upgrade/SchedulerTask.java
View File

@@ -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;

2
zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework/upgrade/UpgradeInfo.java → zyplayer-doc-manage/src/main/java/org/dromara/zyplayer/manage/framework/upgrade/UpgradeInfo.java
View File

@@ -1,4 +1,4 @@
package com.zyplayer.doc.manage.framework.upgrade;
package org.dromara.zyplayer.manage.framework.upgrade;
import lombok.*;

33
zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework/upgrade/UpgradeSystemDdlTask.java → zyplayer-doc-manage/src/main/java/org/dromara/zyplayer/manage/framework/upgrade/UpgradeSystemDdlTask.java
View File

@@ -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;
}

4
zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework/upgrade/UpgradeUtil.java → zyplayer-doc-manage/src/main/java/org/dromara/zyplayer/manage/framework/upgrade/UpgradeUtil.java
View File

@@ -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;
/**
* 升级工具类

18
zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/AuthInfoController.java → zyplayer-doc-manage/src/main/java/org/dromara/zyplayer/manage/web/AuthInfoController.java
View File

@@ -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;

2
zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/DocSystemController.java → zyplayer-doc-manage/src/main/java/org/dromara/zyplayer/manage/web/DocSystemController.java
View File

@@ -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;

18
zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/LoginController.java → zyplayer-doc-manage/src/main/java/org/dromara/zyplayer/manage/web/LoginController.java
View File

@@ -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;

10
zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/SystemInfoController.java → zyplayer-doc-manage/src/main/java/org/dromara/zyplayer/manage/web/SystemInfoController.java
View File

@@ -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;

22
zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/UserAuthController.java → zyplayer-doc-manage/src/main/java/org/dromara/zyplayer/manage/web/UserAuthController.java
View File

@@ -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;

26
zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/UserGroupController.java → zyplayer-doc-manage/src/main/java/org/dromara/zyplayer/manage/web/UserGroupController.java
View File

@@ -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;

36
zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/UserInfoController.java → zyplayer-doc-manage/src/main/java/org/dromara/zyplayer/manage/web/UserInfoController.java
View File

@@ -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;

16
zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/UserMessageController.java → zyplayer-doc-manage/src/main/java/org/dromara/zyplayer/manage/web/UserMessageController.java
View File

@@ -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;

2
zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/param/LdapPerson.java → zyplayer-doc-manage/src/main/java/org/dromara/zyplayer/manage/web/param/LdapPerson.java
View File

@@ -1,4 +1,4 @@
package com.zyplayer.doc.manage.web.param;
package org.dromara.zyplayer.manage.web.param;
import lombok.Data;

2
zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/param/UserListParam.java → zyplayer-doc-manage/src/main/java/org/dromara/zyplayer/manage/web/param/UserListParam.java
View File

@@ -1,4 +1,4 @@
package com.zyplayer.doc.manage.web.param;
package org.dromara.zyplayer.manage.web.param;
import lombok.*;

4
zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/vo/AuthInfoVo.java → zyplayer-doc-manage/src/main/java/org/dromara/zyplayer/manage/web/vo/AuthInfoVo.java
View File

@@ -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;

2
zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/vo/UserAuthVo.java → zyplayer-doc-manage/src/main/java/org/dromara/zyplayer/manage/web/vo/UserAuthVo.java
View File

@@ -1,4 +1,4 @@
package com.zyplayer.doc.manage.web.vo;
package org.dromara.zyplayer.manage.web.vo;
import lombok.*;

4
zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/vo/UserInfoAuthVo.java → zyplayer-doc-manage/src/main/java/org/dromara/zyplayer/manage/web/vo/UserInfoAuthVo.java
View File

@@ -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.*;
/**

2
zyplayer-doc-manage/src/main/resources/logback.xml
View File

@@ -19,7 +19,7 @@
<pattern>${outPattern}</pattern>
</encoder>
</appender>
<logger name="com.zyplayer.doc.manage.repository" level="warn" />
<logger name="org.dromara.zyplayer.manage.repository" level="warn" />
<root level="info">
<appender-ref ref="STDOUT" />
<appender-ref ref="INFO" />