diff --git a/zyplayer-doc-core/src/main/java/com/zyplayer/doc/core/annotation/AuthMan.java b/zyplayer-doc-core/src/main/java/com/zyplayer/doc/core/annotation/AuthMan.java index 31e4b028..2ac3917e 100644 --- a/zyplayer-doc-core/src/main/java/com/zyplayer/doc/core/annotation/AuthMan.java +++ b/zyplayer-doc-core/src/main/java/com/zyplayer/doc/core/annotation/AuthMan.java @@ -2,11 +2,17 @@ package com.zyplayer.doc.core.annotation; import java.lang.annotation.*; -@Target({ElementType.METHOD,ElementType.TYPE}) +/** + * 用户登录校验注解 + * + * @author 暮光：城中城 + * @since 2019年5月29日 + */ +@Target({ElementType.METHOD, ElementType.TYPE}) @Retention(RetentionPolicy.RUNTIME) @Documented public @interface AuthMan { String[] value() default {}; - String authUrl() default "common/authfailed"; + boolean all() default false; } diff --git a/zyplayer-doc-core/src/main/java/com/zyplayer/doc/core/bean/swagger/Contact.java b/zyplayer-doc-core/src/main/java/com/zyplayer/doc/core/bean/swagger/Contact.java deleted file mode 100644 index 5f08f88d..00000000 --- a/zyplayer-doc-core/src/main/java/com/zyplayer/doc/core/bean/swagger/Contact.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.zyplayer.doc.core.bean.swagger; - -public class Contact { - -} \ No newline at end of file diff --git a/zyplayer-doc-core/src/main/java/com/zyplayer/doc/core/bean/swagger/Info.java b/zyplayer-doc-core/src/main/java/com/zyplayer/doc/core/bean/swagger/Info.java deleted file mode 100644 index 3e775dfa..00000000 --- a/zyplayer-doc-core/src/main/java/com/zyplayer/doc/core/bean/swagger/Info.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.zyplayer.doc.core.bean.swagger; - -public class Info { - - private String description; - private String version; - private String title; - private Contact contact; - - public void setDescription(String description) { - this.description = description; - } - - public String getDescription() { - return description; - } - - public void setVersion(String version) { - this.version = version; - } - - public String getVersion() { - return version; - } - - public void setTitle(String title) { - this.title = title; - } - - public String getTitle() { - return title; - } - - public void setContact(Contact contact) { - this.contact = contact; - } - - public Contact getContact() { - return contact; - } - -} \ No newline at end of file diff --git a/zyplayer-doc-core/src/main/java/com/zyplayer/doc/core/bean/swagger/Paths.java b/zyplayer-doc-core/src/main/java/com/zyplayer/doc/core/bean/swagger/Paths.java deleted file mode 100644 index d7064a52..00000000 --- a/zyplayer-doc-core/src/main/java/com/zyplayer/doc/core/bean/swagger/Paths.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.zyplayer.doc.core.bean.swagger; - -public class Paths { - -} \ No newline at end of file diff --git a/zyplayer-doc-core/src/main/java/com/zyplayer/doc/core/bean/swagger/SwaggerApiDocs.java b/zyplayer-doc-core/src/main/java/com/zyplayer/doc/core/bean/swagger/SwaggerApiDocs.java deleted file mode 100644 index f7a93fb0..00000000 --- a/zyplayer-doc-core/src/main/java/com/zyplayer/doc/core/bean/swagger/SwaggerApiDocs.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.zyplayer.doc.core.bean.swagger; - -import java.util.List; - -public class SwaggerApiDocs { - - private String swagger; - private Info info; - private String host; - private String basePath; - private List tags; - private Paths paths; - - public void setSwagger(String swagger) { - this.swagger = swagger; - } - - public String getSwagger() { - return swagger; - } - - public void setInfo(Info info) { - this.info = info; - } - - public Info getInfo() { - return info; - } - - public void setHost(String host) { - this.host = host; - } - - public String getHost() { - return host; - } - - public void setBasePath(String basePath) { - this.basePath = basePath; - } - - public String getBasePath() { - return basePath; - } - - public void setTags(List tags) { - this.tags = tags; - } - - public List getTags() { - return tags; - } - - public void setPaths(Paths paths) { - this.paths = paths; - } - - public Paths getPaths() { - return paths; - } - -} \ No newline at end of file diff --git a/zyplayer-doc-core/src/main/java/com/zyplayer/doc/core/exception/ConfirmException.java b/zyplayer-doc-core/src/main/java/com/zyplayer/doc/core/exception/ConfirmException.java index 2fcf4705..2c59458b 100644 --- a/zyplayer-doc-core/src/main/java/com/zyplayer/doc/core/exception/ConfirmException.java +++ b/zyplayer-doc-core/src/main/java/com/zyplayer/doc/core/exception/ConfirmException.java @@ -2,29 +2,32 @@ 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); } - + } diff --git a/zyplayer-doc-core/src/main/java/com/zyplayer/doc/core/json/HttpConst.java b/zyplayer-doc-core/src/main/java/com/zyplayer/doc/core/json/HttpConst.java index 87810f52..cfdef5a3 100644 --- a/zyplayer-doc-core/src/main/java/com/zyplayer/doc/core/json/HttpConst.java +++ b/zyplayer-doc-core/src/main/java/com/zyplayer/doc/core/json/HttpConst.java @@ -1,67 +1,18 @@ package com.zyplayer.doc.core.json; +/** + * http静态资源定义 + * + * @author 暮光：城中城 + * @since 2019年05月29日 + */ public class HttpConst { - - /** 每页显示条数 **/ - public static final int PAGE_NUMBER = 50; - /** 默认当前页 **/ - public static final int CURRENT_PAGE = 1; - - /** 图片验证码 **/ - public static final String SESSION_VERIFY_CODE = "SESSION_VERIFY_CODE"; - /** 邮箱验证码 **/ - public static final String SESSION_EMAIL_CODE = "SESSION_EMAIL_CODE"; - /** 请求失败的原因 **/ - public static final String SESSION_FAIL_REASON = "SESSION_FAIL_REASON"; - /** operator */ - public static final String OPERATOR = "OPERATOR"; - - /** 分页-总条数 */ - public static final String PAGE_TOTAL = "PAGE_TOTAL"; - /** 分页-当前页数 */ - public static final String PAGE_NOWPAGE = "PAGE_NOWPAGE"; - /** 分页-总页数 */ - public static final String PAGE_PAGECOUNT = "PAGE_PAGECOUNT"; - /** 分页-每页多少条 */ - public static final String PAGE_SIZE = "PAGE_SIZE"; - - /** 会话连接 */ + /** + * 会话连接 + */ public static final String ACCESS_TOKEN = "accessToken"; - /** 存在于ThreadLocal的http request */ - public static final String HTTP_SERVLET_REQUEST = "HTTP_SERVLET_REQUEST"; - /** 存在于ThreadLocal的HTTP_SESSION */ - public static final String HTTP_SESSION = "HTTP_SESSION"; - - /** 存于operator中权限的缓存头 **/ - public static final String AUTH_CACHE_HEAD = "AUTH_CACHE_HEAD_"; - /** 存于operator中的用户信息 **/ - public static final String CACHE_OPERATOR_USER_INFO = "USER_INFO"; - /** 存于operator中的城市信息 **/ - public static final String CACHE_OPERATOR_CITY_ID = "CITY_ID"; - /** 存于operator中的token绑定的访问信息，使得换一台电脑不能使用此token **/ - public static final String CACHE_OPERATOR_ACCESS_TOKEN_VALIDATE = "ACCESS_TOKEN_VALIDATE"; - /** 存于operator中的token信息 **/ - public static final String CACHE_OPERATOR_ACCESS_TOKEN = "accessToken"; - /** 存于operator中的微信sessionKey信息 **/ - public static final String CACHE_OPERATOR_SESSION_KEY = "sessionKey"; - - // 新版本使用的错误码 - /** 成功 **/ - public static final int SUCCESS = 200; - /** 提示性状态 需要客户端配合展示 **/ - public static final int CONFIRM_CODE = 300; - /** accessToken非法或过期，需要重新登录 **/ + /** + * accessToken非法或过期，需要重新登录 + **/ public static final int TOKEN_TIMEOUT = 400; - /** 业务接口缺少参数，errMsg会返回错误信息 **/ - public static final int MISSING_PARAMETER = 401; - /** API 未授权 **/ - public static final int UNAUTHORIZED = 402; - /** 接口调用频率超限 **/ - public static final int CALL_FREQUENCY_GAUGE = 403; - /** 微信未扫码登录异常 **/ - public static final int WX_NOT_LOGIN = 404; - /** 请升级至新版使用此功能 **/ - public static final int NEED_UPGRADE = 405; - /** 服务器端未知错误 **/ - public static final int OTHER_FAIL = 500; } diff --git a/zyplayer-doc-core/src/main/java/com/zyplayer/doc/core/util/StringUtil.java b/zyplayer-doc-core/src/main/java/com/zyplayer/doc/core/util/StringUtil.java deleted file mode 100644 index 614def16..00000000 --- a/zyplayer-doc-core/src/main/java/com/zyplayer/doc/core/util/StringUtil.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.zyplayer.doc.core.util; - - -import java.io.PrintWriter; -import java.io.StringWriter; - -/** - * 字符串操作类 - */ -public final class StringUtil { - - /** - * 获取错误信息 - * - * @param e - * @return - * @author 暮光：城中城 - */ - public static String getException(Throwable e) { - StringWriter sw = null; - PrintWriter pw = null; - try { - sw = new StringWriter(); - pw = new PrintWriter(sw); - e.printStackTrace(pw); - pw.flush(); - sw.flush(); - return sw.toString(); - } finally { - if (sw != null) { - try { - sw.close(); - } catch (Exception e1) { - e1.printStackTrace(); - } - } - if (pw != null) { - try { - pw.close(); - } catch (Exception e1) { - e1.printStackTrace(); - } - } - } - } -} diff --git a/zyplayer-doc-core/src/main/java/com/zyplayer/doc/core/util/ThreadLocalUtil.java b/zyplayer-doc-core/src/main/java/com/zyplayer/doc/core/util/ThreadLocalUtil.java deleted file mode 100644 index baad269a..00000000 --- a/zyplayer-doc-core/src/main/java/com/zyplayer/doc/core/util/ThreadLocalUtil.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.zyplayer.doc.core.util; - -import javax.servlet.http.HttpServletRequest; - -public class ThreadLocalUtil { - private static ThreadLocal request = new ThreadLocal<>(); - - public static void setHttpServletRequest(HttpServletRequest request) { - ThreadLocalUtil.request.set(request); - } - - public static HttpServletRequest getHttpServletRequest() { - return ThreadLocalUtil.request.get(); - } - - public static void clean() { - ThreadLocalUtil.request.remove(); - } - -} diff --git a/zyplayer-doc-core/src/main/java/com/zyplayer/doc/core/util/ZyplayerDocVersion.java b/zyplayer-doc-core/src/main/java/com/zyplayer/doc/core/util/ZyplayerDocVersion.java index 0e745e62..26b104b5 100644 --- a/zyplayer-doc-core/src/main/java/com/zyplayer/doc/core/util/ZyplayerDocVersion.java +++ b/zyplayer-doc-core/src/main/java/com/zyplayer/doc/core/util/ZyplayerDocVersion.java @@ -2,6 +2,8 @@ package com.zyplayer.doc.core.util; /** * zyplayer-doc版本号 + * + * @author 暮光：城中城 * @since 2021-06-06 */ public class ZyplayerDocVersion { diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/config/MybatisPlusConfig.java b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/config/MybatisPlusConfig.java index 7d297626..70df4e9d 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/config/MybatisPlusConfig.java +++ b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/config/MybatisPlusConfig.java @@ -3,11 +3,9 @@ package com.zyplayer.doc.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.github.pagehelper.PageHelper; import com.github.pagehelper.PageInterceptor; import com.zyplayer.doc.data.repository.support.interceptor.SqlLogInterceptor; import com.zyplayer.doc.data.utils.DruidDataSourceUtil; -import org.apache.ibatis.plugin.Interceptor; import org.mybatis.spring.annotation.MapperScan; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; @@ -17,10 +15,12 @@ import org.springframework.transaction.annotation.EnableTransactionManagement; import javax.annotation.Resource; import javax.sql.DataSource; -import java.util.Properties; /** * mybatis plus数据库配置 + * + * @author 暮光：城中城 + * @since 2019-02-16 */ @Configuration public class MybatisPlusConfig { diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/config/security/DocUserDetails.java b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/config/security/DocUserDetails.java index eeacaa61..00b2478d 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/config/security/DocUserDetails.java +++ b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/config/security/DocUserDetails.java @@ -2,6 +2,12 @@ package com.zyplayer.doc.data.config.security; import java.util.Set; +/** + * 登录用户信息 + * + * @author 暮光：城中城 + * @since 2018-12-02 + */ public class DocUserDetails { private Long userId; private String username; diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/config/security/DocUserUtil.java b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/config/security/DocUserUtil.java index 51843a4c..cb5ca0c3 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/config/security/DocUserUtil.java +++ b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/config/security/DocUserUtil.java @@ -7,12 +7,13 @@ import java.util.Set; /** * 用户工具类 + * * @author 暮光：城中城 * @since 2019年05月25日 */ public class DocUserUtil { - private static ThreadLocal DOC_USER_DETAILS = new ThreadLocal<>(); - private static ThreadLocal ACCESS_TOKEN = new ThreadLocal<>(); + private static final ThreadLocal DOC_USER_DETAILS = new ThreadLocal<>(); + private static final ThreadLocal ACCESS_TOKEN = new ThreadLocal<>(); public static void setAccessToken(String accessToken) { DocUserUtil.ACCESS_TOKEN.set(accessToken); 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/com/zyplayer/doc/data/repository/manage/param/SearchByEsParam.java index 3e484a9d..be81ed64 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/param/SearchByEsParam.java +++ b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/param/SearchByEsParam.java @@ -2,6 +2,12 @@ package com.zyplayer.doc.data.repository.manage.param; import java.util.List; +/** + * 文档搜索参数 + * + * @author 暮光：城中城 + * @since 2019-07-10 + */ public class SearchByEsParam { private Long spaceId; private String keywords; 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/com/zyplayer/doc/data/repository/manage/param/TableRelationParam.java index fb95bfbb..44afaaae 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/param/TableRelationParam.java +++ b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/param/TableRelationParam.java @@ -2,6 +2,7 @@ package com.zyplayer.doc.data.repository.manage.param; /** * 表关系请求参数 + * * @author 暮光：城中城 * @since 2021-06-07 */ 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/com/zyplayer/doc/data/repository/manage/vo/SpaceNewsVo.java index eeec4fd6..93a0dced 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/vo/SpaceNewsVo.java +++ b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/vo/SpaceNewsVo.java @@ -2,6 +2,12 @@ package com.zyplayer.doc.data.repository.manage.vo; import java.util.Date; +/** + * 最新文档信息 + * + * @author 暮光：城中城 + * @since 2019-06-14 + */ public class SpaceNewsVo { private String space; private Long spaceId; 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/com/zyplayer/doc/data/repository/manage/vo/TableRelationVo.java index 4d4c1bfe..5b391d01 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/vo/TableRelationVo.java +++ b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/vo/TableRelationVo.java @@ -4,6 +4,7 @@ import java.util.List; /** * 表关系结构 + * * @author 暮光：城中城 * @since 2021-06-07 */ 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/com/zyplayer/doc/data/repository/support/consts/DocAuthConst.java index 5e018c14..53138a8b 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/support/consts/DocAuthConst.java +++ b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/support/consts/DocAuthConst.java @@ -1,5 +1,11 @@ package com.zyplayer.doc.data.repository.support.consts; +/** + * 授权信息静态类 + * + * @author 暮光：城中城 + * @since 2019-08-22 + */ public class DocAuthConst { public static final String DB = "DB_"; public static final String WIKI = "WIKI_"; diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/support/consts/UserMsgSysType.java b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/support/consts/UserMsgSysType.java index 9f28440d..ea10385b 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/support/consts/UserMsgSysType.java +++ b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/support/consts/UserMsgSysType.java @@ -1,5 +1,11 @@ package com.zyplayer.doc.data.repository.support.consts; +/** + * 系统类型枚举 + * + * @author 暮光：城中城 + * @since 2020-06-26 + */ public enum UserMsgSysType { // 系统类型 1=manage 2=wiki 3=db MANAGE(1), WIKI(2), DB(2), 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/com/zyplayer/doc/data/repository/support/consts/UserMsgType.java index ac68efc6..e8591fe6 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/support/consts/UserMsgType.java +++ b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/support/consts/UserMsgType.java @@ -1,5 +1,11 @@ package com.zyplayer.doc.data.repository.support.consts; +/** + * 用户消息类型 + * + * @author 暮光：城中城 + * @since 2020-06-26 + */ public enum UserMsgType { // 消息类型 1=普通文本消息 2=wiki文档创建 3=wiki文档删除 4=wiki文档编辑 5=wiki文档权限修改 // 6=wiki文档评论 7=wiki文档删除评论 8=wiki文档上传附件 9=wiki文档修改了父级 10=wiki文档点赞 11=wiki文档附件删除 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/com/zyplayer/doc/data/repository/support/consts/UserSettingConst.java index 8611867f..df9e877b 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/support/consts/UserSettingConst.java +++ b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/support/consts/UserSettingConst.java @@ -1,5 +1,11 @@ package com.zyplayer.doc.data.repository.support.consts; +/** + * 用户自定义配置的key + * + * @author 暮光：城中城 + * @since 2021-02-09 + */ public class UserSettingConst { public static final String WIKI_ONLY_SHOW_FAVORITE = "wiki_only_show_favorite"; } 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/com/zyplayer/doc/data/repository/support/generator/CodeGenerator.java index b65818ad..779fec0d 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/support/generator/CodeGenerator.java +++ b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/support/generator/CodeGenerator.java @@ -7,6 +7,12 @@ import com.baomidou.mybatisplus.generator.engine.FreemarkerTemplateEngine; import java.util.Collections; +/** + * 代码生成器 + * + * @author 暮光：城中城 + * @since 2019-02-26 + */ public class CodeGenerator { public static void main(String[] args) { 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/com/zyplayer/doc/data/repository/support/interceptor/SqlLogInterceptor.java index 226c8168..80aa7209 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/support/interceptor/SqlLogInterceptor.java +++ b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/support/interceptor/SqlLogInterceptor.java @@ -20,15 +20,21 @@ import java.util.List; import java.util.Locale; import java.util.Properties; +/** + * 日志拦截 + * + * @author 暮光：城中城 + * @since 2019-02-26 + */ @Intercepts({ @Signature(type = Executor.class, method = "update", args = {MappedStatement.class, Object.class}), @Signature(type = Executor.class, method = "query", args = {MappedStatement.class, Object.class, RowBounds.class, ResultHandler.class}), @Signature(type = Executor.class, method = "query", args = {MappedStatement.class, Object.class, RowBounds.class, ResultHandler.class, CacheKey.class, BoundSql.class}), }) public class SqlLogInterceptor implements Interceptor { - + private static final Logger LOGGER = LoggerFactory.getLogger(SqlLogInterceptor.class); - + @Override public Object intercept(Invocation invocation) throws Throwable { MappedStatement mappedStatement = (MappedStatement) invocation.getArgs()[0]; @@ -44,7 +50,7 @@ public class SqlLogInterceptor implements Interceptor { // 执行结果 return invocation.proceed(); } - + @Override public Object plugin(Object target) { if (target instanceof Executor) { @@ -53,11 +59,11 @@ public class SqlLogInterceptor implements Interceptor { return target; } } - + @Override public void setProperties(Properties properties) { } - + private String getParameterValue(Object obj) { String value = null; if (obj instanceof String) { @@ -75,7 +81,7 @@ public class SqlLogInterceptor implements Interceptor { } return value; } - + public String getSqlString(Configuration configuration, BoundSql boundSql) { Object parameterObject = boundSql.getParameterObject(); List parameterMappings = boundSql.getParameterMappings(); @@ -104,15 +110,16 @@ public class SqlLogInterceptor implements Interceptor { } return sqlSb.toString(); } - + /** * 替换？占位符 - * @author 暮光：城中城 - * @since 2018年10月27日 + * * @param sql * @param fromIndex * @param replaceStr * @return + * @author 暮光：城中城 + * @since 2018年10月27日 */ private int replacePlaceholder(StringBuilder sql, int fromIndex, String replaceStr) { int index = sql.indexOf("?", fromIndex); diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/utils/CachePrefix.java b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/utils/CachePrefix.java index 643f4a27..16930095 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/utils/CachePrefix.java +++ b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/utils/CachePrefix.java @@ -1,5 +1,11 @@ package com.zyplayer.doc.data.utils; +/** + * 缓存前缀 + * + * @author 暮光：城中城 + * @since 2019-08-27 + */ public class CachePrefix { public static final String WIKI_LOCK_PAGE = "WIKI_LOCK_PAGE_"; public static final String DB_EDITOR_DATA_CACHE = "DB_EDITOR_DATA_CACHE_"; diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/utils/CacheUtil.java b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/utils/CacheUtil.java index 7e1c2693..e009be18 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/utils/CacheUtil.java +++ b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/utils/CacheUtil.java @@ -53,6 +53,7 @@ public class CacheUtil { /** * 放入缓存，默认12小时，按最后一次访问的12小时 + * * @param key * @param value */ @@ -62,6 +63,7 @@ public class CacheUtil { /** * 放入缓存，有访问则继续有效 + * * @param key * @param value * @param seconds 缓存时长 秒 @@ -75,6 +77,7 @@ public class CacheUtil { /** * 删除缓存 + * * @param key */ public static void remove(String key) { @@ -86,6 +89,7 @@ public class CacheUtil { /** * 获取缓存 + * * @param key */ @SuppressWarnings("unchecked") @@ -102,7 +106,9 @@ public class CacheUtil { } private static class CacheData { - /**缓存时长 秒*/ + /** + * 缓存时长 秒 + */ private Long seconds; private Long lastVisitTime; private Object data; diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/utils/DruidDataSourceUtil.java b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/utils/DruidDataSourceUtil.java index fa593601..840f9897 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/utils/DruidDataSourceUtil.java +++ b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/utils/DruidDataSourceUtil.java @@ -7,6 +7,12 @@ import com.zyplayer.doc.core.exception.ConfirmException; import java.util.Objects; import java.util.concurrent.atomic.AtomicLong; +/** + * Druid连接池工具类 + * + * @author 暮光：城中城 + * @since 2020-04-08 + */ public class DruidDataSourceUtil { private static AtomicLong nameId = new AtomicLong(0); diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/utils/ThreadPoolUtil.java b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/utils/ThreadPoolUtil.java index 37a6dccd..88264aae 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/utils/ThreadPoolUtil.java +++ b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/utils/ThreadPoolUtil.java @@ -4,6 +4,12 @@ import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; +/** + * 线程池工具类 + * + * @author 暮光：城中城 + * @since 2019-10-06 + */ public class ThreadPoolUtil { private static final ThreadPoolExecutor threadPoolExecutor = new ThreadPoolExecutor(20, 100, 30, TimeUnit.SECONDS, new LinkedBlockingQueue<>()); diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/DatabaseDocController.java b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/DatabaseDocController.java index 62bb3fee..37090a97 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/DatabaseDocController.java +++ b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/DatabaseDocController.java @@ -82,6 +82,7 @@ public class DatabaseDocController { /** * 获取数据源基本信息 + * * @param sourceId 数据源ID * @return 基本信息 */ diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/DbDataViewController.java b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/DbDataViewController.java index b54cd332..67e9b6a8 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/DbDataViewController.java +++ b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/DbDataViewController.java @@ -7,7 +7,6 @@ import com.alibaba.fastjson.serializer.SerializerFeature; import com.alibaba.fastjson.util.TypeUtils; import com.zyplayer.doc.core.annotation.AuthMan; import com.zyplayer.doc.core.json.ResponseJson; -import com.zyplayer.doc.core.util.StringUtil; import com.zyplayer.doc.db.controller.download.FormatDownloadConst; import com.zyplayer.doc.db.controller.download.FormatDownloadService; import com.zyplayer.doc.db.controller.param.DataViewParam; @@ -23,6 +22,7 @@ import com.zyplayer.doc.db.service.database.DbBaseService; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.MapUtils; import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang.exception.ExceptionUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; @@ -170,7 +170,7 @@ public class DbDataViewController { return sqlExecutor.execute(executeParam); } catch (Exception e) { logger.error("执行出错", e); - return ExecuteResult.error(StringUtil.getException(e), executeSql); + return ExecuteResult.error(ExceptionUtils.getFullStackTrace(e), executeSql); } } } diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/DbDatasourceController.java b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/DbDatasourceController.java index dba83555..bdb963b7 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/DbDatasourceController.java +++ b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/DbDatasourceController.java @@ -9,7 +9,6 @@ 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.DbDatasource; -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.DbDatasourceService; import com.zyplayer.doc.db.framework.configuration.DatasourceUtil; @@ -37,12 +36,12 @@ import java.util.stream.Collectors; @AuthMan(DocAuthConst.DB_DATASOURCE_MANAGE) @RequestMapping("/zyplayer-doc-db/datasource") public class DbDatasourceController { - + @Resource DatabaseRegistrationBean databaseRegistrationBean; @Resource DbDatasourceService dbDatasourceService; - + @PostMapping(value = "/list") public ResponseJson list(Integer pageNum, Integer pageSize, String name, String groupName) { QueryWrapper wrapper = new QueryWrapper<>(); @@ -56,7 +55,7 @@ public class DbDatasourceController { } return DocDbResponseJson.ok(page); } - + @PostMapping(value = "/groups") public ResponseJson groups() { QueryWrapper wrapper = new QueryWrapper<>(); @@ -93,7 +92,7 @@ public class DbDatasourceController { } return DocDbResponseJson.ok(); } - + @PostMapping(value = "/update") public ResponseJson update(DbDatasource dbDatasource) { if (StringUtils.isBlank(dbDatasource.getName())) { diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/DbProcedureController.java b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/DbProcedureController.java index ea823c13..4daba8a0 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/DbProcedureController.java +++ b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/DbProcedureController.java @@ -195,6 +195,7 @@ public class DbProcedureController { /** * 创建日志对象 + * * @param sourceId * @param dbName * @param typeName diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/DbTableRelationController.java b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/DbTableRelationController.java index 9ccb63de..6cd45b76 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/DbTableRelationController.java +++ b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/DbTableRelationController.java @@ -66,7 +66,7 @@ public class DbTableRelationController { relationVoChildren.setTableName(param.getTableName()); relationVoChildren.setName(columnDto.getName()); relationVoChildren.setColumnName(columnDto.getName()); - relationVoChildren.setChildren(this.getRelation(param.getSourceId(), param.getDbName(), param.getTableName(), columnDto.getName(), drillPath,1)); + relationVoChildren.setChildren(this.getRelation(param.getSourceId(), param.getDbName(), param.getTableName(), columnDto.getName(), drillPath, 1)); childrenRelationList.add(relationVoChildren); } relationVo.setChildren(childrenRelationList); diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/DbTransferDataController.java b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/DbTransferDataController.java index 853e511b..d7656205 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/DbTransferDataController.java +++ b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/DbTransferDataController.java @@ -15,10 +15,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; -import java.sql.Connection; -import java.sql.DriverManager; -import java.sql.ResultSet; -import java.sql.Statement; import java.util.Date; import java.util.List; diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/download/FormatDownloadConst.java b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/download/FormatDownloadConst.java index 584f7fc7..17f15340 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/download/FormatDownloadConst.java +++ b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/download/FormatDownloadConst.java @@ -2,6 +2,8 @@ package com.zyplayer.doc.db.controller.download; /** * 下载类型枚举 + * @author 暮光：城中城 + * @since 2021-08-14 */ public class FormatDownloadConst { /** diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/download/FormatDownloadEnum.java b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/download/FormatDownloadEnum.java index 2847ec7a..e21a9306 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/download/FormatDownloadEnum.java +++ b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/download/FormatDownloadEnum.java @@ -2,6 +2,8 @@ package com.zyplayer.doc.db.controller.download; /** * 下载类型枚举 + * @author 暮光：城中城 + * @since 2021-08-14 */ public enum FormatDownloadEnum { INSERT(FormatDownloadConst.INSERT), diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/download/FormatDownloadService.java b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/download/FormatDownloadService.java index 72d89d4d..3534772c 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/download/FormatDownloadService.java +++ b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/download/FormatDownloadService.java @@ -4,6 +4,12 @@ import com.zyplayer.doc.db.controller.param.DataViewParam; import javax.servlet.http.HttpServletResponse; +/** + * 下载服务 + * + * @author 暮光：城中城 + * @since 2021-08-14 + */ public interface FormatDownloadService { public void download(HttpServletResponse response, DataViewParam param, String[] tableNameArr) throws Exception; diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/param/DataViewParam.java b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/param/DataViewParam.java index 9dae7c6c..88e3d055 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/param/DataViewParam.java +++ b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/param/DataViewParam.java @@ -1,5 +1,11 @@ package com.zyplayer.doc.db.controller.param; +/** + * 数据预览查询参数 + * + * @author 暮光：城中城 + * @since 2021-05-20 + */ public class DataViewParam { // 基本信息 private String executeId; diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/param/ProcedureListParam.java b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/param/ProcedureListParam.java index 88a58d29..d3d4b3ed 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/param/ProcedureListParam.java +++ b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/param/ProcedureListParam.java @@ -1,5 +1,11 @@ package com.zyplayer.doc.db.controller.param; +/** + * 存储过程列表查询参数 + * + * @author 暮光：城中城 + * @since 2021-04-25 + */ public class ProcedureListParam { private Long sourceId; private String dbName; diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/vo/DatabaseExportVo.java b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/vo/DatabaseExportVo.java index 889bde90..c3263a2c 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/vo/DatabaseExportVo.java +++ b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/vo/DatabaseExportVo.java @@ -1,15 +1,21 @@ package com.zyplayer.doc.db.controller.vo; -import java.util.List; -import java.util.Map; - import com.zyplayer.doc.db.controller.vo.TableColumnVo.TableInfoVo; import com.zyplayer.doc.db.framework.db.dto.TableColumnDescDto; +import java.util.List; +import java.util.Map; + +/** + * 数据库表导出 + * + * @author 暮光：城中城 + * @since 2018-11-27 + */ public class DatabaseExportVo { - + private Map> columnList; - + private List tableList; public DatabaseExportVo(Map> columnList, List tableList) { @@ -20,17 +26,17 @@ public class DatabaseExportVo { public Map> getColumnList() { return columnList; } - + public void setColumnList(Map> columnList) { this.columnList = columnList; } - + public List getTableList() { return tableList; } - + public void setTableList(List tableList) { this.tableList = 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/com/zyplayer/doc/db/controller/vo/TableColumnVo.java index 940418d7..b980a2ec 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/vo/TableColumnVo.java +++ b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/vo/TableColumnVo.java @@ -1,17 +1,23 @@ package com.zyplayer.doc.db.controller.vo; -import java.util.List; - import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.ColumnWidth; import com.zyplayer.doc.db.framework.db.dto.TableColumnDescDto; +import java.util.List; + +/** + * 表字段信息 + * + * @author 暮光：城中城 + * @since 2018-11-27 + */ public class TableColumnVo { - + private List columnList; - + private TableInfoVo tableInfo; - + public static class TableInfoVo { @ColumnWidth(20) @@ -21,38 +27,38 @@ public class TableColumnVo { @ColumnWidth(80) @ExcelProperty("表注释") private String description; - + public String getDescription() { return description; } - + public void setDescription(String description) { this.description = description; } - + public String getTableName() { return tableName; } - + public void setTableName(String tableName) { this.tableName = tableName; } } - + public List getColumnList() { return columnList; } - + public void setColumnList(List columnList) { this.columnList = columnList; } - + public TableInfoVo getTableInfo() { return tableInfo; } - + public void setTableInfo(TableInfoVo tableInfo) { this.tableInfo = tableInfo; } - + } diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/vo/TableDdlVo.java b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/vo/TableDdlVo.java index e6b435c8..a1d04b21 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/vo/TableDdlVo.java +++ b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/vo/TableDdlVo.java @@ -4,6 +4,12 @@ import com.zyplayer.doc.db.framework.db.enums.DatabaseProductEnum; import java.util.Objects; +/** + * 表ddl信息 + * + * @author 暮光：城中城 + * @since 2021-04-23 + */ public class TableDdlVo { private String current; private String mysql; diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/vo/TableStatusVo.java b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/vo/TableStatusVo.java index 7774c992..46765ac3 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/vo/TableStatusVo.java +++ b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/vo/TableStatusVo.java @@ -2,21 +2,27 @@ package com.zyplayer.doc.db.controller.vo; import java.util.Date; +/** + * 表基本信息 + * + * @author 暮光：城中城 + * @since 2019-09-04 + */ public class TableStatusVo { private String name; private String engine; - private Long version; + private Long version; private String rowFormat; - private Long rows; - private Long avgRowLength; - private Long dataLength; - private Long maxDataLength; - private Long indexLength; - private Long dataFree; - private Long autoIncrement; - private Date createTime; - private Date updateTime; - private Date checkTime; + private Long rows; + private Long avgRowLength; + private Long dataLength; + private Long maxDataLength; + private Long indexLength; + private Long dataFree; + private Long autoIncrement; + private Date createTime; + private Date updateTime; + private Date checkTime; private String collation; private String checksum; private String createOptions; diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/vo/UserDbAuthVo.java b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/vo/UserDbAuthVo.java index c6b7cc4d..c8dfdefa 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/vo/UserDbAuthVo.java +++ b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/vo/UserDbAuthVo.java @@ -1,5 +1,11 @@ package com.zyplayer.doc.db.controller.vo; +/** + * 用户数据库授权信息 + * + * @author 暮光：城中城 + * @since 2019-08-22 + */ public class UserDbAuthVo { private String userName; private Long userId; diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/configuration/ApplicationListenerBean.java b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/configuration/ApplicationListenerBean.java index 97d9ea0f..25fee1fd 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/configuration/ApplicationListenerBean.java +++ b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/configuration/ApplicationListenerBean.java @@ -4,6 +4,12 @@ import org.springframework.context.ApplicationListener; import org.springframework.context.event.ContextRefreshedEvent; import org.springframework.stereotype.Component; +/** + * 应用启动监听 + * + * @author 暮光：城中城 + * @since 2018-11-27 + */ @Component public class ApplicationListenerBean implements ApplicationListener { diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/configuration/DatasourceUtil.java b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/configuration/DatasourceUtil.java index b522d450..dd2069f2 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/configuration/DatasourceUtil.java +++ b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/configuration/DatasourceUtil.java @@ -16,6 +16,12 @@ import org.springframework.core.io.Resource; import java.util.HashMap; import java.util.Map; +/** + * 数据库连接工具类 + * + * @author 暮光：城中城 + * @since 2019-07-04 + */ public class DatasourceUtil { private static final SqlLogInterceptor sqlLogInterceptor = new SqlLogInterceptor(); // url解析 diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/configuration/EnableDocDb.java b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/configuration/EnableDocDb.java index 36ab3c95..e0ad186f 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/configuration/EnableDocDb.java +++ b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/configuration/EnableDocDb.java @@ -5,12 +5,18 @@ 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", + "com.zyplayer.doc.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/com/zyplayer/doc/db/framework/configuration/analysis/AnalysisApi.java index 9d6a0d96..02927fb3 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/configuration/analysis/AnalysisApi.java +++ b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/configuration/analysis/AnalysisApi.java @@ -3,6 +3,12 @@ package com.zyplayer.doc.db.framework.configuration.analysis; import com.zyplayer.doc.db.framework.db.bean.DatabaseFactoryBean; import org.springframework.core.io.Resource; +/** + * 数据库链接url解析api + * + * @author 暮光：城中城 + * @since 2021-05-13 + */ public interface AnalysisApi { Resource[] process(String dbUrl, DatabaseFactoryBean databaseFactoryBean) throws Exception; 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/com/zyplayer/doc/db/framework/configuration/analysis/HiveAnalysis.java index de325540..782707db 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/configuration/analysis/HiveAnalysis.java +++ b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/configuration/analysis/HiveAnalysis.java @@ -5,6 +5,12 @@ import com.zyplayer.doc.db.framework.db.enums.DatabaseProductEnum; import org.springframework.core.io.Resource; import org.springframework.core.io.support.PathMatchingResourcePatternResolver; +/** + * hive链接url解析 + * + * @author 暮光：城中城 + * @since 2021-05-13 + */ public class HiveAnalysis implements AnalysisApi { @Override 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/com/zyplayer/doc/db/framework/configuration/analysis/MysqlAnalysis.java index e24731c4..a187d344 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/configuration/analysis/MysqlAnalysis.java +++ b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/configuration/analysis/MysqlAnalysis.java @@ -5,6 +5,12 @@ import com.zyplayer.doc.db.framework.db.enums.DatabaseProductEnum; import org.springframework.core.io.Resource; import org.springframework.core.io.support.PathMatchingResourcePatternResolver; +/** + * mysql链接url解析 + * + * @author 暮光：城中城 + * @since 2021-05-13 + */ public class MysqlAnalysis implements AnalysisApi { @Override 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/com/zyplayer/doc/db/framework/configuration/analysis/OracleAnalysis.java index 90dfe14a..9fe8f21c 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/configuration/analysis/OracleAnalysis.java +++ b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/configuration/analysis/OracleAnalysis.java @@ -5,6 +5,12 @@ import com.zyplayer.doc.db.framework.db.enums.DatabaseProductEnum; import org.springframework.core.io.Resource; import org.springframework.core.io.support.PathMatchingResourcePatternResolver; +/** + * Oracle链接url解析 + * + * @author 暮光：城中城 + * @since 2021-05-13 + */ public class OracleAnalysis implements AnalysisApi { @Override 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/com/zyplayer/doc/db/framework/configuration/analysis/PostgresqlAnalysis.java index 98945491..ac5c0cd9 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/configuration/analysis/PostgresqlAnalysis.java +++ b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/configuration/analysis/PostgresqlAnalysis.java @@ -5,6 +5,12 @@ import com.zyplayer.doc.db.framework.db.enums.DatabaseProductEnum; import org.springframework.core.io.Resource; import org.springframework.core.io.support.PathMatchingResourcePatternResolver; +/** + * Postgresql链接url解析 + * + * @author 暮光：城中城 + * @since 2021-05-13 + */ public class PostgresqlAnalysis implements AnalysisApi { @Override 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/com/zyplayer/doc/db/framework/configuration/analysis/SqlserverAnalysis.java index ac7704d1..90fcaed7 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/configuration/analysis/SqlserverAnalysis.java +++ b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/configuration/analysis/SqlserverAnalysis.java @@ -5,6 +5,12 @@ import com.zyplayer.doc.db.framework.db.enums.DatabaseProductEnum; import org.springframework.core.io.Resource; import org.springframework.core.io.support.PathMatchingResourcePatternResolver; +/** + * Sqlserver链接url解析 + * + * @author 暮光：城中城 + * @since 2021-05-13 + */ public class SqlserverAnalysis implements AnalysisApi { @Override diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/consts/DbAuthType.java b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/consts/DbAuthType.java index 7abaa20d..3d962dd7 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/consts/DbAuthType.java +++ b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/consts/DbAuthType.java @@ -1,5 +1,11 @@ package com.zyplayer.doc.db.framework.consts; +/** + * 数据库授权前缀 + * + * @author 暮光：城中城 + * @since 2019-08-22 + */ public enum DbAuthType { NO_AUTH(0, "DB_NO_AUTH_"), VIEW(1, "DB_VIEW_"), 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/com/zyplayer/doc/db/framework/db/dto/ColumnInfoDto.java index 82714804..f632152e 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/dto/ColumnInfoDto.java +++ b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/dto/ColumnInfoDto.java @@ -1,5 +1,11 @@ package com.zyplayer.doc.db.framework.db.dto; +/** + * 字段信息 + * + * @author 暮光：城中城 + * @since 2018-11-27 + */ public class ColumnInfoDto { private String isNullable; private String columnType; 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/com/zyplayer/doc/db/framework/db/dto/DatabaseInfoDto.java index 20520185..131275c5 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/dto/DatabaseInfoDto.java +++ b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/dto/DatabaseInfoDto.java @@ -1,14 +1,20 @@ package com.zyplayer.doc.db.framework.db.dto; +/** + * 数据库信息 + * + * @author 暮光：城中城 + * @since 2018-11-27 + */ public class DatabaseInfoDto { private String dbName; - + public String getDbName() { return dbName; } - + public void setDbName(String dbName) { this.dbName = 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/com/zyplayer/doc/db/framework/db/dto/ProcedureDto.java index 233c4bef..eafb6e51 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/dto/ProcedureDto.java +++ b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/dto/ProcedureDto.java @@ -2,6 +2,9 @@ package com.zyplayer.doc.db.framework.db.dto; /** * 存储过程信息 + * + * @author 暮光：城中城 + * @since 2021-04-25 */ public class ProcedureDto { private String db; 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/com/zyplayer/doc/db/framework/db/dto/QueryTableColumnDescDto.java index c41930f8..4fc2a1ec 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/dto/QueryTableColumnDescDto.java +++ b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/dto/QueryTableColumnDescDto.java @@ -1,30 +1,36 @@ package com.zyplayer.doc.db.framework.db.dto; +/** + * 表字段注释信息 + * + * @author 暮光：城中城 + * @since 2018-11-27 + */ public class QueryTableColumnDescDto { private String tableName; private String columnName; private String description; - + public String getTableName() { return tableName; } - + public void setTableName(String tableName) { this.tableName = tableName; } - + public String getColumnName() { return columnName; } - + public void setColumnName(String columnName) { this.columnName = columnName; } - + public String getDescription() { return description; } - + public void setDescription(String description) { this.description = 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/com/zyplayer/doc/db/framework/db/dto/TableColumnDescDto.java index 5e3fade9..8f6ed7ba 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/dto/TableColumnDescDto.java +++ b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/dto/TableColumnDescDto.java @@ -3,6 +3,12 @@ package com.zyplayer.doc.db.framework.db.dto; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.ColumnWidth; +/** + * 表字段注释信息 + * + * @author 暮光：城中城 + * @since 2018-11-27 + */ public class TableColumnDescDto { @ColumnWidth(20) @ExcelProperty("表名") 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/com/zyplayer/doc/db/framework/db/dto/TableDescDto.java index c2973724..1b91c788 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/dto/TableDescDto.java +++ b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/dto/TableDescDto.java @@ -1,5 +1,11 @@ package com.zyplayer.doc.db.framework.db.dto; +/** + * 表注释信息 + * + * @author 暮光：城中城 + * @since 2018-11-27 + */ public class TableDescDto { private String tableName; private String description; 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/com/zyplayer/doc/db/framework/db/dto/TableInfoDto.java index b11ec217..b732b84e 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/dto/TableInfoDto.java +++ b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/dto/TableInfoDto.java @@ -1,5 +1,11 @@ package com.zyplayer.doc.db.framework.db.dto; +/** + * 表信息 + * + * @author 暮光：城中城 + * @since 2018-11-27 + */ public class TableInfoDto { private String dbName; private String tableName; 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/com/zyplayer/doc/db/framework/db/enums/DatabaseProductEnum.java index a9a63fe4..1b84d871 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/enums/DatabaseProductEnum.java +++ b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/enums/DatabaseProductEnum.java @@ -2,6 +2,9 @@ package com.zyplayer.doc.db.framework.db.enums; /** * 数据库类型枚举 + * + * @author 暮光：城中城 + * @since 2021-05-13 */ public enum DatabaseProductEnum { MYSQL("com.mysql.jdbc.Driver"), 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/com/zyplayer/doc/db/framework/db/interceptor/SqlLogInterceptor.java index c0f6d80a..16f12a07 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/interceptor/SqlLogInterceptor.java +++ b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/interceptor/SqlLogInterceptor.java @@ -1,5 +1,6 @@ package com.zyplayer.doc.db.framework.db.interceptor; +import org.apache.ibatis.cache.CacheKey; import org.apache.ibatis.executor.Executor; import org.apache.ibatis.mapping.BoundSql; import org.apache.ibatis.mapping.MappedStatement; @@ -19,9 +20,16 @@ import java.util.List; import java.util.Locale; import java.util.Properties; +/** + * 日志拦截 + * + * @author 暮光：城中城 + * @since 2019-02-26 + */ @Intercepts({ - @Signature(type = Executor.class, method = "update", args = { MappedStatement.class, Object.class }), - @Signature(type = Executor.class, method = "query", args = { MappedStatement.class, Object.class, RowBounds.class, ResultHandler.class }) + @Signature(type = Executor.class, method = "update", args = {MappedStatement.class, Object.class}), + @Signature(type = Executor.class, method = "query", args = {MappedStatement.class, Object.class, RowBounds.class, ResultHandler.class}), + @Signature(type = Executor.class, method = "query", args = {MappedStatement.class, Object.class, RowBounds.class, ResultHandler.class, CacheKey.class, BoundSql.class}), }) public class SqlLogInterceptor implements Interceptor { diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/interceptor/SqlLogUtil.java b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/interceptor/SqlLogUtil.java deleted file mode 100644 index 23518e4a..00000000 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/interceptor/SqlLogUtil.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.zyplayer.doc.db.framework.db.interceptor; - -import org.apache.ibatis.mapping.BoundSql; -import org.apache.ibatis.mapping.ParameterMapping; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.text.DateFormat; -import java.util.Date; -import java.util.List; -import java.util.Locale; -import java.util.Map; - -public class SqlLogUtil { - private static final Logger logger = LoggerFactory.getLogger(SqlLogUtil.class); - - private static String getParameterValue(Object obj) { - String value; - if (obj instanceof String) { - value = "'" + obj.toString() + "'"; - } else if (obj instanceof Date) { - DateFormat formatter = DateFormat.getDateTimeInstance(DateFormat.DEFAULT, DateFormat.DEFAULT, Locale.CHINA); - value = "'" + formatter.format(obj) + "'"; - } else { - value = (obj == null) ? "'null'" : obj.toString(); - } - return value; - } - - public static String getSqlString(Map paramMap, BoundSql boundSql) { - List parameterMappings = boundSql.getParameterMappings(); - StringBuilder sqlSb = new StringBuilder(boundSql.getSql().replaceAll("[\\s]+", " ")); - int fromIndex = 0; - if (parameterMappings.size() > 0) { - for (ParameterMapping parameterMapping : parameterMappings) { - String propertyName = parameterMapping.getProperty(); - Object obj = paramMap.get(propertyName); - fromIndex = replacePlaceholder(sqlSb, fromIndex, getParameterValue(obj)); - } - } - return sqlSb.toString(); - } - - /** - * 替换？占位符 - * - * @param sql - * @param fromIndex - * @param replaceStr - * @return - * @author 暮光：城中城 - * @since 2018年10月27日 - */ - private static int replacePlaceholder(StringBuilder sql, int fromIndex, String replaceStr) { - int index = sql.indexOf("?", fromIndex); - if (index >= 0) { - sql.replace(index, index + 1, replaceStr); - } - return index + replaceStr.length(); - } -} - 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/com/zyplayer/doc/db/framework/db/mapper/base/ExecuteType.java index a96b6dbb..98578aed 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/com/zyplayer/doc/db/framework/db/mapper/base/ExecuteType.java @@ -1,5 +1,11 @@ package com.zyplayer.doc.db.framework.db.mapper.base; +/** + * 执行类型 + * + * @author 暮光：城中城 + * @since 2019-08-22 + */ public enum ExecuteType { ALL, SELECT, } 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/com/zyplayer/doc/db/framework/db/mapper/base/SqlExecutor.java index 940b8653..1ac88d06 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/com/zyplayer/doc/db/framework/db/mapper/base/SqlExecutor.java @@ -2,7 +2,6 @@ package com.zyplayer.doc.db.framework.db.mapper.base; import com.alibaba.druid.pool.DruidPooledConnection; import com.baomidou.mybatisplus.core.MybatisConfiguration; -import com.zyplayer.doc.core.util.StringUtil; import com.zyplayer.doc.data.service.manage.DbHistoryService; import com.zyplayer.doc.db.framework.db.bean.DatabaseFactoryBean; import com.zyplayer.doc.db.framework.db.bean.DatabaseRegistrationBean; 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/com/zyplayer/doc/db/framework/db/parser/FillParamParser.java index c97ed607..73f48b26 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/parser/FillParamParser.java +++ b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/parser/FillParamParser.java @@ -2,13 +2,19 @@ package com.zyplayer.doc.db.framework.db.parser; import cn.hutool.core.date.DateTime; +/** + * 参数填充接口 + * + * @author 暮光：城中城 + * @since 2021-06-27 + */ public interface FillParamParser { /** * 执行时间处理 * - * @param dateTime 时间 - * @param paramOne 第一个参数 + * @param dateTime 时间 + * @param paramOne 第一个参数 * @param paramThree 第三个参数 * @return 时间格式化 */ 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/com/zyplayer/doc/db/framework/db/parser/GenericTokenParser.java index 4a81781b..99399e56 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/parser/GenericTokenParser.java +++ b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/parser/GenericTokenParser.java @@ -1,17 +1,17 @@ /** - * Copyright 2009-2017 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Copyright 2009-2017 the original author or authors. + *

+ * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + *

+ * http://www.apache.org/licenses/LICENSE-2.0 + *

+ * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.zyplayer.doc.db.framework.db.parser; @@ -19,6 +19,7 @@ import org.apache.ibatis.parsing.TokenHandler; /** * 参数预处理类 + * * @author Clinton Begin * @author 暮光：城中城 * @since 2019-10-10 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/com/zyplayer/doc/db/framework/db/transfer/TransferTaskStatus.java index ee4b7157..3ae8478e 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/transfer/TransferTaskStatus.java +++ b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/transfer/TransferTaskStatus.java @@ -1,5 +1,11 @@ package com.zyplayer.doc.db.framework.db.transfer; +/** + * 数据互导状态类 + * + * @author 暮光：城中城 + * @since 2019-10-06 + */ public enum TransferTaskStatus { // 最后执行状态 0=未执行 1=执行中 2=执行成功 3=执行失败 4=取消执行 NOT_START(0), EXECUTING(1), SUCCESS(2), ERROR(3), CANCEL(4); diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/utils/JSONUtil.java b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/utils/JSONUtil.java index f86a334f..56f50e57 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/utils/JSONUtil.java +++ b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/utils/JSONUtil.java @@ -6,6 +6,12 @@ import com.alibaba.fastjson.serializer.SimpleDateFormatSerializer; import java.sql.Timestamp; import java.util.Date; +/** + * json工具类 + * + * @author 暮光：城中城 + * @since 2021-05-20 + */ public class JSONUtil { public static SerializeConfig serializeConfig = new SerializeConfig(); diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/service/common/ExecuteAuthService.java b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/service/common/ExecuteAuthService.java index e6a95e30..99c87f39 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/service/common/ExecuteAuthService.java +++ b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/service/common/ExecuteAuthService.java @@ -7,6 +7,12 @@ import com.zyplayer.doc.db.framework.consts.DbAuthType; import com.zyplayer.doc.db.framework.db.mapper.base.ExecuteType; import org.springframework.stereotype.Service; +/** + * 执行权限判断类 + * + * @author 暮光：城中城 + * @since 2021-08-14 + */ @Service public class ExecuteAuthService { diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/service/database/DatabaseServiceFactory.java b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/service/database/DatabaseServiceFactory.java index 547f25c4..fc00c34d 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/service/database/DatabaseServiceFactory.java +++ b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/service/database/DatabaseServiceFactory.java @@ -14,6 +14,12 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +/** + * 数据库服务工厂类 + * + * @author 暮光：城中城 + * @since 2021-02-01 + */ @Service public class DatabaseServiceFactory { @@ -45,6 +51,7 @@ public class DatabaseServiceFactory { /** * 获取下载服务 + * * @param databaseProductEnum 数据库类型 * @return 下载服务 */ diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/service/database/HiveServiceImpl.java b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/service/database/HiveServiceImpl.java index 8a98256c..59dfbab2 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/service/database/HiveServiceImpl.java +++ b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/service/database/HiveServiceImpl.java @@ -14,6 +14,12 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; +/** + * hive数据查询服务实现类 + * + * @author 暮光：城中城 + * @since 2021-05-11 + */ @Service public class HiveServiceImpl extends DbBaseService { diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/service/database/MysqlServiceImpl.java b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/service/database/MysqlServiceImpl.java index 372ce5dd..71144af4 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/service/database/MysqlServiceImpl.java +++ b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/service/database/MysqlServiceImpl.java @@ -20,6 +20,12 @@ import java.util.Map; import java.util.Objects; import java.util.Optional; +/** + * MySQL数据查询服务实现类 + * + * @author 暮光：城中城 + * @since 2021-02-01 + */ @Service public class MysqlServiceImpl extends DbBaseService { diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/service/database/OracleServiceImpl.java b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/service/database/OracleServiceImpl.java index 1db7a096..457c06cd 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/service/database/OracleServiceImpl.java +++ b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/service/database/OracleServiceImpl.java @@ -3,6 +3,12 @@ package com.zyplayer.doc.db.service.database; import com.zyplayer.doc.db.framework.db.enums.DatabaseProductEnum; import org.springframework.stereotype.Service; +/** + * Oracle数据查询服务实现类 + * + * @author 暮光：城中城 + * @since 2021-02-01 + */ @Service public class OracleServiceImpl extends DbBaseService { diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/service/database/PostgresqlServiceImpl.java b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/service/database/PostgresqlServiceImpl.java index 1a2afea9..e0c9afab 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/service/database/PostgresqlServiceImpl.java +++ b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/service/database/PostgresqlServiceImpl.java @@ -3,6 +3,12 @@ package com.zyplayer.doc.db.service.database; import com.zyplayer.doc.db.framework.db.enums.DatabaseProductEnum; import org.springframework.stereotype.Service; +/** + * Postgresql数据查询服务实现类 + * + * @author 暮光：城中城 + * @since 2021-02-01 + */ @Service public class PostgresqlServiceImpl extends DbBaseService { diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/service/database/SqlserverServiceImpl.java b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/service/database/SqlserverServiceImpl.java index 8b2f3287..6af74dfb 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/service/database/SqlserverServiceImpl.java +++ b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/service/database/SqlserverServiceImpl.java @@ -14,6 +14,12 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; +/** + * Sqlserver数据查询服务实现类 + * + * @author 暮光：城中城 + * @since 2021-02-01 + */ @Service public class SqlserverServiceImpl extends DbBaseService { diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/service/download/BaseDownloadService.java b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/service/download/BaseDownloadService.java index fdbfa0a6..5cc37a1e 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/service/download/BaseDownloadService.java +++ b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/service/download/BaseDownloadService.java @@ -30,6 +30,9 @@ import java.util.regex.Pattern; /** * 基础的数据导出服务类，按照MySQL规范写的，不满足的可新增类来实现 + * + * @author 暮光：城中城 + * @since 2021-06-05 */ @Service public class BaseDownloadService implements DownloadService { diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/service/download/DownloadService.java b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/service/download/DownloadService.java index ad9b2fb4..309ba9a0 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/service/download/DownloadService.java +++ b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/service/download/DownloadService.java @@ -9,6 +9,12 @@ import org.springframework.stereotype.Service; import java.util.List; import java.util.Set; +/** + * 下载服务 + * + * @author 暮光：城中城 + * @since 2021-06-17 + */ @Service public interface DownloadService { diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/service/download/SqlserverDownloadService.java b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/service/download/SqlserverDownloadService.java index 7a855a1f..cf648b7a 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/service/download/SqlserverDownloadService.java +++ b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/service/download/SqlserverDownloadService.java @@ -21,6 +21,9 @@ import java.util.regex.Pattern; /** * SQLServer的数据导出服务类 + * + * @author 暮光：城中城 + * @since 2021-06-17 */ @Service public class SqlserverDownloadService implements DownloadService { diff --git a/zyplayer-doc-dubbo/src/main/java/com/zyplayer/doc/dubbo/controller/vo/DubboInfoVo.java b/zyplayer-doc-dubbo/src/main/java/com/zyplayer/doc/dubbo/controller/vo/DubboInfoVo.java index c760abe7..32a67023 100644 --- a/zyplayer-doc-dubbo/src/main/java/com/zyplayer/doc/dubbo/controller/vo/DubboInfoVo.java +++ b/zyplayer-doc-dubbo/src/main/java/com/zyplayer/doc/dubbo/controller/vo/DubboInfoVo.java @@ -7,6 +7,8 @@ import java.util.List; import java.util.Map; /** + * dubbo信息对象 + * * @author 暮光：城中城 * @since 2019年1月10日 **/ diff --git a/zyplayer-doc-dubbo/src/main/java/com/zyplayer/doc/dubbo/controller/vo/NacosServiceInfoVo.java b/zyplayer-doc-dubbo/src/main/java/com/zyplayer/doc/dubbo/controller/vo/NacosServiceInfoVo.java index 235802b9..3573f03d 100644 --- a/zyplayer-doc-dubbo/src/main/java/com/zyplayer/doc/dubbo/controller/vo/NacosServiceInfoVo.java +++ b/zyplayer-doc-dubbo/src/main/java/com/zyplayer/doc/dubbo/controller/vo/NacosServiceInfoVo.java @@ -2,6 +2,12 @@ package com.zyplayer.doc.dubbo.controller.vo; import java.util.List; +/** + * nacos服务信息对象 + * + * @author 暮光：城中城 + * @since 2019年1月10日 + **/ public class NacosServiceInfoVo { private int count; diff --git a/zyplayer-doc-dubbo/src/main/java/com/zyplayer/doc/dubbo/controller/vo/NacosServiceListVo.java b/zyplayer-doc-dubbo/src/main/java/com/zyplayer/doc/dubbo/controller/vo/NacosServiceListVo.java index 230b5e15..b377960a 100644 --- a/zyplayer-doc-dubbo/src/main/java/com/zyplayer/doc/dubbo/controller/vo/NacosServiceListVo.java +++ b/zyplayer-doc-dubbo/src/main/java/com/zyplayer/doc/dubbo/controller/vo/NacosServiceListVo.java @@ -1,5 +1,11 @@ package com.zyplayer.doc.dubbo.controller.vo; +/** + * nacos服务列表信息 + * + * @author 暮光：城中城 + * @since 2019年1月10日 + **/ public class NacosServiceListVo { private String name; private int clusterCount; @@ -37,4 +43,4 @@ public class NacosServiceListVo { public void setHealthyInstanceCount(int healthyInstanceCount) { this.healthyInstanceCount = healthyInstanceCount; } - } \ No newline at end of file + } diff --git a/zyplayer-doc-dubbo/src/main/java/com/zyplayer/doc/dubbo/framework/bean/DubboInfo.java b/zyplayer-doc-dubbo/src/main/java/com/zyplayer/doc/dubbo/framework/bean/DubboInfo.java index 40c0616d..a08d5594 100644 --- a/zyplayer-doc-dubbo/src/main/java/com/zyplayer/doc/dubbo/framework/bean/DubboInfo.java +++ b/zyplayer-doc-dubbo/src/main/java/com/zyplayer/doc/dubbo/framework/bean/DubboInfo.java @@ -5,6 +5,8 @@ import com.alibaba.fastjson.annotation.JSONField; import java.util.List; /** + * dubbo信息 + * * @author 暮光：城中城 * @since 2019年1月10日 **/ diff --git a/zyplayer-doc-dubbo/src/main/java/com/zyplayer/doc/dubbo/framework/bean/InterfaceType.java b/zyplayer-doc-dubbo/src/main/java/com/zyplayer/doc/dubbo/framework/bean/InterfaceType.java index c4cee117..f1fef49d 100644 --- a/zyplayer-doc-dubbo/src/main/java/com/zyplayer/doc/dubbo/framework/bean/InterfaceType.java +++ b/zyplayer-doc-dubbo/src/main/java/com/zyplayer/doc/dubbo/framework/bean/InterfaceType.java @@ -1,5 +1,11 @@ package com.zyplayer.doc.dubbo.framework.bean; +/** + * 接口类型 + * + * @author 暮光：城中城 + * @since 2019年1月10日 + **/ public enum InterfaceType { map, list, set, arr } diff --git a/zyplayer-doc-dubbo/src/main/java/com/zyplayer/doc/dubbo/framework/bean/NacosDubboInfo.java b/zyplayer-doc-dubbo/src/main/java/com/zyplayer/doc/dubbo/framework/bean/NacosDubboInfo.java index c0f98926..f9b69051 100644 --- a/zyplayer-doc-dubbo/src/main/java/com/zyplayer/doc/dubbo/framework/bean/NacosDubboInfo.java +++ b/zyplayer-doc-dubbo/src/main/java/com/zyplayer/doc/dubbo/framework/bean/NacosDubboInfo.java @@ -5,6 +5,8 @@ import com.alibaba.fastjson.annotation.JSONField; import java.util.List; /** + * nacos中dubbo的信息 + * * @author 暮光：城中城 * @since 2019年1月10日 **/ diff --git a/zyplayer-doc-dubbo/src/main/java/com/zyplayer/doc/dubbo/framework/bean/ReferenceConfigHolder.java b/zyplayer-doc-dubbo/src/main/java/com/zyplayer/doc/dubbo/framework/bean/ReferenceConfigHolder.java index 831a2670..e6057809 100644 --- a/zyplayer-doc-dubbo/src/main/java/com/zyplayer/doc/dubbo/framework/bean/ReferenceConfigHolder.java +++ b/zyplayer-doc-dubbo/src/main/java/com/zyplayer/doc/dubbo/framework/bean/ReferenceConfigHolder.java @@ -9,6 +9,8 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; /** + * 引用配置信息 + * * @author 暮光：城中城 * @since 2019年1月10日 **/ diff --git a/zyplayer-doc-dubbo/src/main/java/com/zyplayer/doc/dubbo/framework/config/EnableDocDubbo.java b/zyplayer-doc-dubbo/src/main/java/com/zyplayer/doc/dubbo/framework/config/EnableDocDubbo.java index 2d563b44..0d71b70c 100644 --- a/zyplayer-doc-dubbo/src/main/java/com/zyplayer/doc/dubbo/framework/config/EnableDocDubbo.java +++ b/zyplayer-doc-dubbo/src/main/java/com/zyplayer/doc/dubbo/framework/config/EnableDocDubbo.java @@ -5,6 +5,13 @@ import org.springframework.context.annotation.Configuration; import java.lang.annotation.*; + +/** + * 开启dubbo模块注解 + * + * @author 暮光：城中城 + * @since 2019年2月12日 + **/ @Target(ElementType.TYPE) @Retention(RetentionPolicy.RUNTIME) @Documented diff --git a/zyplayer-doc-dubbo/src/main/java/com/zyplayer/doc/dubbo/framework/constant/BaseType.java b/zyplayer-doc-dubbo/src/main/java/com/zyplayer/doc/dubbo/framework/constant/BaseType.java index d01a3322..7920629e 100644 --- a/zyplayer-doc-dubbo/src/main/java/com/zyplayer/doc/dubbo/framework/constant/BaseType.java +++ b/zyplayer-doc-dubbo/src/main/java/com/zyplayer/doc/dubbo/framework/constant/BaseType.java @@ -5,6 +5,12 @@ import org.apache.commons.lang.StringUtils; import java.util.HashSet; import java.util.Set; +/** + * 基本数据类型 + * + * @author 暮光：城中城 + * @since 2020年10月31日 + **/ public class BaseType { private static final Set baseType = new HashSet() {{ diff --git a/zyplayer-doc-dubbo/src/main/java/com/zyplayer/doc/dubbo/framework/constant/DubboDocConst.java b/zyplayer-doc-dubbo/src/main/java/com/zyplayer/doc/dubbo/framework/constant/DubboDocConst.java index caa81a52..0883b8b7 100644 --- a/zyplayer-doc-dubbo/src/main/java/com/zyplayer/doc/dubbo/framework/constant/DubboDocConst.java +++ b/zyplayer-doc-dubbo/src/main/java/com/zyplayer/doc/dubbo/framework/constant/DubboDocConst.java @@ -1,8 +1,10 @@ package com.zyplayer.doc.dubbo.framework.constant; /** + * dubbo静态类 + * * @author 暮光：城中城 - * @since 2020年11月08日 + * @since 2020年11月18日 */ public class DubboDocConst { /**上传的文档jar文件名*/ diff --git a/zyplayer-doc-dubbo/src/main/java/com/zyplayer/doc/dubbo/framework/service/ClassLoaderCallback.java b/zyplayer-doc-dubbo/src/main/java/com/zyplayer/doc/dubbo/framework/service/ClassLoaderCallback.java index c509229c..c21a121c 100644 --- a/zyplayer-doc-dubbo/src/main/java/com/zyplayer/doc/dubbo/framework/service/ClassLoaderCallback.java +++ b/zyplayer-doc-dubbo/src/main/java/com/zyplayer/doc/dubbo/framework/service/ClassLoaderCallback.java @@ -1,7 +1,7 @@ package com.zyplayer.doc.dubbo.framework.service; /** - * + * classloader回调接口类 * * @author 暮光：城中城 * @since 2018年8月19日 diff --git a/zyplayer-doc-dubbo/src/main/java/com/zyplayer/doc/dubbo/framework/service/MgDubboStorage.java b/zyplayer-doc-dubbo/src/main/java/com/zyplayer/doc/dubbo/framework/service/MgDubboStorage.java index 05b3ebb6..108d24bb 100644 --- a/zyplayer-doc-dubbo/src/main/java/com/zyplayer/doc/dubbo/framework/service/MgDubboStorage.java +++ b/zyplayer-doc-dubbo/src/main/java/com/zyplayer/doc/dubbo/framework/service/MgDubboStorage.java @@ -4,15 +4,16 @@ import java.io.Serializable; /** * 数据类型 + * * @author 暮光：城中城 * @since 2018-11-27 */ public class MgDubboStorage implements Serializable { - + private static final long serialVersionUID = 1L; - + private String key; - + private String value; public MgDubboStorage() { @@ -23,25 +24,25 @@ public class MgDubboStorage implements Serializable { this.key = key; this.value = value; } - + public String getKey() { return key; } - + public void setKey(String key) { this.key = key; } - + public String getValue() { return value; } - + public void setValue(String value) { this.value = value; } - + public static long getSerialversionuid() { return serialVersionUID; } - + } diff --git a/zyplayer-doc-dubbo/src/main/java/com/zyplayer/doc/dubbo/framework/service/MgDubboStorageService.java b/zyplayer-doc-dubbo/src/main/java/com/zyplayer/doc/dubbo/framework/service/MgDubboStorageService.java index 1e313aa1..50aa2fca 100644 --- a/zyplayer-doc-dubbo/src/main/java/com/zyplayer/doc/dubbo/framework/service/MgDubboStorageService.java +++ b/zyplayer-doc-dubbo/src/main/java/com/zyplayer/doc/dubbo/framework/service/MgDubboStorageService.java @@ -5,6 +5,7 @@ import java.util.List; /** * 实现此类才能使用服务器端的存贮功能 * dubbo的文档需要手动写的，比较重要，所以重起一个存储service，实现类尽量操作另外的库 + * * @author 暮光：城中城 * @since 2018年8月19日 */ @@ -12,37 +13,41 @@ public interface MgDubboStorageService { /** * 获取存储的值 - * @author 暮光：城中城 - * @since 2018年8月19日 + * * @param key 参数 * @return 值 + * @author 暮光：城中城 + * @since 2018年8月19日 */ String get(String key); /** * 模糊获取存储的值 - * @author 暮光：城中城 - * @since 2018年8月19日 - * @param key 参数 + * + * @param key 参数 * @param value 值 * @return 值 + * @author 暮光：城中城 + * @since 2018年8月19日 */ List like(String key, String value); /** * 存储数据 + * + * @param key 参数 + * @param value 值 * @author 暮光：城中城 * @since 2018年8月19日 - * @param key 参数 - * @param value 值 */ void put(String key, String value); /** * 删除数据 + * + * @param key 参数 * @author 暮光：城中城 * @since 2018年8月19日 - * @param key 参数 */ void remove(String key); } diff --git a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/Application.java b/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/Application.java index 9764fe38..c9b067d3 100644 --- a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/Application.java +++ b/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/Application.java @@ -4,7 +4,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.autoconfigure.ldap.LdapAutoConfiguration; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; import org.springframework.context.ConfigurableApplicationContext; @@ -17,6 +16,9 @@ import java.util.Optional; /** * 程序启动器 + * + * @author 暮光：城中城 + * @since 2018-11-27 */ @EnableScheduling @SpringBootApplication @@ -39,11 +41,13 @@ public class Application extends SpringBootServletInitializer { String hostAddress = InetAddress.getLocalHost().getHostAddress(); String serverPort = env.getProperty("server.port"); String urlCtx = hostAddress + ":" + serverPort + "/" + contextPath; + String localCtx = "local.zyplayer.com:" + serverPort + "/" + contextPath; logger.info("\n----------------------------------------------------------\n\t" + - "\t\t地址列表\n\t" + - "管理地址：http://{}\n" + + "\t\t地址列表\n" + + "\t管理地址：http://{}\n" + + "\t域名访问：http://{}\n" + "----------------------------------------------------------", - urlCtx + urlCtx, localCtx ); } } diff --git a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework/config/CustomizationBean.java b/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework/config/CustomizationBean.java deleted file mode 100644 index 68811c87..00000000 --- a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework/config/CustomizationBean.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.zyplayer.doc.manage.framework.config; - -import org.springframework.boot.web.server.ErrorPage; -import org.springframework.boot.web.server.WebServerFactoryCustomizer; -import org.springframework.boot.web.servlet.server.ConfigurableServletWebServerFactory; -import org.springframework.context.annotation.Configuration; -import org.springframework.http.HttpStatus; - -/** - * 自定义错误页面 - * @author 暮光：城中城 - * @since 2018年11月11日 - */ -@Configuration -public class CustomizationBean implements WebServerFactoryCustomizer { - - @Override - public void customize(ConfigurableServletWebServerFactory factory) { - factory.addErrorPages(new ErrorPage(HttpStatus.FORBIDDEN, "/statics/common/403.html")); - factory.addErrorPages(new ErrorPage(HttpStatus.NOT_FOUND, "/statics/common/404.html")); - factory.addErrorPages(new ErrorPage(HttpStatus.INTERNAL_SERVER_ERROR, "/statics/common/500.html")); - } - -} diff --git a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework/config/MapperConfig.java b/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework/config/MapperConfig.java index 4e0f60c4..7f329390 100644 --- a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework/config/MapperConfig.java +++ b/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework/config/MapperConfig.java @@ -1,8 +1,8 @@ package com.zyplayer.doc.manage.framework.config; -import com.github.dozermapper.core.Mapper; import com.github.dozermapper.core.DozerBeanMapperBuilder; import com.github.dozermapper.core.DozerConverter; +import com.github.dozermapper.core.Mapper; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -12,31 +12,36 @@ import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Date; +/** + * mapper配置类 + * + * @author 暮光：城中城 + * @since 2018年12月15日 + */ @Configuration public class MapperConfig { - + @Bean public Mapper dozerBeanMapper() { DozerBeanMapperBuilder builder = DozerBeanMapperBuilder.create() .withCustomConverter(new DateStringConvert(Date.class, String.class)) .withCustomConverter(new BigdecimalToStringConvert(BigDecimal.class, String.class)); return builder.build(); - // return DozerBeanMapperBuilder.buildDefault(); } - + private class DateStringConvert extends DozerConverter { private DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - + public DateStringConvert(Class prototypeA, Class prototypeB) { super(prototypeA, prototypeB); } - + @Override public String convertTo(Date source, String destination) { destination = dateFormat.format(source); return destination; } - + @Override public Date convertFrom(String source, Date destination) { try { @@ -47,18 +52,18 @@ public class MapperConfig { return destination; } } - + private class BigdecimalToStringConvert extends DozerConverter { - + public BigdecimalToStringConvert(Class prototypeA, Class prototypeB) { super(prototypeA, prototypeB); } - + @Override public String convertTo(BigDecimal source, String destination) { return source.toString(); } - + @Override public BigDecimal convertFrom(String source, BigDecimal destination) { return BigDecimal.valueOf(Double.parseDouble(source)); diff --git a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework/config/WebMvcConfig.java b/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework/config/WebMvcConfig.java index 135163ad..1c2dfd67 100644 --- a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework/config/WebMvcConfig.java +++ b/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework/config/WebMvcConfig.java @@ -15,12 +15,17 @@ import org.springframework.web.servlet.config.annotation.InterceptorRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; import javax.annotation.Resource; -import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.List; +/** + * WEB控制相关配置 + * + * @author 暮光：城中城 + * @since 2018年11月27日 + */ @Component @Configuration public class WebMvcConfig implements WebMvcConfigurer { @@ -57,7 +62,9 @@ public class WebMvcConfig implements WebMvcConfigurer { @Override public void addInterceptors(InterceptorRegistry registry) { - registry.addInterceptor(userLoginInterceptor).excludePathPatterns("/**/*.js", "/**/*.css", "/**/*.png", "/**/*.gif", "/**/*.jpg", "/**/*.jpeg", "/**/fonts/*"); + registry.addInterceptor(userLoginInterceptor) + .excludePathPatterns("/", "/doc-wiki", "/doc-db", "/doc-swagger-plus", "/doc-dubbo") + .excludePathPatterns("/**/*.js", "/**/*.css", "/**/*.png", "/**/*.gif", "/**/*.jpg", "/**/*.jpeg", "/**/fonts/*"); } } 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 index b63c32b7..222397aa 100644 --- 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 @@ -16,14 +16,18 @@ import org.springframework.context.annotation.Configuration; public class ZyplayerDocConfig { @EnableDocWiki - public class enableDocWiki{} + public class enableDocWiki { + } @EnableDocDubbo - public class enableDocDubbo{} + public class enableDocDubbo { + } @EnableDocDb - public class enableDocDb{} + public class enableDocDb { + } @EnableDocSwaggerPlus - public class enableDocSwaggerPlus{} + public class enableDocSwaggerPlus { + } } diff --git a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework/config/impl/MgDubboStorageServiceImpl.java b/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework/config/impl/MgDubboStorageServiceImpl.java index 6fc90bd1..054b5fcb 100644 --- a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework/config/impl/MgDubboStorageServiceImpl.java +++ b/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework/config/impl/MgDubboStorageServiceImpl.java @@ -2,10 +2,10 @@ package com.zyplayer.doc.manage.framework.config.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import com.zyplayer.doc.dubbo.framework.service.MgDubboStorage; -import com.zyplayer.doc.dubbo.framework.service.MgDubboStorageService; import com.zyplayer.doc.data.repository.manage.entity.ZyplayerStorage; import com.zyplayer.doc.data.service.manage.ZyplayerStorageService; +import com.zyplayer.doc.dubbo.framework.service.MgDubboStorage; +import com.zyplayer.doc.dubbo.framework.service.MgDubboStorageService; import org.apache.commons.lang.StringUtils; import org.springframework.stereotype.Service; @@ -16,6 +16,7 @@ import java.util.stream.Collectors; /** * dubbo相关的文档存储服务 + * * @author 暮光：城中城 * @since 2018年8月19日 */ @@ -23,7 +24,7 @@ import java.util.stream.Collectors; public class MgDubboStorageServiceImpl implements MgDubboStorageService { @Resource ZyplayerStorageService zyplayerStorageService; - + /** * 使用数据库来存储，例： storageMapper.select(key); */ @@ -37,7 +38,7 @@ public class MgDubboStorageServiceImpl implements MgDubboStorageService { } return zyplayerStorage.getDocValue(); } - + @Override public List like(String key, String value) { QueryWrapper wrapper = new QueryWrapper<>(); @@ -49,7 +50,7 @@ public class MgDubboStorageServiceImpl implements MgDubboStorageService { } return storageList.stream().map(val -> new MgDubboStorage(val.getDocKey(), val.getDocValue())).collect(Collectors.toList()); } - + /** * 使用数据库来存储，例： storageMapper.updateOrInsert(key, value); */ diff --git a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework/config/impl/MgStorageServiceImpl.java b/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework/config/impl/MgStorageServiceImpl.java deleted file mode 100644 index 56d4ea04..00000000 --- a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework/config/impl/MgStorageServiceImpl.java +++ /dev/null @@ -1,99 +0,0 @@ -//package com.zyplayer.doc.manage.framework.config.impl; -// -//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -//import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -//import com.zyplayer.doc.data.repository.manage.entity.ZyplayerStorage; -//import com.zyplayer.doc.data.service.manage.ZyplayerStorageService; -//import com.zyplayer.doc.swagger.framework.service.MgStorage; -//import com.zyplayer.doc.swagger.framework.service.MgStorageService; -//import org.apache.commons.lang.StringUtils; -//import org.springframework.beans.factory.annotation.Value; -//import org.springframework.stereotype.Service; -// -//import javax.annotation.Resource; -//import java.util.Arrays; -//import java.util.Collections; -//import java.util.List; -//import java.util.stream.Collectors; -// -///** -// * 申明为@Service之后网页上才能使用存储能力，同时需要在@EnableSwagger2的地方添加@EnableSwaggerMgUi注解， -// * 才能开启存储的接口
-// * 开放存储能力的好处：
-// * 所有网页的配置、调试值都可以存储到服务器的数据库中，便于团队所有人的调试，一人配置，所有人受益
-// * 如果不开启的话，数据是存放在浏览器的localStorage中，每个人、每个浏览器都得配置一次才能使用
-// * -// * @author 暮光：城中城 -// * @since 2018年8月19日 -// */ -//@Service -//public class MgStorageServiceImpl implements MgStorageService { -// -// @Value("${zyplayer.doc.swagger.proxy-request.white-domain}") -// private String proxyRequestWhiteDomain; -// @Resource -// ZyplayerStorageService zyplayerStorageService; -// -// /** -// * 使用数据库来存储，例： storageMapper.select(key); -// */ -// @Override -// public String get(String key) { -// QueryWrapper wrapper = new QueryWrapper<>(); -// wrapper.eq("doc_key", key); -// ZyplayerStorage zyplayerStorage = zyplayerStorageService.getOne(wrapper); -// if (zyplayerStorage == null) { -// return null; -// } -// return zyplayerStorage.getDocValue(); -// } -// -// @Override -// public List like(String key, String value) { -// QueryWrapper wrapper = new QueryWrapper<>(); -// wrapper.like(StringUtils.isNotBlank(key), "doc_key", key); -// wrapper.like(StringUtils.isNotBlank(value), "doc_value", value); -// List storageList = zyplayerStorageService.list(wrapper); -// if (storageList == null || storageList.isEmpty()) { -// return Collections.emptyList(); -// } -// return storageList.stream().map(val -> new MgStorage(val.getDocKey(), val.getDocValue())).collect(Collectors.toList()); -// } -// -// /** -// * 使用数据库来存储，例： storageMapper.updateOrInsert(key, value); -// */ -// @Override -// public void put(String key, String value) { -// ZyplayerStorage entity = new ZyplayerStorage(); -// entity.setDocValue(value); -// UpdateWrapper updateWrapper = new UpdateWrapper<>(); -// updateWrapper.eq("doc_key", key); -// boolean update = zyplayerStorageService.update(entity, updateWrapper); -// if (!update) { -// entity = new ZyplayerStorage(); -// entity.setDocValue(value); -// entity.setDocKey(key); -// zyplayerStorageService.save(entity); -// } -// } -// -// /** -// * 删除一个key -// */ -// @Override -// public void remove(String key) { -// UpdateWrapper queryWrapper = new UpdateWrapper<>(); -// queryWrapper.eq("doc_key", key); -// zyplayerStorageService.remove(queryWrapper); -// } -// -// @Override -// public List getProxyRequestWhiteDomain() { -// if (StringUtils.isBlank(proxyRequestWhiteDomain)) { -// return Collections.emptyList(); -// } -// return Arrays.asList(proxyRequestWhiteDomain.split(";")); -// } -// -//} diff --git a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework/exception/GlobalHandlerExceptionResolver.java b/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework/exception/GlobalHandlerExceptionResolver.java index eed8fb68..4f9ac5f1 100644 --- a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework/exception/GlobalHandlerExceptionResolver.java +++ b/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework/exception/GlobalHandlerExceptionResolver.java @@ -1,6 +1,5 @@ package com.zyplayer.doc.manage.framework.exception; -import com.alibaba.fastjson.JSON; import com.zyplayer.doc.core.exception.ConfirmException; import com.zyplayer.doc.core.json.DocResponseJson; import org.slf4j.Logger; @@ -17,6 +16,9 @@ import javax.servlet.http.HttpServletResponse; /** * 全局异常处理器 + * + * @author 暮光：城中城 + * @since 2018年12月8日 */ @Component public class GlobalHandlerExceptionResolver extends SimpleMappingExceptionResolver { @@ -41,12 +43,7 @@ public class GlobalHandlerExceptionResolver extends SimpleMappingExceptionResolv responseJson = DocResponseJson.warn("系统错误"); } } - try { - String jsonStr = JSON.toJSONString(responseJson); - response.getWriter().write(jsonStr); - } catch (Exception e) { - logger.warn("write error：" + e.getMessage()); - } + responseJson.send(response); return new ModelAndView(); } } diff --git a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework/filter/DocUserFilter.java b/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework/filter/DocUserFilter.java deleted file mode 100644 index 48dd0b25..00000000 --- a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework/filter/DocUserFilter.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.zyplayer.doc.manage.framework.filter; - -import org.springframework.context.annotation.Configuration; - -import javax.servlet.*; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; - -@Configuration -public class DocUserFilter implements Filter{ - - @Override - public void init(FilterConfig filterConfig) throws ServletException { - } - - @Override - public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException { - HttpServletRequest httpRequest = (HttpServletRequest) request; - Cookie[] cookies = httpRequest.getCookies(); - boolean haveCtx = false; - Object ctxObj = httpRequest.getServletContext().getAttribute("ctx"); - String ctxStr = String.valueOf(ctxObj); - if (cookies != null && cookies.length > 0) { - for (Cookie cookie : cookies) { - if ("ctx".equals(cookie.getName()) && ctxStr.equals(cookie.getValue())) { - haveCtx = true; - break; - } - } - } - if (!haveCtx) { - // 前后端分离的，前段拿不到项目名，直接写/是不对的，只有后端放到cookie里给前端 - HttpServletResponse httpResponse = (HttpServletResponse) response; - Cookie cookieAdd = new Cookie("ctx", ctxStr); - cookieAdd.setPath("/"); - httpResponse.addCookie(cookieAdd); - } - chain.doFilter(httpRequest, response); - } - - @Override - public void destroy() { - } - -} diff --git a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework/interceptor/UserLoginInterceptor.java b/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework/interceptor/UserLoginInterceptor.java index 8f64d902..831bd3a3 100644 --- a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework/interceptor/UserLoginInterceptor.java +++ b/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework/interceptor/UserLoginInterceptor.java @@ -1,14 +1,11 @@ package com.zyplayer.doc.manage.framework.interceptor; import cn.hutool.extra.servlet.ServletUtil; -import cn.hutool.http.HttpUtil; 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.core.util.ThreadLocalUtil; import com.zyplayer.doc.data.config.security.DocUserDetails; import com.zyplayer.doc.data.config.security.DocUserUtil; -import org.apache.catalina.util.RequestUtil; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -25,6 +22,9 @@ import java.util.Optional; /** * 用户登录拦截 + * + * @author 暮光：城中城 + * @since 2021年11月21日 */ @Component public class UserLoginInterceptor implements HandlerInterceptor { @@ -42,7 +42,6 @@ public class UserLoginInterceptor implements HandlerInterceptor { long totalTime = System.currentTimeMillis() - startTime; String clientIP = ServletUtil.getClientIP(request); logger.info("IP：{}，总耗时：{}ms，URI：{}", clientIP, totalTime, request.getRequestURI()); - ThreadLocalUtil.clean(); startTimeThreadLocal.remove(); // 清理用户信息 DocUserUtil.clean(); @@ -55,7 +54,6 @@ public class UserLoginInterceptor implements HandlerInterceptor { @Override public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) { startTimeThreadLocal.set(System.currentTimeMillis()); - ThreadLocalUtil.setHttpServletRequest(request); // 指定域名可跨域访问 if (StringUtils.isNotBlank(originDomainRegex)) { String origin = request.getHeader("Origin"); diff --git a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/task/SchedulerTask.java b/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/task/SchedulerTask.java index 80fef3c9..5768b3ce 100644 --- a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/task/SchedulerTask.java +++ b/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/task/SchedulerTask.java @@ -3,9 +3,9 @@ package com.zyplayer.doc.manage.task; import cn.hutool.http.HttpRequest; import com.alibaba.fastjson.JSON; import com.zyplayer.doc.core.util.ZyplayerDocVersion; -import com.zyplayer.doc.manage.utils.UpgradeUtil; -import com.zyplayer.doc.manage.utils.bean.UpgradeInfo; import org.apache.commons.lang.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; @@ -15,8 +15,15 @@ import java.io.StringReader; import java.util.Objects; import java.util.Properties; +/** + * 定时器，用于访问gitee获取最新版本和升级内容 + * + * @author 暮光：城中城 + * @since 2019年4月27日 + */ @Component public class SchedulerTask { + private static Logger logger = LoggerFactory.getLogger(SchedulerTask.class); @Value("${zyplayer.doc.manage.upgradePropertiesUrl:}") private String upgradePropertiesUrl; @@ -45,7 +52,7 @@ public class SchedulerTask { UpgradeUtil.upgradeInfo = JSON.parseObject(jsonString, UpgradeInfo.class); UpgradeUtil.upgradeInfo.setNowVersion(ZyplayerDocVersion.version); } catch (Exception e) { - e.printStackTrace(); + logger.info("获取升级内容失败"); } } } diff --git a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/utils/bean/UpgradeInfo.java b/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/task/UpgradeInfo.java similarity index 90% rename from zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/utils/bean/UpgradeInfo.java rename to zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/task/UpgradeInfo.java index 8fb37f49..e6129ef9 100644 --- a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/utils/bean/UpgradeInfo.java +++ b/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/task/UpgradeInfo.java @@ -1,7 +1,10 @@ -package com.zyplayer.doc.manage.utils.bean; +package com.zyplayer.doc.manage.task; /** * 升级信息对象 + * + * @author 暮光：城中城 + * @since 2019年4月27日 */ public class UpgradeInfo { private String nowVersion; diff --git a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/utils/UpgradeUtil.java b/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/task/UpgradeUtil.java similarity index 64% rename from zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/utils/UpgradeUtil.java rename to zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/task/UpgradeUtil.java index 7532d503..6aa4cd75 100644 --- a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/utils/UpgradeUtil.java +++ b/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/task/UpgradeUtil.java @@ -1,8 +1,13 @@ -package com.zyplayer.doc.manage.utils; +package com.zyplayer.doc.manage.task; import com.zyplayer.doc.core.util.ZyplayerDocVersion; -import com.zyplayer.doc.manage.utils.bean.UpgradeInfo; +/** + * 升级工具类 + * + * @author 暮光：城中城 + * @since 2019年4月27日 + */ public class UpgradeUtil { public static UpgradeInfo upgradeInfo = new UpgradeInfo(); diff --git a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/utils/LogHelper.java b/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/utils/LogHelper.java deleted file mode 100644 index 769724c9..00000000 --- a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/utils/LogHelper.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.zyplayer.doc.manage.utils; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - - -/** - * 日志工具类 - */ -public class LogHelper { - // 通用日志，包括sql - public static final Logger LOG_COMMON = LoggerFactory.getLogger("LOG_COMMON"); - // 错误的日志打印 - public static final Logger LOG_ERROR = LoggerFactory.getLogger("LOG_ERROR"); -} diff --git a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/manage/AuthInfoController.java b/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/AuthInfoController.java similarity index 91% rename from zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/manage/AuthInfoController.java rename to zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/AuthInfoController.java index d77fbc5d..53a60bab 100644 --- a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/manage/AuthInfoController.java +++ b/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/AuthInfoController.java @@ -1,35 +1,41 @@ -package com.zyplayer.doc.manage.web.manage; +package com.zyplayer.doc.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.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.AuthInfo; import com.zyplayer.doc.data.repository.support.consts.DocAuthConst; import com.zyplayer.doc.data.service.manage.AuthInfoService; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.annotation.Resource; import java.util.Date; import java.util.List; +/** + * 用户授权信息控制器 + * + * @author 暮光：城中城 + * @since 2018-12-08 + */ @RestController @RequestMapping("/auth/info") @AuthMan(DocAuthConst.AUTH_MANAGE) public class AuthInfoController { - - @Autowired + + @Resource AuthInfoService authInfoService; - + @PostMapping("/list") public ResponseJson list() { List authList = authInfoService.list(); return DocResponseJson.ok(authList); } - + @PostMapping("/delete") public ResponseJson delete(Long id) { AuthInfo authInfo = authInfoService.getById(id); @@ -39,7 +45,7 @@ public class AuthInfoController { authInfoService.removeById(id); return DocResponseJson.ok(); } - + @PostMapping("/update") public ResponseJson update(Long id, String authName, String authDesc) { AuthInfo authInfo = new AuthInfo(); diff --git a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/manage/DocSystemController.java b/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/DocSystemController.java similarity index 84% rename from zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/manage/DocSystemController.java rename to zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/DocSystemController.java index e505d6d2..eff4e2fa 100644 --- a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/manage/DocSystemController.java +++ b/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/DocSystemController.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.manage.web.manage; +package com.zyplayer.doc.manage.web; import com.zyplayer.doc.core.annotation.AuthMan; import org.springframework.http.HttpStatus; @@ -8,6 +8,9 @@ import org.springframework.web.servlet.ModelAndView; /** * 使用路劲的方式访问页面 + * + * @author 暮光：城中城 + * @since 2019-06-05 */ @Controller public class DocSystemController { @@ -49,12 +52,4 @@ public class DocSystemController { modelAndView.setStatus(HttpStatus.OK); return modelAndView; } - - @AuthMan - @GetMapping("/doc-es") - public ModelAndView es() { - ModelAndView modelAndView = new ModelAndView("/doc-es.html"); - modelAndView.setStatus(HttpStatus.OK); - return modelAndView; - } } diff --git a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/manage/LoginController.java b/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/LoginController.java similarity index 97% rename from zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/manage/LoginController.java rename to zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/LoginController.java index ea2c318c..8365524a 100644 --- a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/manage/LoginController.java +++ b/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/LoginController.java @@ -1,7 +1,6 @@ -package com.zyplayer.doc.manage.web.manage; +package com.zyplayer.doc.manage.web; import cn.hutool.core.util.IdUtil; -import cn.hutool.core.util.RandomUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.zyplayer.doc.core.json.DocResponseJson; import com.zyplayer.doc.data.config.security.DocUserDetails; @@ -9,7 +8,7 @@ import com.zyplayer.doc.data.config.security.DocUserUtil; 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.manage.param.LdapPerson; +import com.zyplayer.doc.manage.web.param.LdapPerson; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; @@ -33,6 +32,9 @@ import java.util.Set; /** * 用户登录控制器 + * + * @author 暮光：城中城 + * @since 2018-12-08 */ @RestController public class LoginController { diff --git a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/manage/SystemInfoController.java b/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/SystemInfoController.java similarity index 73% rename from zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/manage/SystemInfoController.java rename to zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/SystemInfoController.java index 5ea76135..c0f2bea0 100644 --- a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/manage/SystemInfoController.java +++ b/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/SystemInfoController.java @@ -1,19 +1,25 @@ -package com.zyplayer.doc.manage.web.manage; +package com.zyplayer.doc.manage.web; import com.zyplayer.doc.core.json.DocResponseJson; import com.zyplayer.doc.core.json.ResponseJson; -import com.zyplayer.doc.manage.utils.UpgradeUtil; +import com.zyplayer.doc.manage.task.UpgradeUtil; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +/** + * 系统信息控制器 + * + * @author 暮光：城中城 + * @since 2019-04-21 + */ @RestController @RequestMapping("/system/info") public class SystemInfoController { - + @PostMapping("/upgrade") public ResponseJson upgradeInfo() { return DocResponseJson.ok(UpgradeUtil.upgradeInfo); } - + } diff --git a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/manage/UserAuthController.java b/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/UserAuthController.java similarity index 92% rename from zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/manage/UserAuthController.java rename to zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/UserAuthController.java index 763f34ca..02a018b1 100644 --- a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/manage/UserAuthController.java +++ b/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/UserAuthController.java @@ -1,9 +1,9 @@ -package com.zyplayer.doc.manage.web.manage; +package com.zyplayer.doc.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.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.AuthInfo; @@ -16,20 +16,27 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.annotation.Resource; import java.util.Date; import java.util.List; import java.util.stream.Collectors; +/** + * 用户权限控制器 + * + * @author 暮光：城中城 + * @since 2018-12-08 + */ @RestController @RequestMapping("/user/auth") @AuthMan(DocAuthConst.AUTH_ASSIGN) public class UserAuthController { - - @Autowired + + @Resource AuthInfoService authInfoService; - @Autowired + @Resource UserAuthService userAuthService; - + @PostMapping("/list") public ResponseJson list(Long userId) { QueryWrapper userAuthWrapper = new QueryWrapper<>(); @@ -43,13 +50,13 @@ public class UserAuthController { List authList = authInfoService.list(authQueryWrapper); return DocResponseJson.ok(authList); } - + @PostMapping("/delete") public ResponseJson delete(Long id) { userAuthService.removeById(id); return DocResponseJson.ok(); } - + @PostMapping("/insert") public ResponseJson insert(Long id, Long userId, Long authId) { DocUserDetails currentUser = DocUserUtil.getCurrentUser(); @@ -66,5 +73,5 @@ public class UserAuthController { } return DocResponseJson.ok(); } - + } diff --git a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/manage/UserGroupController.java b/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/UserGroupController.java similarity index 97% rename from zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/manage/UserGroupController.java rename to zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/UserGroupController.java index 6ec9da59..a41daf99 100644 --- a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/manage/UserGroupController.java +++ b/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/UserGroupController.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.manage.web.manage; +package com.zyplayer.doc.manage.web; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.zyplayer.doc.core.annotation.AuthMan; @@ -22,10 +22,16 @@ import javax.annotation.Resource; import java.util.Date; import java.util.List; +/** + * 用户分组控制器 + * + * @author 暮光：城中城 + * @since 2021-02-09 + */ @RestController @RequestMapping("/user/group") public class UserGroupController { - + @Resource UserGroupService userGroupService; @Resource diff --git a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/manage/UserInfoController.java b/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/UserInfoController.java similarity index 96% rename from zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/manage/UserInfoController.java rename to zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/UserInfoController.java index 1656d725..01617df9 100644 --- a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/manage/UserInfoController.java +++ b/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/UserInfoController.java @@ -1,9 +1,10 @@ -package com.zyplayer.doc.manage.web.manage; +package com.zyplayer.doc.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.github.dozermapper.core.Mapper; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.zyplayer.doc.core.annotation.AuthMan; @@ -18,12 +19,11 @@ 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.manage.param.UserListParam; -import com.zyplayer.doc.manage.web.manage.vo.AuthInfoVo; -import com.zyplayer.doc.manage.web.manage.vo.UserAuthVo; -import com.zyplayer.doc.manage.web.manage.vo.UserInfoAuthVo; +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.apache.commons.lang.StringUtils; -import com.github.dozermapper.core.Mapper; import org.springframework.util.DigestUtils; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -34,10 +34,16 @@ import java.util.*; import java.util.function.Function; import java.util.stream.Collectors; +/** + * 用户信息控制器 + * + * @author 暮光：城中城 + * @since 2018-12-08 + */ @RestController @RequestMapping("/user/info") public class UserInfoController { - + @Resource UserInfoService userInfoService; @Resource diff --git a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/manage/UserMessageController.java b/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/UserMessageController.java similarity index 98% rename from zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/manage/UserMessageController.java rename to zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/UserMessageController.java index 27f6419c..e45ab4b6 100644 --- a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/manage/UserMessageController.java +++ b/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/UserMessageController.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.manage.web.manage; +package com.zyplayer.doc.manage.web; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/manage/vo/AuthInfoVo.java b/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/manage/vo/AuthInfoVo.java deleted file mode 100644 index c1de61e6..00000000 --- a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/manage/vo/AuthInfoVo.java +++ /dev/null @@ -1,118 +0,0 @@ -package com.zyplayer.doc.manage.web.manage.vo; - -import com.baomidou.mybatisplus.annotation.IdType; -import java.util.Date; -import com.baomidou.mybatisplus.annotation.TableId; -import java.io.Serializable; - -/** - *

- * - *

- * - * @author 暮光：城中城 - * @since 2018-12-05 - */ -public class AuthInfoVo implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 主键自增ID - */ - @TableId(value = "id", type = IdType.AUTO) - private Long id; - - /** - * 是否选中 - */ - private Integer checked; - - /** - * 权限名 - */ - private String authName; - - /** - * 权限说明 - */ - private String authDesc; - - /** - * 是否可编辑 0=否 1=是 - */ - private Integer canEdit; - - /** - * 创建人 - */ - private Long createUid; - - /** - * 创建时间 - */ - private Date creationTime; - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - public String getAuthName() { - return authName; - } - - public void setAuthName(String authName) { - this.authName = authName; - } - public String getAuthDesc() { - return authDesc; - } - - public void setAuthDesc(String authDesc) { - this.authDesc = authDesc; - } - public Integer getCanEdit() { - return canEdit; - } - - public void setCanEdit(Integer canEdit) { - this.canEdit = canEdit; - } - public Long getCreateUid() { - return createUid; - } - - public void setCreateUid(Long createUid) { - this.createUid = createUid; - } - public Date getCreationTime() { - return creationTime; - } - - public void setCreationTime(Date creationTime) { - this.creationTime = creationTime; - } - - @Override - public String toString() { - return "AuthInfo{" + - "id=" + id + - ", authName=" + authName + - ", authDesc=" + authDesc + - ", canEdit=" + canEdit + - ", createUid=" + createUid + - ", creationTime=" + creationTime + - "}"; - } - - public Integer getChecked() { - return checked; - } - - public void setChecked(Integer checked) { - this.checked = checked; - } -} diff --git a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/manage/param/LdapPerson.java b/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/param/LdapPerson.java similarity index 91% rename from zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/manage/param/LdapPerson.java rename to zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/param/LdapPerson.java index 10864d74..93737576 100644 --- a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/manage/param/LdapPerson.java +++ b/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/param/LdapPerson.java @@ -17,9 +17,14 @@ * */ -package com.zyplayer.doc.manage.web.manage.param; - +package com.zyplayer.doc.manage.web.param; +/** + * 域账号用户信息 + * + * @author 暮光：城中城 + * @since 2021年8月2日 + */ public class LdapPerson { /** diff --git a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/manage/param/UserListParam.java b/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/param/UserListParam.java similarity index 81% rename from zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/manage/param/UserListParam.java rename to zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/param/UserListParam.java index a920fcb3..7e8f3485 100644 --- a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/manage/param/UserListParam.java +++ b/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/param/UserListParam.java @@ -1,5 +1,11 @@ -package com.zyplayer.doc.manage.web.manage.param; +package com.zyplayer.doc.manage.web.param; +/** + * 域账号用户列表查询参数 + * + * @author 暮光：城中城 + * @since 2021年8月2日 + */ public class UserListParam { private Integer type; private String keyword; diff --git a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/swagger/ZyplayerStorageController.java b/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/swagger/ZyplayerStorageController.java deleted file mode 100644 index bd691e84..00000000 --- a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/swagger/ZyplayerStorageController.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.zyplayer.doc.manage.web.swagger; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import com.zyplayer.doc.data.repository.manage.mapper.ZyplayerStorageMapper; - -@RestController -@RequestMapping("/zyplayer/storage") -public class ZyplayerStorageController { - - @Autowired - ZyplayerStorageMapper zyplayerStorageMapper; - - @RequestMapping("/mapper") - public String mapper() { - Integer selectTop = zyplayerStorageMapper.selectTop(); - return "selectTop:" + selectTop; - } - -} diff --git a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/vo/AuthInfoVo.java b/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/vo/AuthInfoVo.java new file mode 100644 index 00000000..2c61ed8f --- /dev/null +++ b/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/vo/AuthInfoVo.java @@ -0,0 +1,122 @@ +package com.zyplayer.doc.manage.web.vo; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; + +import java.io.Serializable; +import java.util.Date; + +/** + * 用户授权信息 + * + * @author 暮光：城中城 + * @since 2018-12-15 + */ +public class AuthInfoVo implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键自增ID + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + /** + * 是否选中 + */ + private Integer checked; + + /** + * 权限名 + */ + private String authName; + + /** + * 权限说明 + */ + private String authDesc; + + /** + * 是否可编辑 0=否 1=是 + */ + private Integer canEdit; + + /** + * 创建人 + */ + private Long createUid; + + /** + * 创建时间 + */ + private Date creationTime; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getAuthName() { + return authName; + } + + public void setAuthName(String authName) { + this.authName = authName; + } + + public String getAuthDesc() { + return authDesc; + } + + public void setAuthDesc(String authDesc) { + this.authDesc = authDesc; + } + + public Integer getCanEdit() { + return canEdit; + } + + public void setCanEdit(Integer canEdit) { + this.canEdit = canEdit; + } + + public Long getCreateUid() { + return createUid; + } + + public void setCreateUid(Long createUid) { + this.createUid = createUid; + } + + public Date getCreationTime() { + return creationTime; + } + + public void setCreationTime(Date creationTime) { + this.creationTime = creationTime; + } + + @Override + public String toString() { + return "AuthInfo{" + + "id=" + id + + ", authName=" + authName + + ", authDesc=" + authDesc + + ", canEdit=" + canEdit + + ", createUid=" + createUid + + ", creationTime=" + creationTime + + "}"; + } + + public Integer getChecked() { + return checked; + } + + public void setChecked(Integer checked) { + this.checked = checked; + } +} diff --git a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/manage/vo/UserAuthVo.java b/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/vo/UserAuthVo.java similarity index 62% rename from zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/manage/vo/UserAuthVo.java rename to zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/vo/UserAuthVo.java index 4493ac1b..ac9669e1 100644 --- a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/manage/vo/UserAuthVo.java +++ b/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/vo/UserAuthVo.java @@ -1,5 +1,11 @@ -package com.zyplayer.doc.manage.web.manage.vo; +package com.zyplayer.doc.manage.web.vo; +/** + * 用户权限信息 + * + * @author 暮光：城中城 + * @since 2018-12-15 + */ public class UserAuthVo { private boolean userManage; diff --git a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/manage/vo/UserInfoAuthVo.java b/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/vo/UserInfoAuthVo.java similarity index 77% rename from zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/manage/vo/UserInfoAuthVo.java rename to zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/vo/UserInfoAuthVo.java index ab9a0b39..b9edaa37 100644 --- a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/manage/vo/UserInfoAuthVo.java +++ b/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/vo/UserInfoAuthVo.java @@ -1,7 +1,13 @@ -package com.zyplayer.doc.manage.web.manage.vo; +package com.zyplayer.doc.manage.web.vo; import com.zyplayer.doc.data.repository.manage.entity.UserInfo; +/** + * 用户授权信息 + * + * @author 暮光：城中城 + * @since 2018-12-05 + */ public class UserInfoAuthVo { private UserInfo userInfo; private UserAuthVo userAuth; diff --git a/zyplayer-doc-swagger-plus/src/main/java/com/zyplayer/doc/swaggerplus/controller/SwaggerDocumentController.java b/zyplayer-doc-swagger-plus/src/main/java/com/zyplayer/doc/swaggerplus/controller/SwaggerDocumentController.java index e5a2e54d..734ded79 100644 --- a/zyplayer-doc-swagger-plus/src/main/java/com/zyplayer/doc/swaggerplus/controller/SwaggerDocumentController.java +++ b/zyplayer-doc-swagger-plus/src/main/java/com/zyplayer/doc/swaggerplus/controller/SwaggerDocumentController.java @@ -82,6 +82,7 @@ public class SwaggerDocumentController { String resourcesStr = swaggerHttpRequestService.requestSwaggerUrl(request, docUrl, swaggerDomain); resourceList = JSON.parseArray(resourcesStr, SwaggerResource.class); } catch (Exception e) { + e.printStackTrace(); return DocResponseJson.warn("解析文档地址失败：" + e.getMessage()); } if (resourceList == null || resourceList.isEmpty()) { @@ -98,10 +99,8 @@ public class SwaggerDocumentController { swaggerDoc.setName(resource.getName()); swaggerDocService.save(swaggerDoc); } - } else if (SwaggerDocUtil.isSwaggerLocation(docUrl)) { - swaggerDocService.saveOrUpdate(swaggerDoc); } else { - return DocResponseJson.warn("不支持的地址：" + docUrl); + swaggerDocService.saveOrUpdate(swaggerDoc); } } else { swaggerDocService.saveOrUpdate(swaggerDoc); diff --git a/zyplayer-doc-swagger-plus/src/main/java/com/zyplayer/doc/swaggerplus/controller/SwaggerProxyController.java b/zyplayer-doc-swagger-plus/src/main/java/com/zyplayer/doc/swaggerplus/controller/SwaggerProxyController.java index ffc1c174..4a24d13a 100644 --- a/zyplayer-doc-swagger-plus/src/main/java/com/zyplayer/doc/swaggerplus/controller/SwaggerProxyController.java +++ b/zyplayer-doc-swagger-plus/src/main/java/com/zyplayer/doc/swaggerplus/controller/SwaggerProxyController.java @@ -70,6 +70,7 @@ public class SwaggerProxyController { String contentStr = swaggerHttpRequestService.requestSwaggerUrl(request, swaggerDoc.getDocUrl(), docsDomain); return new ResponseEntity<>(new Json(contentStr), HttpStatus.OK); } catch (Exception e) { + e.printStackTrace(); return new ResponseEntity<>(DocResponseJson.warn("请求文档失败"), HttpStatus.OK); } } diff --git a/zyplayer-doc-swagger-plus/src/main/java/com/zyplayer/doc/swaggerplus/controller/param/ParamData.java b/zyplayer-doc-swagger-plus/src/main/java/com/zyplayer/doc/swaggerplus/controller/param/ParamData.java index 3e4d1162..46e36487 100644 --- a/zyplayer-doc-swagger-plus/src/main/java/com/zyplayer/doc/swaggerplus/controller/param/ParamData.java +++ b/zyplayer-doc-swagger-plus/src/main/java/com/zyplayer/doc/swaggerplus/controller/param/ParamData.java @@ -1,5 +1,11 @@ package com.zyplayer.doc.swaggerplus.controller.param; +/** + * 参数信息 + * + * @author 暮光：城中城 + * @since 2021-11-04 + */ public class ParamData { private String code; private String value; diff --git a/zyplayer-doc-swagger-plus/src/main/java/com/zyplayer/doc/swaggerplus/controller/vo/ProxyRequestResultVo.java b/zyplayer-doc-swagger-plus/src/main/java/com/zyplayer/doc/swaggerplus/controller/vo/ProxyRequestResultVo.java index 04a26aab..9c58d9b9 100644 --- a/zyplayer-doc-swagger-plus/src/main/java/com/zyplayer/doc/swaggerplus/controller/vo/ProxyRequestResultVo.java +++ b/zyplayer-doc-swagger-plus/src/main/java/com/zyplayer/doc/swaggerplus/controller/vo/ProxyRequestResultVo.java @@ -3,6 +3,12 @@ package com.zyplayer.doc.swaggerplus.controller.vo; import java.util.List; +/** + * 代理请求结果 + * + * @author 暮光：城中城 + * @since 2021-11-04 + */ public class ProxyRequestResultVo { private List cookies; private List headers; diff --git a/zyplayer-doc-swagger-plus/src/main/java/com/zyplayer/doc/swaggerplus/controller/vo/SwaggerResourceVo.java b/zyplayer-doc-swagger-plus/src/main/java/com/zyplayer/doc/swaggerplus/controller/vo/SwaggerResourceVo.java index 49739dc0..7c16b401 100644 --- a/zyplayer-doc-swagger-plus/src/main/java/com/zyplayer/doc/swaggerplus/controller/vo/SwaggerResourceVo.java +++ b/zyplayer-doc-swagger-plus/src/main/java/com/zyplayer/doc/swaggerplus/controller/vo/SwaggerResourceVo.java @@ -3,6 +3,12 @@ package com.zyplayer.doc.swaggerplus.controller.vo; import com.google.common.collect.ComparisonChain; +/** + * swagger资源信息 + * + * @author 暮光：城中城 + * @since 2021-11-04 + */ public class SwaggerResourceVo implements Comparable { private String name; private String url; diff --git a/zyplayer-doc-swagger-plus/src/main/java/com/zyplayer/doc/swaggerplus/framework/config/EnableDocSwaggerPlus.java b/zyplayer-doc-swagger-plus/src/main/java/com/zyplayer/doc/swaggerplus/framework/config/EnableDocSwaggerPlus.java index 0456b13d..9c51faef 100644 --- a/zyplayer-doc-swagger-plus/src/main/java/com/zyplayer/doc/swaggerplus/framework/config/EnableDocSwaggerPlus.java +++ b/zyplayer-doc-swagger-plus/src/main/java/com/zyplayer/doc/swaggerplus/framework/config/EnableDocSwaggerPlus.java @@ -5,6 +5,12 @@ import org.springframework.context.annotation.Configuration; import java.lang.annotation.*; +/** + * 开启swagger模块注解 + * + * @author 暮光：城中城 + * @since 2021-11-04 + */ @Target(ElementType.TYPE) @Retention(RetentionPolicy.RUNTIME) @Documented diff --git a/zyplayer-doc-swagger-plus/src/main/java/com/zyplayer/doc/swaggerplus/framework/utils/SwaggerDocUtil.java b/zyplayer-doc-swagger-plus/src/main/java/com/zyplayer/doc/swaggerplus/framework/utils/SwaggerDocUtil.java index f50aae1f..09630782 100644 --- a/zyplayer-doc-swagger-plus/src/main/java/com/zyplayer/doc/swaggerplus/framework/utils/SwaggerDocUtil.java +++ b/zyplayer-doc-swagger-plus/src/main/java/com/zyplayer/doc/swaggerplus/framework/utils/SwaggerDocUtil.java @@ -1,5 +1,11 @@ package com.zyplayer.doc.swaggerplus.framework.utils; +/** + * swagger文档工具类 + * + * @author 暮光：城中城 + * @since 2021-11-04 + */ public class SwaggerDocUtil { public static String replaceSwaggerResources(String docUrl) { diff --git a/zyplayer-doc-swagger-plus/src/main/java/com/zyplayer/doc/swaggerplus/service/SwaggerHttpRequestService.java b/zyplayer-doc-swagger-plus/src/main/java/com/zyplayer/doc/swaggerplus/service/SwaggerHttpRequestService.java index 43a65c7c..9249fb1d 100644 --- a/zyplayer-doc-swagger-plus/src/main/java/com/zyplayer/doc/swaggerplus/service/SwaggerHttpRequestService.java +++ b/zyplayer-doc-swagger-plus/src/main/java/com/zyplayer/doc/swaggerplus/service/SwaggerHttpRequestService.java @@ -1,8 +1,9 @@ package com.zyplayer.doc.swaggerplus.service; -import cn.hutool.core.io.FileUtil; -import cn.hutool.core.io.IoUtil; -import cn.hutool.http.*; +import cn.hutool.http.HttpRequest; +import cn.hutool.http.HttpResponse; +import cn.hutool.http.HttpUtil; +import cn.hutool.http.Method; import com.zyplayer.doc.core.exception.ConfirmException; import com.zyplayer.doc.data.repository.manage.entity.SwaggerGlobalParam; import com.zyplayer.doc.data.service.manage.SwaggerGlobalParamService; @@ -22,11 +23,16 @@ import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.net.HttpCookie; -import java.net.URLEncoder; import java.util.*; import java.util.stream.Collectors; import java.util.stream.Stream; +/** + * swagger请求服务 + * + * @author 暮光：城中城 + * @since 2021-11-04 + */ @Service public class SwaggerHttpRequestService { @@ -127,7 +133,7 @@ public class SwaggerHttpRequestService { return resultVo; } - private HttpResponse getHttpResponse(HttpServletRequest request, ProxyRequestParam requestParam){ + private HttpResponse getHttpResponse(HttpServletRequest request, ProxyRequestParam requestParam) { // 执行请求 Method method = requestMethodMap.get(requestParam.getMethod()); if (method == null) { diff --git a/zyplayer-doc-swagger/src/main/java/com/zyplayer/doc/swagger/controller/MgStorageController.java b/zyplayer-doc-swagger/src/main/java/com/zyplayer/doc/swagger/controller/MgStorageController.java index a896703e..5eff3a67 100644 --- a/zyplayer-doc-swagger/src/main/java/com/zyplayer/doc/swagger/controller/MgStorageController.java +++ b/zyplayer-doc-swagger/src/main/java/com/zyplayer/doc/swagger/controller/MgStorageController.java @@ -14,7 +14,7 @@ import java.util.List; /** * 后台存储服务控制器 - * + * * @author 暮光：城中城 * @since 2018年8月21日 */ @@ -23,7 +23,7 @@ import java.util.List; @RequestMapping("/swagger-mg-ui/storage") public class MgStorageController { - @Autowired + @Resource private MgStorageService storageService; @PostMapping(value = "/checkConfig") @@ -64,4 +64,4 @@ public class MgStorageController { List likeList = storageService.like(key, value); return DocResponseJson.ok(likeList); } -} \ No newline at end of file +} diff --git a/zyplayer-doc-swagger/src/main/java/com/zyplayer/doc/swagger/controller/ZyplayerSwaggerController.java b/zyplayer-doc-swagger/src/main/java/com/zyplayer/doc/swagger/controller/ZyplayerSwaggerController.java index aa9ae78c..cae66bd5 100644 --- a/zyplayer-doc-swagger/src/main/java/com/zyplayer/doc/swagger/controller/ZyplayerSwaggerController.java +++ b/zyplayer-doc-swagger/src/main/java/com/zyplayer/doc/swagger/controller/ZyplayerSwaggerController.java @@ -31,7 +31,7 @@ import java.util.*; @RestController public class ZyplayerSwaggerController { - @Autowired + @Resource private MgStorageService storageService; @RequestMapping("/swagger-resources") diff --git a/zyplayer-doc-swagger/src/main/java/com/zyplayer/doc/swagger/framework/filter/ZyplayerApiTestFilter.java b/zyplayer-doc-swagger/src/main/java/com/zyplayer/doc/swagger/framework/filter/ZyplayerApiTestFilter.java index 19d69f3e..113d4f72 100644 --- a/zyplayer-doc-swagger/src/main/java/com/zyplayer/doc/swagger/framework/filter/ZyplayerApiTestFilter.java +++ b/zyplayer-doc-swagger/src/main/java/com/zyplayer/doc/swagger/framework/filter/ZyplayerApiTestFilter.java @@ -30,12 +30,12 @@ import com.zyplayer.doc.swagger.framework.service.MgStorageService; //@Component public class ZyplayerApiTestFilter implements Filter { - @Autowired + @Resource private MgStorageService mgStorageService; @Override public void init(FilterConfig filterConfig) throws ServletException { - + } @Override diff --git a/zyplayer-doc-swagger/src/main/java/com/zyplayer/doc/swagger/framework/filter/ZyplayerProxyFilter.java b/zyplayer-doc-swagger/src/main/java/com/zyplayer/doc/swagger/framework/filter/ZyplayerProxyFilter.java index bf06909c..782e7b50 100644 --- a/zyplayer-doc-swagger/src/main/java/com/zyplayer/doc/swagger/framework/filter/ZyplayerProxyFilter.java +++ b/zyplayer-doc-swagger/src/main/java/com/zyplayer/doc/swagger/framework/filter/ZyplayerProxyFilter.java @@ -34,7 +34,7 @@ public class ZyplayerProxyFilter implements Filter { private static final Logger logger = LoggerFactory.getLogger(ZyplayerProxyFilter.class); - @Autowired + @Resource private MgStorageService mgStorageService; @Override diff --git a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/vo/UserPageAuthVo.java b/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/vo/UserPageAuthVo.java index f84ef965..55d54cc3 100644 --- a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/vo/UserPageAuthVo.java +++ b/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/vo/UserPageAuthVo.java @@ -1,5 +1,11 @@ package com.zyplayer.doc.wiki.controller.vo; +/** + * 用户页面权限信息 + * + * @author 暮光：城中城 + * @since 2019-06-05 + */ public class UserPageAuthVo { private String userName; private Long userId; diff --git a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/vo/UserSpaceAuthVo.java b/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/vo/UserSpaceAuthVo.java index 224a069d..333ab10c 100644 --- a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/vo/UserSpaceAuthVo.java +++ b/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/vo/UserSpaceAuthVo.java @@ -1,5 +1,11 @@ package com.zyplayer.doc.wiki.controller.vo; +/** + * 用户空间权限信息 + * + * @author 暮光：城中城 + * @since 2021-02-09 + */ public class UserSpaceAuthVo { private Long groupId; private Integer editPage; diff --git a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/vo/WikiPageCommentVo.java b/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/vo/WikiPageCommentVo.java index 624758d7..0740ee31 100644 --- a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/vo/WikiPageCommentVo.java +++ b/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/vo/WikiPageCommentVo.java @@ -5,6 +5,8 @@ import com.zyplayer.doc.data.repository.manage.entity.WikiPageComment; import java.util.List; /** + * wiki页面评论信息 + * * @author 暮光：城中城 * @since 2019-02-24 */ diff --git a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/vo/WikiPageContentVo.java b/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/vo/WikiPageContentVo.java index e71784a0..0c75c781 100644 --- a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/vo/WikiPageContentVo.java +++ b/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/vo/WikiPageContentVo.java @@ -6,6 +6,12 @@ import com.zyplayer.doc.data.repository.manage.entity.WikiPageFile; import java.util.List; +/** + * wiki页面内容信息 + * + * @author 暮光：城中城 + * @since 2019-02-28 + */ public class WikiPageContentVo { private WikiPage wikiPage; private WikiPageContent pageContent; diff --git a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/vo/WikiPageVo.java b/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/vo/WikiPageVo.java index 7a99b917..de5250c0 100644 --- a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/vo/WikiPageVo.java +++ b/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/vo/WikiPageVo.java @@ -4,6 +4,12 @@ import com.zyplayer.doc.data.repository.manage.entity.WikiPage; import java.util.List; +/** + * wiki页面信息 + * + * @author 暮光：城中城 + * @since 2019-03-11 + */ public class WikiPageVo extends WikiPage { private String path; private List children; diff --git a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/vo/WikiSpaceVo.java b/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/vo/WikiSpaceVo.java index 00af04ce..3ebaf934 100644 --- a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/vo/WikiSpaceVo.java +++ b/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/vo/WikiSpaceVo.java @@ -2,6 +2,12 @@ package com.zyplayer.doc.wiki.controller.vo; import com.zyplayer.doc.data.repository.manage.entity.WikiSpace; +/** + * wiki空间信息 + * + * @author 暮光：城中城 + * @since 2021-02-09 + */ public class WikiSpaceVo extends WikiSpace { private Integer favorite; diff --git a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/framework/config/EnableDocWiki.java b/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/framework/config/EnableDocWiki.java index 42629eb1..03d26262 100644 --- a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/framework/config/EnableDocWiki.java +++ b/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/framework/config/EnableDocWiki.java @@ -5,12 +5,18 @@ import org.springframework.context.annotation.Configuration; import java.lang.annotation.*; +/** + * 开启wiki模块注解 + * + * @author 暮光：城中城 + * @since 2019-02-17 + */ @Target(ElementType.TYPE) @Retention(RetentionPolicy.RUNTIME) @Documented @Configuration @ComponentScan(basePackages = { - "com.zyplayer.doc.wiki", + "com.zyplayer.doc.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/com/zyplayer/doc/wiki/framework/consts/Const.java index c14c5f78..e1e61d77 100644 --- a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/framework/consts/Const.java +++ b/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/framework/consts/Const.java @@ -3,6 +3,12 @@ package com.zyplayer.doc.wiki.framework.consts; import java.util.HashMap; import java.util.Map; +/** + * 静态类 + * + * @author 暮光：城中城 + * @since 2019-03-22 + */ public class Const { //如果有多个相同的charset类型，可以使用""代替或者指定统一的文件类型，指定的语句需要放在所有相同的语句的第一个位置 //更多类型可以访问 http://tool.oschina.net/commons diff --git a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/framework/consts/SpaceType.java b/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/framework/consts/SpaceType.java index e6f9c08e..5d9a3e47 100644 --- a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/framework/consts/SpaceType.java +++ b/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/framework/consts/SpaceType.java @@ -2,6 +2,12 @@ package com.zyplayer.doc.wiki.framework.consts; import java.util.Objects; +/** + * 空间类型 + * + * @author 暮光：城中城 + * @since 2019-06-01 + */ public class SpaceType { public static final Integer publicSpace = 1; public static final Integer personalSpace = 2; diff --git a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/framework/consts/WikiAuthType.java b/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/framework/consts/WikiAuthType.java index b1199571..7c9f2902 100644 --- a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/framework/consts/WikiAuthType.java +++ b/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/framework/consts/WikiAuthType.java @@ -1,5 +1,11 @@ package com.zyplayer.doc.wiki.framework.consts; +/** + * wiki权限类型 + * + * @author 暮光：城中城 + * @since 2019-06-01 + */ public enum WikiAuthType { @Deprecated CREATE_PAGE(1, "WIKI_CREATE_PAGE_"), diff --git a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/service/common/WikiPageAuthService.java b/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/service/common/WikiPageAuthService.java index dbd06693..5478838c 100644 --- a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/service/common/WikiPageAuthService.java +++ b/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/service/common/WikiPageAuthService.java @@ -12,6 +12,12 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.Objects; +/** + * wiki页面权限服务 + * + * @author 暮光：城中城 + * @since 2020-06-16 + */ @Service public class WikiPageAuthService { @@ -20,6 +26,7 @@ public class WikiPageAuthService { /** * 是否具有编辑权限 + * * @param wikiSpaceSel * @param editType * @param pageId @@ -50,6 +57,7 @@ public class WikiPageAuthService { /** * 是否具有权限编辑权限 + * * @param wikiSpaceSel * @param pageId * @param currentUserId @@ -73,6 +81,7 @@ public class WikiPageAuthService { /** * 是否具有附件上传权限 + * * @param wikiSpaceSel * @param pageId * @param currentUserId @@ -99,6 +108,7 @@ public class WikiPageAuthService { /** * 是否具有附件删除权限 + * * @param wikiSpaceSel * @param pageId * @param currentUserId @@ -125,6 +135,7 @@ public class WikiPageAuthService { /** * 是否具有删除权限 + * * @param wikiSpaceSel * @param editType * @param pageId