From c995d3a600418e6626e39ebe0de27ec0a0cf2305 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9A=AE=E5=85=89=EF=BC=9A=E5=9F=8E=E4=B8=AD=E5=9F=8E?=
<806783409@qq.com>
Date: Tue, 26 Feb 2019 23:04:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A1=86=E6=9E=B6=E6=8B=86=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
README.md | 4 +-
pom.xml | 1 +
zyplayer-doc-core/pom.xml | 2 +-
zyplayer-doc-data/pom.xml | 112 +++++++
.../doc/data/config/MybatisPlusConfig.java | 141 +++++++++
.../data}/config/security/DocUserDetails.java | 158 +++++-----
.../data}/config/security/DocUserUtil.java | 49 ++-
.../repository/manage/entity/AuthInfo.java | 106 +++++++
.../repository/manage/entity/UserAuth.java | 132 ++++++++
.../repository/manage/entity/UserInfo.java | 158 ++++++++++
.../repository/manage/entity/WikiPage.java | 144 +++++++++
.../manage/entity/WikiPageComment.java | 118 ++++++++
.../manage/entity/WikiPageContent.java | 118 ++++++++
.../manage/entity/WikiPageFile.java | 132 ++++++++
.../repository/manage/entity/WikiPageZan.java | 93 ++++++
.../repository/manage/entity/WikiSpace.java | 106 +++++++
.../manage/entity/ZyplayerStorage.java | 66 ++++
.../manage/mapper/AuthInfoMapper.java | 16 +
.../manage/mapper/UserAuthMapper.java | 16 +
.../manage/mapper/UserInfoMapper.java | 16 +
.../manage/mapper/WikiPageCommentMapper.java | 16 +
.../manage/mapper/WikiPageContentMapper.java | 16 +
.../manage/mapper/WikiPageFileMapper.java | 16 +
.../manage/mapper/WikiPageMapper.java | 16 +
.../manage/mapper/WikiPageZanMapper.java | 16 +
.../manage/mapper/WikiSpaceMapper.java | 16 +
.../manage/mapper/ZyplayerStorageMapper.java | 18 ++
.../support/generator/CodeGenerator.java | 93 ++++++
.../interceptor/SqlLogInterceptor.java | 123 ++++++++
.../data/service/manage/AuthInfoService.java | 16 +
.../data/service/manage/UserAuthService.java | 16 +
.../data/service/manage/UserInfoService.java | 16 +
.../manage/WikiPageCommentService.java | 16 +
.../manage/WikiPageContentService.java | 16 +
.../service/manage/WikiPageFileService.java | 16 +
.../data/service/manage/WikiPageService.java | 16 +
.../service/manage/WikiPageZanService.java | 16 +
.../data/service/manage/WikiSpaceService.java | 16 +
.../manage/ZyplayerStorageService.java | 16 +
.../manage/impl/AuthInfoServiceImpl.java | 20 ++
.../manage/impl/UserAuthServiceImpl.java | 20 ++
.../manage/impl/UserInfoServiceImpl.java | 20 ++
.../impl/WikiPageCommentServiceImpl.java | 20 ++
.../impl/WikiPageContentServiceImpl.java | 20 ++
.../manage/impl/WikiPageFileServiceImpl.java | 20 ++
.../manage/impl/WikiPageServiceImpl.java | 20 ++
.../manage/impl/WikiPageZanServiceImpl.java | 20 ++
.../manage/impl/WikiSpaceServiceImpl.java | 20 ++
.../impl/ZyplayerStorageServiceImpl.java | 20 ++
.../mapper/manage/AuthInfoMapper.xml | 0
.../mapper/manage/UserAuthMapper.xml | 0
.../mapper/manage/UserInfoMapper.xml | 0
.../mapper/manage/WikiPageCommentMapper.xml | 5 +
.../mapper/manage/WikiPageContentMapper.xml | 5 +
.../mapper/manage/WikiPageFileMapper.xml | 5 +
.../mapper/manage/WikiPageMapper.xml | 5 +
.../mapper/manage/WikiPageZanMapper.xml | 5 +
.../mapper/manage/WikiSpaceMapper.xml | 5 +
.../mapper/manage/ZyplayerStorageMapper.xml | 0
zyplayer-doc-dubbo/pom.xml | 4 +-
zyplayer-doc-manage/pom.xml | 25 +-
.../com/zyplayer/doc/manage/Application.java | 2 +
.../framework/config/MybatisPlusConfig.java | 282 +++++++++---------
.../impl/MgDubboStorageServiceImpl.java | 4 +-
.../config/impl/MgStorageServiceImpl.java | 4 +-
.../security/DocDetailsServiceImpl.java | 26 +-
.../manage/web/manage/AuthInfoController.java | 17 +-
.../manage/web/manage/UserAuthController.java | 25 +-
.../manage/web/manage/UserInfoController.java | 35 ++-
.../swagger/ZyplayerStorageController.java | 2 +-
.../sql/zyplayer_doc_manage.1.0.1.sql | 203 +++++++++++++
zyplayer-doc-swagger/pom.xml | 6 +-
zyplayer-doc-wiki/pom.xml | 220 ++------------
.../doc/wiki/controller/WikiController.java | 31 --
.../controller/WikiPageCommentController.java | 57 ++++
.../wiki/controller/WikiPageController.java | 77 +++++
.../controller/WikiPageFileController.java | 58 ++++
.../controller/WikiPageZanController.java | 60 ++++
.../wiki/controller/WikiSpaceController.java | 65 ++++
79 files changed, 3063 insertions(+), 548 deletions(-)
create mode 100644 zyplayer-doc-data/pom.xml
create mode 100644 zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/config/MybatisPlusConfig.java
rename {zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework => zyplayer-doc-data/src/main/java/com/zyplayer/doc/data}/config/security/DocUserDetails.java (89%)
rename {zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework => zyplayer-doc-data/src/main/java/com/zyplayer/doc/data}/config/security/DocUserUtil.java (68%)
create mode 100644 zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/AuthInfo.java
create mode 100644 zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/UserAuth.java
create mode 100644 zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/UserInfo.java
create mode 100644 zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/WikiPage.java
create mode 100644 zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/WikiPageComment.java
create mode 100644 zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/WikiPageContent.java
create mode 100644 zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/WikiPageFile.java
create mode 100644 zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/WikiPageZan.java
create mode 100644 zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/WikiSpace.java
create mode 100644 zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/ZyplayerStorage.java
create mode 100644 zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/AuthInfoMapper.java
create mode 100644 zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/UserAuthMapper.java
create mode 100644 zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/UserInfoMapper.java
create mode 100644 zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/WikiPageCommentMapper.java
create mode 100644 zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/WikiPageContentMapper.java
create mode 100644 zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/WikiPageFileMapper.java
create mode 100644 zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/WikiPageMapper.java
create mode 100644 zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/WikiPageZanMapper.java
create mode 100644 zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/WikiSpaceMapper.java
create mode 100644 zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/ZyplayerStorageMapper.java
create mode 100644 zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/support/generator/CodeGenerator.java
create mode 100644 zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/support/interceptor/SqlLogInterceptor.java
create mode 100644 zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/AuthInfoService.java
create mode 100644 zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/UserAuthService.java
create mode 100644 zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/UserInfoService.java
create mode 100644 zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/WikiPageCommentService.java
create mode 100644 zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/WikiPageContentService.java
create mode 100644 zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/WikiPageFileService.java
create mode 100644 zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/WikiPageService.java
create mode 100644 zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/WikiPageZanService.java
create mode 100644 zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/WikiSpaceService.java
create mode 100644 zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/ZyplayerStorageService.java
create mode 100644 zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/AuthInfoServiceImpl.java
create mode 100644 zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/UserAuthServiceImpl.java
create mode 100644 zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/UserInfoServiceImpl.java
create mode 100644 zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/WikiPageCommentServiceImpl.java
create mode 100644 zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/WikiPageContentServiceImpl.java
create mode 100644 zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/WikiPageFileServiceImpl.java
create mode 100644 zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/WikiPageServiceImpl.java
create mode 100644 zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/WikiPageZanServiceImpl.java
create mode 100644 zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/WikiSpaceServiceImpl.java
create mode 100644 zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/ZyplayerStorageServiceImpl.java
rename {zyplayer-doc-manage => zyplayer-doc-data}/src/main/resources/mapper/manage/AuthInfoMapper.xml (100%)
rename {zyplayer-doc-manage => zyplayer-doc-data}/src/main/resources/mapper/manage/UserAuthMapper.xml (100%)
rename {zyplayer-doc-manage => zyplayer-doc-data}/src/main/resources/mapper/manage/UserInfoMapper.xml (100%)
create mode 100644 zyplayer-doc-data/src/main/resources/mapper/manage/WikiPageCommentMapper.xml
create mode 100644 zyplayer-doc-data/src/main/resources/mapper/manage/WikiPageContentMapper.xml
create mode 100644 zyplayer-doc-data/src/main/resources/mapper/manage/WikiPageFileMapper.xml
create mode 100644 zyplayer-doc-data/src/main/resources/mapper/manage/WikiPageMapper.xml
create mode 100644 zyplayer-doc-data/src/main/resources/mapper/manage/WikiPageZanMapper.xml
create mode 100644 zyplayer-doc-data/src/main/resources/mapper/manage/WikiSpaceMapper.xml
rename {zyplayer-doc-manage => zyplayer-doc-data}/src/main/resources/mapper/manage/ZyplayerStorageMapper.xml (100%)
create mode 100644 zyplayer-doc-manage/src/main/resources/sql/zyplayer_doc_manage.1.0.1.sql
delete mode 100644 zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiController.java
create mode 100644 zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageCommentController.java
create mode 100644 zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageController.java
create mode 100644 zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageFileController.java
create mode 100644 zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageZanController.java
create mode 100644 zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiSpaceController.java
diff --git a/README.md b/README.md
index 2a49407d..74c55d65 100644
--- a/README.md
+++ b/README.md
@@ -17,9 +17,9 @@
> 原[zyplayer-doc-db](https://gitee.com/zyplayer/zyplayer-doc-db)，具有数据库文档的查看、管理、导出等功能
##### 三、zyplayer-doc-manage 可以单独部署的文档管理后台
-> 后端使用spring-boot、mybatis-plus、springfox-swagger等框架，前端使用[zui](http://zui.sexy/)、[Vue](https://cn.vuejs.org/)等框架
+> 后端使用spring-boot、mybatis-plus、springfox-swagger等框架，前端使用[zui](http://zui.sexy/)、[Vue](https://cn.vuejs.org/)、[element-ui](http://element-cn.eleme.io)等框架
-> 已集成三套优秀swagger文档前端：[zyplayer-doc-swagger](https://gitee.com/zyplayer/zyplayer-doc)、[swagger-bootstrap-ui](https://gitee.com/xiaoym/swagger-bootstrap-ui)、[springfox-swagger-ui](https://github.com/springfox/springfox/tree/master/springfox-swagger-ui)、[element-ui](http://element-cn.eleme.io)
+> 已集成三套优秀swagger文档前端：[zyplayer-doc-swagger](https://gitee.com/zyplayer/zyplayer-doc)、[swagger-bootstrap-ui](https://gitee.com/xiaoym/swagger-bootstrap-ui)、[springfox-swagger-ui](https://github.com/springfox/springfox/tree/master/springfox-swagger-ui)
> 已集成[zyplayer-doc-db](https://gitee.com/zyplayer/zyplayer-doc)数据库文档
diff --git a/pom.xml b/pom.xml
index bd3bc5ed..438391ba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,5 +50,6 @@
zyplayer-doc-core
zyplayer-doc-dubbo
zyplayer-doc-wiki
+ zyplayer-doc-data
diff --git a/zyplayer-doc-core/pom.xml b/zyplayer-doc-core/pom.xml
index 19dd3e0c..2cf1e6a4 100644
--- a/zyplayer-doc-core/pom.xml
+++ b/zyplayer-doc-core/pom.xml
@@ -10,7 +10,7 @@
zyplayer-doc-core
- 1.0.0
+ 1.0.1
zyplayer-doc-core
http://maven.apache.org
diff --git a/zyplayer-doc-data/pom.xml b/zyplayer-doc-data/pom.xml
new file mode 100644
index 00000000..665c62eb
--- /dev/null
+++ b/zyplayer-doc-data/pom.xml
@@ -0,0 +1,112 @@
+
+
+ 4.0.0
+
+ com.zyplayer
+ zyplayer-doc-data
+ 1.0.1
+
+
+ org.springframework.boot
+ spring-boot-starter-parent
+ 2.0.6.RELEASE
+
+
+
+ UTF-8
+ UTF-8
+ 1.8
+ 3.0.6
+ 1.2.53
+ 2.0.1
+ 1.0.0
+ 2.0
+ 6.1.0
+ 1.1.9
+ 1.8.9
+ 2.9.2
+ 2.9.2
+ 1.0.1
+ 1.0.1
+
+
+
+
+ org.springframework.boot
+ spring-boot-starter
+
+
+ org.springframework.boot
+ spring-boot-starter-web
+
+
+ org.springframework.boot
+ spring-boot-starter-test
+ test
+
+
+ org.springframework.boot
+ spring-boot-starter-jta-atomikos
+
+
+ mysql
+ mysql-connector-java
+
+
+ com.baomidou
+ mybatis-plus-boot-starter
+ ${mybatis.plus.boot.starter.version}
+
+
+ com.alibaba
+ druid
+ ${alibaba.druid.version}
+
+
+
+ com.alibaba
+ fastjson
+ ${fastjson.version}
+
+
+ com.github.dozermapper
+ dozer-core
+ ${dozer.core.version}
+
+
+
+
+ com.zyplayer
+ zyplayer-doc-core
+ ${zyplayer.doc.core.version}
+
+
+
+ org.apache.velocity
+ velocity-engine-core
+ ${velocity.engine.core.version}
+
+
+
+ org.freemarker
+ freemarker
+
+
+
+ org.springframework.boot
+ spring-boot-starter-security
+
+
+
+
+
+
+ org.springframework.boot
+ spring-boot-maven-plugin
+
+
+
+
+
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
new file mode 100644
index 00000000..58a2ce6f
--- /dev/null
+++ b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/config/MybatisPlusConfig.java
@@ -0,0 +1,141 @@
+package com.zyplayer.doc.data.config;
+
+import com.atomikos.icatch.jta.UserTransactionImp;
+import com.atomikos.icatch.jta.UserTransactionManager;
+import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.PerformanceInterceptor;
+import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean;
+import com.zyplayer.doc.data.repository.support.interceptor.SqlLogInterceptor;
+import org.apache.ibatis.plugin.Interceptor;
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.jta.atomikos.AtomikosDataSourceBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
+import org.springframework.transaction.PlatformTransactionManager;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
+import org.springframework.transaction.jta.JtaTransactionManager;
+
+import javax.sql.DataSource;
+import javax.transaction.TransactionManager;
+import javax.transaction.UserTransaction;
+import java.util.Properties;
+
+/**
+ * mybatis plus数据库配置
+ */
+@Configuration
+public class MybatisPlusConfig {
+
+ /**
+ * sql日志
+ **/
+ private static final SqlLogInterceptor SQL_LOG_INTERCEPTOR;
+
+ static {
+ SQL_LOG_INTERCEPTOR = new SqlLogInterceptor();
+ Properties properties = new Properties();
+ SQL_LOG_INTERCEPTOR.setProperties(properties);
+ }
+
+ /**
+ * 分布式事务配置
+ */
+ @Configuration
+ static class JTATransactionManagerConfig {
+
+ @Bean(name = "userTransaction")
+ public UserTransaction userTransaction() throws Throwable {
+ UserTransactionImp userTransactionImp = new UserTransactionImp();
+ userTransactionImp.setTransactionTimeout(300);
+ return userTransactionImp;
+ }
+
+ @Bean(name = "atomikosTransactionManager")
+ public TransactionManager atomikosTransactionManager() {
+ UserTransactionManager userTransactionManager = new UserTransactionManager();
+ userTransactionManager.setForceShutdown(true);
+ return userTransactionManager;
+ }
+
+ @Bean(name = "transactionManager")
+ public PlatformTransactionManager transactionManager() throws Throwable {
+ UserTransaction userTransaction = userTransaction();
+ TransactionManager atomikosTransactionManager = atomikosTransactionManager();
+
+ JtaTransactionManager jtaTransactionManager = new JtaTransactionManager(userTransaction, atomikosTransactionManager);
+ jtaTransactionManager.setAllowCustomIsolationLevels(true);
+ jtaTransactionManager.setGlobalRollbackOnParticipationFailure(true);
+ jtaTransactionManager.setDefaultTimeout(30);
+
+ return jtaTransactionManager;
+ }
+ }
+
+ /**
+ * 数据库配置
+ */
+ @Configuration
+ @EnableTransactionManagement
+ @MapperScan(value = "com.zyplayer.doc.data.repository.manage.mapper", sqlSessionFactoryRef = "manageSqlSessionFactory")
+ static class ManageMybatisDbConfig {
+
+ @Value("${zyplayer.doc.manage.datasource.driverClassName}")
+ private String driverClassName;
+ @Value("${zyplayer.doc.manage.datasource.url}")
+ private String url;
+ @Value("${zyplayer.doc.manage.datasource.username}")
+ private String username;
+ @Value("${zyplayer.doc.manage.datasource.password}")
+ private String password;
+
+ @Bean(name = "manageDatasource")
+ public DataSource manageDatasource() {
+ Properties xaProperties = new Properties();
+ xaProperties.setProperty("driverClassName", driverClassName);
+ xaProperties.setProperty("url", url);
+ xaProperties.setProperty("username", username);
+ xaProperties.setProperty("password", password);
+ xaProperties.setProperty("maxActive", "500");
+ xaProperties.setProperty("testOnBorrow", "true");
+ xaProperties.setProperty("testWhileIdle", "true");
+ xaProperties.setProperty("validationQuery", "select 'x'");
+
+ AtomikosDataSourceBean xaDataSource = new AtomikosDataSourceBean();
+ xaDataSource.setXaProperties(xaProperties);
+ xaDataSource.setXaDataSourceClassName("com.alibaba.druid.pool.xa.DruidXADataSource");
+ xaDataSource.setUniqueResourceName("manageDatasource");
+ xaDataSource.setMaxPoolSize(500);
+ xaDataSource.setMinPoolSize(1);
+ xaDataSource.setMaxLifetime(60);
+ return xaDataSource;
+ }
+
+ @Bean(name = "manageSqlSessionFactory")
+ public MybatisSqlSessionFactoryBean manageSqlSessionFactory() throws Exception {
+ MybatisSqlSessionFactoryBean sqlSessionFactoryBean = new MybatisSqlSessionFactoryBean();
+ sqlSessionFactoryBean.setDataSource(manageDatasource());
+ sqlSessionFactoryBean.setPlugins(new Interceptor[]{SQL_LOG_INTERCEPTOR});
+
+ PathMatchingResourcePatternResolver resolver = new PathMatchingResourcePatternResolver();
+ sqlSessionFactoryBean.setMapperLocations(resolver.getResources("classpath:/mapper/manage/*Mapper.xml"));
+ return sqlSessionFactoryBean;
+ }
+ }
+
+ @Bean
+ public PerformanceInterceptor performanceInterceptor() {
+ PerformanceInterceptor performanceInterceptor = new PerformanceInterceptor();
+ /* */
+ performanceInterceptor.setMaxTime(1000);
+ /* */
+ performanceInterceptor.setFormat(true);
+ return performanceInterceptor;
+ }
+
+ @Bean
+ public PaginationInterceptor paginationInterceptor() {
+ return new PaginationInterceptor();
+ }
+}
diff --git a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework/config/security/DocUserDetails.java b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/config/security/DocUserDetails.java
similarity index 89%
rename from zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework/config/security/DocUserDetails.java
rename to zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/config/security/DocUserDetails.java
index b928cf02..18e49d16 100644
--- a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework/config/security/DocUserDetails.java
+++ b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/config/security/DocUserDetails.java
@@ -1,79 +1,79 @@
-package com.zyplayer.doc.manage.framework.config.security;
-
-import java.util.Collection;
-
-import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.userdetails.UserDetails;
-
-public class DocUserDetails implements UserDetails {
- private static final long serialVersionUID = 1L;
-
- private Long userId;
- private String username;
- private String password;
- private boolean enabled;
- private Collection authorities;
-
- public DocUserDetails(Long userId, String username, String password, boolean enabled) {
- super();
- this.userId = userId;
- this.username = username;
- this.password = password;
- this.enabled = enabled;
- }
-
- public DocUserDetails(Long userId, String username, String password, boolean enabled,
- Collection authorities) {
- super();
- this.userId = userId;
- this.username = username;
- this.password = password;
- this.enabled = enabled;
- this.authorities = authorities;
- }
-
- public Long getUserId() {
- return this.userId;
- }
-
- @Override
- public Collection getAuthorities() {
- return authorities;
- }
-
- @Override
- public String getPassword() {
- return password;
- }
-
- @Override
- public String getUsername() {
- return username;
- }
-
- @Override
- public boolean isAccountNonExpired() {
- return true;
- }
-
- @Override
- public boolean isAccountNonLocked() {
- return true;
- }
-
- @Override
- public boolean isCredentialsNonExpired() {
- return true;
- }
-
- @Override
- public boolean isEnabled() {
- return enabled;
- }
-
- @Override
- public String toString() {
- return "MyUserDetails [userId=" + userId + ", username=" + username + ", password=" + password + ", enabled="
- + enabled + ", authorities=" + authorities + "]";
- }
-}
\ No newline at end of file
+package com.zyplayer.doc.data.config.security;
+
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.userdetails.UserDetails;
+
+import java.util.Collection;
+
+public class DocUserDetails implements UserDetails {
+ private static final long serialVersionUID = 1L;
+
+ private Long userId;
+ private String username;
+ private String password;
+ private boolean enabled;
+ private Collection authorities;
+
+ public DocUserDetails(Long userId, String username, String password, boolean enabled) {
+ super();
+ this.userId = userId;
+ this.username = username;
+ this.password = password;
+ this.enabled = enabled;
+ }
+
+ public DocUserDetails(Long userId, String username, String password, boolean enabled,
+ Collection authorities) {
+ super();
+ this.userId = userId;
+ this.username = username;
+ this.password = password;
+ this.enabled = enabled;
+ this.authorities = authorities;
+ }
+
+ public Long getUserId() {
+ return this.userId;
+ }
+
+ @Override
+ public Collection getAuthorities() {
+ return authorities;
+ }
+
+ @Override
+ public String getPassword() {
+ return password;
+ }
+
+ @Override
+ public String getUsername() {
+ return username;
+ }
+
+ @Override
+ public boolean isAccountNonExpired() {
+ return true;
+ }
+
+ @Override
+ public boolean isAccountNonLocked() {
+ return true;
+ }
+
+ @Override
+ public boolean isCredentialsNonExpired() {
+ return true;
+ }
+
+ @Override
+ public boolean isEnabled() {
+ return enabled;
+ }
+
+ @Override
+ public String toString() {
+ return "MyUserDetails [userId=" + userId + ", username=" + username + ", password=" + password + ", enabled="
+ + enabled + ", authorities=" + authorities + "]";
+ }
+}
diff --git a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework/config/security/DocUserUtil.java b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/config/security/DocUserUtil.java
similarity index 68%
rename from zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework/config/security/DocUserUtil.java
rename to zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/config/security/DocUserUtil.java
index 4d531cd0..26a5c652 100644
--- a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework/config/security/DocUserUtil.java
+++ b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/config/security/DocUserUtil.java
@@ -1,26 +1,23 @@
-package com.zyplayer.doc.manage.framework.config.security;
-
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.context.SecurityContextHolder;
-
-/**
- * 用户工具类
- */
-public class DocUserUtil {
-
- /**
- * 获取当前用户
- * @return
- */
- public static DocUserDetails getCurrentUser() {
- Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
- Object principal = null;
- if (authentication != null) {
- principal = authentication.getPrincipal();
- }
- if (principal != null && principal instanceof DocUserDetails) {
- return (DocUserDetails) principal;
- }
- return null;
- }
-}
\ No newline at end of file
+package com.zyplayer.doc.data.config.security;
+
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
+
+/**
+ * 用户工具类
+ */
+public class DocUserUtil {
+
+ /**
+ * 获取当前用户
+ * @return 用户信息
+ */
+ public static DocUserDetails getCurrentUser() {
+ Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
+ Object principal = null;
+ if (authentication != null) {
+ principal = authentication.getPrincipal();
+ }
+ return (DocUserDetails) principal;
+ }
+}
diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/AuthInfo.java b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/AuthInfo.java
new file mode 100644
index 00000000..b663aaa0
--- /dev/null
+++ b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/AuthInfo.java
@@ -0,0 +1,106 @@
+package com.zyplayer.doc.data.repository.manage.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ *
+ *
+ *
+ *
+ * @author 暮光：城中城
+ * @since 2018-12-05
+ */
+public class AuthInfo implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键自增ID
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 权限名
+ */
+ 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 +
+ "}";
+ }
+}
diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/UserAuth.java b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/UserAuth.java
new file mode 100644
index 00000000..9b2ff023
--- /dev/null
+++ b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/UserAuth.java
@@ -0,0 +1,132 @@
+package com.zyplayer.doc.data.repository.manage.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ *
+ *
+ *
+ *
+ * @author 暮光：城中城
+ * @since 2018-12-05
+ */
+public class UserAuth implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键自增ID
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 用户ID
+ */
+ private Long userId;
+
+ /**
+ * 权限ID
+ */
+ private Long authId;
+
+ /**
+ * 创建用户ID
+ */
+ private Long createUid;
+
+ /**
+ * 更新用户ID
+ */
+ private Long updateUid;
+
+ /**
+ * 是否删除 0=未删除 1=已删除
+ */
+ private Integer delFlag;
+
+ /**
+ * 创建时间
+ */
+ private Date creationTime;
+
+ /**
+ * 更新时间
+ */
+ private Date updateTime;
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+ public Long getUserId() {
+ return userId;
+ }
+
+ public void setUserId(Long userId) {
+ this.userId = userId;
+ }
+ public Long getAuthId() {
+ return authId;
+ }
+
+ public void setAuthId(Long authId) {
+ this.authId = authId;
+ }
+ public Long getCreateUid() {
+ return createUid;
+ }
+
+ public void setCreateUid(Long createUid) {
+ this.createUid = createUid;
+ }
+ public Long getUpdateUid() {
+ return updateUid;
+ }
+
+ public void setUpdateUid(Long updateUid) {
+ this.updateUid = updateUid;
+ }
+ public Integer getDelFlag() {
+ return delFlag;
+ }
+
+ public void setDelFlag(Integer delFlag) {
+ this.delFlag = delFlag;
+ }
+ public Date getCreationTime() {
+ return creationTime;
+ }
+
+ public void setCreationTime(Date creationTime) {
+ this.creationTime = creationTime;
+ }
+ public Date getUpdateTime() {
+ return updateTime;
+ }
+
+ public void setUpdateTime(Date updateTime) {
+ this.updateTime = updateTime;
+ }
+
+ @Override
+ public String toString() {
+ return "UserAuth{" +
+ "id=" + id +
+ ", userId=" + userId +
+ ", authId=" + authId +
+ ", createUid=" + createUid +
+ ", updateUid=" + updateUid +
+ ", delFlag=" + delFlag +
+ ", creationTime=" + creationTime +
+ ", updateTime=" + updateTime +
+ "}";
+ }
+}
diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/UserInfo.java b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/UserInfo.java
new file mode 100644
index 00000000..6f215e98
--- /dev/null
+++ b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/UserInfo.java
@@ -0,0 +1,158 @@
+package com.zyplayer.doc.data.repository.manage.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ *
+ *
+ *
+ *
+ * @author 暮光：城中城
+ * @since 2018-12-05
+ */
+public class UserInfo implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键自增ID
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 用户编号，用于登录等
+ */
+ private String userNo;
+
+ /**
+ * 密码
+ */
+ private String password;
+
+ /**
+ * 用户名
+ */
+ private String userName;
+
+ /**
+ * 邮箱
+ */
+ private String email;
+
+ /**
+ * 头像
+ */
+ private String avatar;
+
+ /**
+ * 是否删除 0=未删除 1=已删除
+ */
+ private Integer delFlag;
+
+ /**
+ * 创建人
+ */
+ private Long createUid;
+
+ /**
+ * 创建时间
+ */
+ private Date creationTime;
+
+ /**
+ * 修改时间
+ */
+ private Date updateTime;
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+ public String getUserNo() {
+ return userNo;
+ }
+
+ public void setUserNo(String userNo) {
+ this.userNo = userNo;
+ }
+ public String getPassword() {
+ return password;
+ }
+
+ public void setPassword(String password) {
+ this.password = password;
+ }
+ public String getUserName() {
+ return userName;
+ }
+
+ public void setUserName(String userName) {
+ this.userName = userName;
+ }
+ public String getEmail() {
+ return email;
+ }
+
+ public void setEmail(String email) {
+ this.email = email;
+ }
+ public String getAvatar() {
+ return avatar;
+ }
+
+ public void setAvatar(String avatar) {
+ this.avatar = avatar;
+ }
+ public Integer getDelFlag() {
+ return delFlag;
+ }
+
+ public void setDelFlag(Integer delFlag) {
+ this.delFlag = delFlag;
+ }
+ 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;
+ }
+ public Date getUpdateTime() {
+ return updateTime;
+ }
+
+ public void setUpdateTime(Date updateTime) {
+ this.updateTime = updateTime;
+ }
+
+ @Override
+ public String toString() {
+ return "UserInfo{" +
+ "id=" + id +
+ ", userNo=" + userNo +
+ ", password=" + password +
+ ", userName=" + userName +
+ ", email=" + email +
+ ", avatar=" + avatar +
+ ", delFlag=" + delFlag +
+ ", createUid=" + createUid +
+ ", creationTime=" + creationTime +
+ ", updateTime=" + updateTime +
+ "}";
+ }
+}
diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/WikiPage.java b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/WikiPage.java
new file mode 100644
index 00000000..07a4e5f4
--- /dev/null
+++ b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/WikiPage.java
@@ -0,0 +1,144 @@
+package com.zyplayer.doc.data.repository.manage.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+
+/**
+ *
+ *
+ *
+ *
+ * @author 暮光：城中城
+ * @since 2019-02-26
+ */
+public class WikiPage implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键自增ID
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 空间ID
+ */
+ private Long spaceId;
+
+ /**
+ * 名字
+ */
+ private String name;
+
+ /**
+ * 父ID
+ */
+ private Long parentId;
+
+ /**
+ * 创建人ID
+ */
+ private Long createUid;
+
+ /**
+ * 创建时间
+ */
+ private Date createTime;
+
+ /**
+ * 修改人ID
+ */
+ private Long updateUid;
+
+ /**
+ * 修改时间
+ */
+ private Date updateTime;
+
+ /**
+ * 0=有效 1=删除
+ */
+ private Integer delFlag;
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+ public Long getSpaceId() {
+ return spaceId;
+ }
+
+ public void setSpaceId(Long spaceId) {
+ this.spaceId = spaceId;
+ }
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+ public Long getParentId() {
+ return parentId;
+ }
+
+ public void setParentId(Long parentId) {
+ this.parentId = parentId;
+ }
+ public Long getCreateUid() {
+ return createUid;
+ }
+
+ public void setCreateUid(Long createUid) {
+ this.createUid = createUid;
+ }
+ public Date getCreateTime() {
+ return createTime;
+ }
+
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ }
+ public Long getUpdateUid() {
+ return updateUid;
+ }
+
+ public void setUpdateUid(Long updateUid) {
+ this.updateUid = updateUid;
+ }
+ public Date getUpdateTime() {
+ return updateTime;
+ }
+
+ public void setUpdateTime(Date updateTime) {
+ this.updateTime = updateTime;
+ }
+ public Integer getDelFlag() {
+ return delFlag;
+ }
+
+ public void setDelFlag(Integer delFlag) {
+ this.delFlag = delFlag;
+ }
+
+ @Override
+ public String toString() {
+ return "WikiPage{" +
+ "id=" + id +
+ ", spaceId=" + spaceId +
+ ", name=" + name +
+ ", parentId=" + parentId +
+ ", createUid=" + createUid +
+ ", createTime=" + createTime +
+ ", updateUid=" + updateUid +
+ ", updateTime=" + updateTime +
+ ", delFlag=" + delFlag +
+ "}";
+ }
+}
diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/WikiPageComment.java b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/WikiPageComment.java
new file mode 100644
index 00000000..0f7c3d53
--- /dev/null
+++ b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/WikiPageComment.java
@@ -0,0 +1,118 @@
+package com.zyplayer.doc.data.repository.manage.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+
+/**
+ *
+ *
+ *
+ *
+ * @author 暮光：城中城
+ * @since 2019-02-26
+ */
+public class WikiPageComment implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键自增ID
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 页面ID
+ */
+ private Long pageId;
+
+ /**
+ * 父评论ID
+ */
+ private Long parentId;
+
+ /**
+ * 评论内容
+ */
+ private String content;
+
+ /**
+ * 创建人ID
+ */
+ private Long createUid;
+
+ /**
+ * 创建时间
+ */
+ private Date createTime;
+
+ /**
+ * 0=有效 1=删除
+ */
+ private Integer delFlag;
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+ public Long getPageId() {
+ return pageId;
+ }
+
+ public void setPageId(Long pageId) {
+ this.pageId = pageId;
+ }
+ public Long getParentId() {
+ return parentId;
+ }
+
+ public void setParentId(Long parentId) {
+ this.parentId = parentId;
+ }
+ public String getContent() {
+ return content;
+ }
+
+ public void setContent(String content) {
+ this.content = content;
+ }
+ public Long getCreateUid() {
+ return createUid;
+ }
+
+ public void setCreateUid(Long createUid) {
+ this.createUid = createUid;
+ }
+ public Date getCreateTime() {
+ return createTime;
+ }
+
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ }
+ public Integer getDelFlag() {
+ return delFlag;
+ }
+
+ public void setDelFlag(Integer delFlag) {
+ this.delFlag = delFlag;
+ }
+
+ @Override
+ public String toString() {
+ return "WikiPageComment{" +
+ "id=" + id +
+ ", pageId=" + pageId +
+ ", parentId=" + parentId +
+ ", content=" + content +
+ ", createUid=" + createUid +
+ ", createTime=" + createTime +
+ ", delFlag=" + delFlag +
+ "}";
+ }
+}
diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/WikiPageContent.java b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/WikiPageContent.java
new file mode 100644
index 00000000..6cbe4e2d
--- /dev/null
+++ b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/WikiPageContent.java
@@ -0,0 +1,118 @@
+package com.zyplayer.doc.data.repository.manage.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+
+/**
+ *
+ *
+ *
+ *
+ * @author 暮光：城中城
+ * @since 2019-02-26
+ */
+public class WikiPageContent implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键自增ID
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 页面ID
+ */
+ private Long pageId;
+
+ /**
+ * 内容
+ */
+ private String content;
+
+ /**
+ * 创建人ID
+ */
+ private Long createUid;
+
+ /**
+ * 创建时间
+ */
+ private Date createTime;
+
+ /**
+ * 修改人ID
+ */
+ private Long updateUid;
+
+ /**
+ * 修改时间
+ */
+ private Date updateTime;
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+ public Long getPageId() {
+ return pageId;
+ }
+
+ public void setPageId(Long pageId) {
+ this.pageId = pageId;
+ }
+ public String getContent() {
+ return content;
+ }
+
+ public void setContent(String content) {
+ this.content = content;
+ }
+ public Long getCreateUid() {
+ return createUid;
+ }
+
+ public void setCreateUid(Long createUid) {
+ this.createUid = createUid;
+ }
+ public Date getCreateTime() {
+ return createTime;
+ }
+
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ }
+ public Long getUpdateUid() {
+ return updateUid;
+ }
+
+ public void setUpdateUid(Long updateUid) {
+ this.updateUid = updateUid;
+ }
+ public Date getUpdateTime() {
+ return updateTime;
+ }
+
+ public void setUpdateTime(Date updateTime) {
+ this.updateTime = updateTime;
+ }
+
+ @Override
+ public String toString() {
+ return "WikiPageContent{" +
+ "id=" + id +
+ ", pageId=" + pageId +
+ ", content=" + content +
+ ", createUid=" + createUid +
+ ", createTime=" + createTime +
+ ", updateUid=" + updateUid +
+ ", updateTime=" + updateTime +
+ "}";
+ }
+}
diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/WikiPageFile.java b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/WikiPageFile.java
new file mode 100644
index 00000000..4273949c
--- /dev/null
+++ b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/WikiPageFile.java
@@ -0,0 +1,132 @@
+package com.zyplayer.doc.data.repository.manage.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ *
+ *
+ *
+ *
+ * @author 暮光：城中城
+ * @since 2019-02-26
+ */
+public class WikiPageFile implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键自增ID
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 页面ID
+ */
+ private Long pageId;
+
+ /**
+ * 文件URL
+ */
+ private String fileUrl;
+
+ /**
+ * 创建人ID
+ */
+ private Long createUid;
+
+ /**
+ * 创建时间
+ */
+ private Date createTime;
+
+ /**
+ * 修改人ID
+ */
+ private Long updateUid;
+
+ /**
+ * 修改时间
+ */
+ private Date updateTime;
+
+ /**
+ * 0=有效 1=删除
+ */
+ private Integer delFlag;
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+ public Long getPageId() {
+ return pageId;
+ }
+
+ public void setPageId(Long pageId) {
+ this.pageId = pageId;
+ }
+ public String getFileUrl() {
+ return fileUrl;
+ }
+
+ public void setFileUrl(String fileUrl) {
+ this.fileUrl = fileUrl;
+ }
+ public Long getCreateUid() {
+ return createUid;
+ }
+
+ public void setCreateUid(Long createUid) {
+ this.createUid = createUid;
+ }
+ public Date getCreateTime() {
+ return createTime;
+ }
+
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ }
+ public Long getUpdateUid() {
+ return updateUid;
+ }
+
+ public void setUpdateUid(Long updateUid) {
+ this.updateUid = updateUid;
+ }
+ public Date getUpdateTime() {
+ return updateTime;
+ }
+
+ public void setUpdateTime(Date updateTime) {
+ this.updateTime = updateTime;
+ }
+ public Integer getDelFlag() {
+ return delFlag;
+ }
+
+ public void setDelFlag(Integer delFlag) {
+ this.delFlag = delFlag;
+ }
+
+ @Override
+ public String toString() {
+ return "WikiPageFile{" +
+ "id=" + id +
+ ", pageId=" + pageId +
+ ", fileUrl=" + fileUrl +
+ ", createUid=" + createUid +
+ ", createTime=" + createTime +
+ ", updateUid=" + updateUid +
+ ", updateTime=" + updateTime +
+ ", delFlag=" + delFlag +
+ "}";
+ }
+}
diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/WikiPageZan.java b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/WikiPageZan.java
new file mode 100644
index 00000000..80b7143d
--- /dev/null
+++ b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/WikiPageZan.java
@@ -0,0 +1,93 @@
+package com.zyplayer.doc.data.repository.manage.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ *
+ *
+ *
+ *
+ * @author 暮光：城中城
+ * @since 2019-02-26
+ */
+public class WikiPageZan implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键自增ID
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 页面ID
+ */
+ private Long pageId;
+
+ /**
+ * 评论ID
+ */
+ private Long commentId;
+
+ /**
+ * 创建人ID
+ */
+ private Long createUid;
+
+ /**
+ * 创建时间
+ */
+ private Date createTime;
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+ public Long getPageId() {
+ return pageId;
+ }
+
+ public void setPageId(Long pageId) {
+ this.pageId = pageId;
+ }
+ public Long getCommentId() {
+ return commentId;
+ }
+
+ public void setCommentId(Long commentId) {
+ this.commentId = commentId;
+ }
+ public Long getCreateUid() {
+ return createUid;
+ }
+
+ public void setCreateUid(Long createUid) {
+ this.createUid = createUid;
+ }
+ public Date getCreateTime() {
+ return createTime;
+ }
+
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ }
+
+ @Override
+ public String toString() {
+ return "WikiPageZan{" +
+ "id=" + id +
+ ", pageId=" + pageId +
+ ", commentId=" + commentId +
+ ", createUid=" + createUid +
+ ", createTime=" + createTime +
+ "}";
+ }
+}
diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/WikiSpace.java b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/WikiSpace.java
new file mode 100644
index 00000000..78943152
--- /dev/null
+++ b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/WikiSpace.java
@@ -0,0 +1,106 @@
+package com.zyplayer.doc.data.repository.manage.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ *
+ *
+ *
+ *
+ * @author 暮光：城中城
+ * @since 2019-02-26
+ */
+public class WikiSpace implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键自增ID
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 空间名
+ */
+ private String name;
+
+ /**
+ * 空间类型 1=公司 2=个人 3=私人
+ */
+ private Integer type;
+
+ /**
+ * 描述
+ */
+ private String explain;
+
+ /**
+ * 创建人ID
+ */
+ private Long createUid;
+
+ /**
+ * 创建时间
+ */
+ private Date createTime;
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+ public Integer getType() {
+ return type;
+ }
+
+ public void setType(Integer type) {
+ this.type = type;
+ }
+ public String getExplain() {
+ return explain;
+ }
+
+ public void setExplain(String explain) {
+ this.explain = explain;
+ }
+ public Long getCreateUid() {
+ return createUid;
+ }
+
+ public void setCreateUid(Long createUid) {
+ this.createUid = createUid;
+ }
+ public Date getCreateTime() {
+ return createTime;
+ }
+
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ }
+
+ @Override
+ public String toString() {
+ return "WikiSpace{" +
+ "id=" + id +
+ ", name=" + name +
+ ", type=" + type +
+ ", explain=" + explain +
+ ", createUid=" + createUid +
+ ", createTime=" + createTime +
+ "}";
+ }
+}
diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/ZyplayerStorage.java b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/ZyplayerStorage.java
new file mode 100644
index 00000000..7f205e8b
--- /dev/null
+++ b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/ZyplayerStorage.java
@@ -0,0 +1,66 @@
+package com.zyplayer.doc.data.repository.manage.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ *
+ *
+ *
+ *
+ * @author 暮光：城中城
+ * @since 2018-11-27
+ */
+public class ZyplayerStorage implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ private String docKey;
+
+ private String docValue;
+
+ private Date creationTime;
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public String getDocKey() {
+ return docKey;
+ }
+
+ public void setDocKey(String docKey) {
+ this.docKey = docKey;
+ }
+
+ public String getDocValue() {
+ return docValue;
+ }
+
+ public void setDocValue(String docValue) {
+ this.docValue = docValue;
+ }
+
+ public Date getCreationTime() {
+ return creationTime;
+ }
+
+ public void setCreationTime(Date creationTime) {
+ this.creationTime = creationTime;
+ }
+
+ @Override
+ public String toString() {
+ return "ZyplayerStorage{" + "id=" + id + ", docKey=" + docKey + ", docValue=" + docValue + ", creationTime=" + creationTime + "}";
+ }
+}
diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/AuthInfoMapper.java b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/AuthInfoMapper.java
new file mode 100644
index 00000000..43b8dcb1
--- /dev/null
+++ b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/AuthInfoMapper.java
@@ -0,0 +1,16 @@
+package com.zyplayer.doc.data.repository.manage.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zyplayer.doc.data.repository.manage.entity.AuthInfo;
+
+/**
+ *
+ * Mapper 接口
+ *
+ *
+ * @author 暮光：城中城
+ * @since 2018-12-03
+ */
+public interface AuthInfoMapper extends BaseMapper {
+
+}
diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/UserAuthMapper.java b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/UserAuthMapper.java
new file mode 100644
index 00000000..d59f99dc
--- /dev/null
+++ b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/UserAuthMapper.java
@@ -0,0 +1,16 @@
+package com.zyplayer.doc.data.repository.manage.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zyplayer.doc.data.repository.manage.entity.UserAuth;
+
+/**
+ *
+ * Mapper 接口
+ *
+ *
+ * @author 暮光：城中城
+ * @since 2018-12-03
+ */
+public interface UserAuthMapper extends BaseMapper {
+
+}
diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/UserInfoMapper.java b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/UserInfoMapper.java
new file mode 100644
index 00000000..49abd4e3
--- /dev/null
+++ b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/UserInfoMapper.java
@@ -0,0 +1,16 @@
+package com.zyplayer.doc.data.repository.manage.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zyplayer.doc.data.repository.manage.entity.UserInfo;
+
+/**
+ *
+ * Mapper 接口
+ *
+ *
+ * @author 暮光：城中城
+ * @since 2018-12-03
+ */
+public interface UserInfoMapper extends BaseMapper {
+
+}
diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/WikiPageCommentMapper.java b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/WikiPageCommentMapper.java
new file mode 100644
index 00000000..7429a0c9
--- /dev/null
+++ b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/WikiPageCommentMapper.java
@@ -0,0 +1,16 @@
+package com.zyplayer.doc.data.repository.manage.mapper;
+
+import com.zyplayer.doc.data.repository.manage.entity.WikiPageComment;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ *
+ * Mapper 接口
+ *
+ *
+ * @author 暮光：城中城
+ * @since 2019-02-26
+ */
+public interface WikiPageCommentMapper extends BaseMapper {
+
+}
diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/WikiPageContentMapper.java b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/WikiPageContentMapper.java
new file mode 100644
index 00000000..7285c0f9
--- /dev/null
+++ b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/WikiPageContentMapper.java
@@ -0,0 +1,16 @@
+package com.zyplayer.doc.data.repository.manage.mapper;
+
+import com.zyplayer.doc.data.repository.manage.entity.WikiPageContent;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ *
+ * Mapper 接口
+ *
+ *
+ * @author 暮光：城中城
+ * @since 2019-02-26
+ */
+public interface WikiPageContentMapper extends BaseMapper {
+
+}
diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/WikiPageFileMapper.java b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/WikiPageFileMapper.java
new file mode 100644
index 00000000..2b610d22
--- /dev/null
+++ b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/WikiPageFileMapper.java
@@ -0,0 +1,16 @@
+package com.zyplayer.doc.data.repository.manage.mapper;
+
+import com.zyplayer.doc.data.repository.manage.entity.WikiPageFile;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ *
+ * Mapper 接口
+ *
+ *
+ * @author 暮光：城中城
+ * @since 2019-02-26
+ */
+public interface WikiPageFileMapper extends BaseMapper {
+
+}
diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/WikiPageMapper.java b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/WikiPageMapper.java
new file mode 100644
index 00000000..65d7c42a
--- /dev/null
+++ b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/WikiPageMapper.java
@@ -0,0 +1,16 @@
+package com.zyplayer.doc.data.repository.manage.mapper;
+
+import com.zyplayer.doc.data.repository.manage.entity.WikiPage;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ *
+ * Mapper 接口
+ *
+ *
+ * @author 暮光：城中城
+ * @since 2019-02-26
+ */
+public interface WikiPageMapper extends BaseMapper {
+
+}
diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/WikiPageZanMapper.java b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/WikiPageZanMapper.java
new file mode 100644
index 00000000..43a12012
--- /dev/null
+++ b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/WikiPageZanMapper.java
@@ -0,0 +1,16 @@
+package com.zyplayer.doc.data.repository.manage.mapper;
+
+import com.zyplayer.doc.data.repository.manage.entity.WikiPageZan;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ *
+ * Mapper 接口
+ *
+ *
+ * @author 暮光：城中城
+ * @since 2019-02-26
+ */
+public interface WikiPageZanMapper extends BaseMapper {
+
+}
diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/WikiSpaceMapper.java b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/WikiSpaceMapper.java
new file mode 100644
index 00000000..e6ed40f4
--- /dev/null
+++ b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/WikiSpaceMapper.java
@@ -0,0 +1,16 @@
+package com.zyplayer.doc.data.repository.manage.mapper;
+
+import com.zyplayer.doc.data.repository.manage.entity.WikiSpace;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ *
+ * Mapper 接口
+ *
+ *
+ * @author 暮光：城中城
+ * @since 2019-02-26
+ */
+public interface WikiSpaceMapper extends BaseMapper {
+
+}
diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/ZyplayerStorageMapper.java b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/ZyplayerStorageMapper.java
new file mode 100644
index 00000000..1fbc657c
--- /dev/null
+++ b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/ZyplayerStorageMapper.java
@@ -0,0 +1,18 @@
+package com.zyplayer.doc.data.repository.manage.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zyplayer.doc.data.repository.manage.entity.ZyplayerStorage;
+
+/**
+ *
+ * Mapper 接口
+ *
+ *
+ * @author 暮光：城中城
+ * @since 2018-11-27
+ */
+public interface ZyplayerStorageMapper extends BaseMapper {
+
+ Integer selectTop();
+
+}
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
new file mode 100644
index 00000000..33ad8128
--- /dev/null
+++ b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/support/generator/CodeGenerator.java
@@ -0,0 +1,93 @@
+package com.zyplayer.doc.data.repository.support.generator;
+
+import com.baomidou.mybatisplus.core.toolkit.StringPool;
+import com.baomidou.mybatisplus.generator.AutoGenerator;
+import com.baomidou.mybatisplus.generator.InjectionConfig;
+import com.baomidou.mybatisplus.generator.config.*;
+import com.baomidou.mybatisplus.generator.config.po.TableInfo;
+import com.baomidou.mybatisplus.generator.config.rules.DateType;
+import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
+import com.baomidou.mybatisplus.generator.engine.FreemarkerTemplateEngine;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class CodeGenerator {
+
+ public static void main(String[] args) {
+
+ final String moduleName = "manage";
+// final String[] tableName = { "zyplayer_storage", "auth_info", "user_auth", "user_info" };
+// final String[] tableName = { "wiki_space", "wiki_page", "wiki_page_content", "wiki_page_file", "wiki_page_comment", "wiki_page_zan" };
+ final String[] tableName = { "wiki_page", "wiki_page_comment" };
+
+ // 代码生成器
+ AutoGenerator mpg = new AutoGenerator();
+ // 全局配置
+ GlobalConfig gc = new GlobalConfig();
+ final String projectPath = System.getProperty("user.dir") + "/zyplayer-doc-data";
+ gc.setOutputDir(projectPath + "/src/main/java");
+ gc.setAuthor("暮光：城中城");
+ gc.setOpen(false);
+ gc.setFileOverride(true);// 是否覆盖
+ gc.setDateType(DateType.ONLY_DATE);
+ gc.setServiceName("%sService");
+ gc.setControllerName("Generator%sController");
+ mpg.setGlobalConfig(gc);
+
+ // 数据源配置
+ DataSourceConfig dsc = new DataSourceConfig();
+ dsc.setUrl("jdbc:mysql://127.0.0.1:3306/zyplayer_doc_manage?useUnicode=true&useSSL=false&characterEncoding=utf8");
+ // dsc.setSchemaName("public");
+ dsc.setDriverName("com.mysql.jdbc.Driver");
+ dsc.setUsername("root");
+ dsc.setPassword("root");
+ mpg.setDataSource(dsc);
+
+ // 包配置
+ final PackageConfig pc = new PackageConfig();
+ pc.setModuleName(null);
+ pc.setParent("com.zyplayer.doc.data");
+ pc.setController("web.generator");
+ pc.setEntity("repository.manage.entity");
+ pc.setMapper("repository.manage.mapper");
+ pc.setService("service.manage");
+ pc.setServiceImpl("service.manage.impl");
+ mpg.setPackageInfo(pc);
+
+ // 自定义配置
+ InjectionConfig cfg = new InjectionConfig() {
+ @Override
+ public void initMap() {
+ // to do nothing
+ }
+ };
+ List focList = new ArrayList<>();
+ focList.add(new FileOutConfig("/templates/mapper.xml.ftl") {
+ @Override
+ public String outputFile(TableInfo tableInfo) {
+ return projectPath + "/src/main/resources/mapper/" + moduleName + "/" + tableInfo.getEntityName() + "Mapper" + StringPool.DOT_XML;
+ }
+ });
+ cfg.setFileOutConfigList(focList);
+ mpg.setCfg(cfg);
+ mpg.setTemplate(new TemplateConfig().setXml(null));
+
+ // 策略配置
+ StrategyConfig strategy = new StrategyConfig();
+ strategy.setNaming(NamingStrategy.underline_to_camel);
+ strategy.setColumnNaming(NamingStrategy.underline_to_camel);
+ // strategy.setSuperEntityClass("com.baomidou.ant.common.BaseEntity");
+ strategy.setEntityLombokModel(false);
+ strategy.setRestControllerStyle(true);
+ // strategy.setSuperControllerClass("com.baomidou.ant.common.BaseController");
+ // strategy.setSuperEntityColumns("id");
+ strategy.setInclude(tableName);// 表名
+ strategy.setControllerMappingHyphenStyle(true);
+ strategy.setTablePrefix(pc.getModuleName() + "_");
+ mpg.setStrategy(strategy);
+ mpg.setTemplateEngine(new FreemarkerTemplateEngine());
+ mpg.execute();
+ }
+
+}
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
new file mode 100644
index 00000000..37f94f27
--- /dev/null
+++ b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/support/interceptor/SqlLogInterceptor.java
@@ -0,0 +1,123 @@
+package com.zyplayer.doc.data.repository.support.interceptor;
+
+import org.apache.ibatis.executor.Executor;
+import org.apache.ibatis.mapping.BoundSql;
+import org.apache.ibatis.mapping.MappedStatement;
+import org.apache.ibatis.mapping.ParameterMapping;
+import org.apache.ibatis.plugin.*;
+import org.apache.ibatis.reflection.MetaObject;
+import org.apache.ibatis.session.Configuration;
+import org.apache.ibatis.session.ResultHandler;
+import org.apache.ibatis.session.RowBounds;
+import org.apache.ibatis.type.TypeHandlerRegistry;
+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.Properties;
+
+@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 })
+})
+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];
+ Object parameter = null;
+ if (invocation.getArgs().length > 1) {
+ parameter = invocation.getArgs()[1];
+ }
+ BoundSql boundSql = mappedStatement.getBoundSql(parameter);
+ Configuration configuration = mappedStatement.getConfiguration();
+ // 获取sql语句
+ String sql = getSqlString(configuration, boundSql);
+ LOGGER.info(sql);
+ // 执行结果
+ return invocation.proceed();
+ }
+
+ @Override
+ public Object plugin(Object target) {
+ if (target instanceof Executor) {
+ return Plugin.wrap(target, this);
+ } else {
+ return target;
+ }
+ }
+
+ @Override
+ public void setProperties(Properties properties) {
+ }
+
+ private String getParameterValue(Object obj) {
+ String value = null;
+ 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) + "'";
+ //System.out.println(value);
+ } else {
+ if (obj != null) {
+ value = obj.toString();
+ } else {
+ value = "'null'";
+ }
+ }
+ return value;
+ }
+
+ public String getSqlString(Configuration configuration, BoundSql boundSql) {
+ Object parameterObject = boundSql.getParameterObject();
+ List parameterMappings = boundSql.getParameterMappings();
+ StringBuilder sqlSb = new StringBuilder(boundSql.getSql().replaceAll("[\\s]+", " "));
+ int fromIndex = 0;
+ if (parameterMappings.size() > 0 && parameterObject != null) {
+ TypeHandlerRegistry typeHandlerRegistry = configuration.getTypeHandlerRegistry();
+ if (typeHandlerRegistry.hasTypeHandler(parameterObject.getClass())) {
+ //sqlSb = sqlSb.replaceFirst("\\?", getParameterValue(parameterObject));
+ fromIndex = replacePlaceholder(sqlSb, fromIndex, getParameterValue(parameterObject));
+ } else {
+ MetaObject metaObject = configuration.newMetaObject(parameterObject);
+ for (ParameterMapping parameterMapping : parameterMappings) {
+ String propertyName = parameterMapping.getProperty();
+ if (metaObject.hasGetter(propertyName)) {
+ Object obj = metaObject.getValue(propertyName);
+ //sqlSb = sqlSb.replaceFirst("\\?", getParameterValue(obj));
+ fromIndex = replacePlaceholder(sqlSb, fromIndex, getParameterValue(obj));
+ } else if (boundSql.hasAdditionalParameter(propertyName)) {
+ Object obj = boundSql.getAdditionalParameter(propertyName);
+ //sqlSb = sqlSb.replaceFirst("\\?", getParameterValue(obj));
+ fromIndex = replacePlaceholder(sqlSb, fromIndex, getParameterValue(obj));
+ }
+ }
+ }
+ }
+ return sqlSb.toString();
+ }
+
+ /**
+ * 替换？占位符
+ * @author 暮光：城中城
+ * @since 2018年10月27日
+ * @param sql
+ * @param fromIndex
+ * @param replaceStr
+ * @return
+ */
+ private 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-data/src/main/java/com/zyplayer/doc/data/service/manage/AuthInfoService.java b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/AuthInfoService.java
new file mode 100644
index 00000000..5db71bf5
--- /dev/null
+++ b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/AuthInfoService.java
@@ -0,0 +1,16 @@
+package com.zyplayer.doc.data.service.manage;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zyplayer.doc.data.repository.manage.entity.AuthInfo;
+
+/**
+ *
+ * 服务类
+ *
+ *
+ * @author 暮光：城中城
+ * @since 2018-12-03
+ */
+public interface AuthInfoService extends IService {
+
+}
diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/UserAuthService.java b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/UserAuthService.java
new file mode 100644
index 00000000..0b2ef1ed
--- /dev/null
+++ b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/UserAuthService.java
@@ -0,0 +1,16 @@
+package com.zyplayer.doc.data.service.manage;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zyplayer.doc.data.repository.manage.entity.UserAuth;
+
+/**
+ *
+ * 服务类
+ *
+ *
+ * @author 暮光：城中城
+ * @since 2018-12-03
+ */
+public interface UserAuthService extends IService {
+
+}
diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/UserInfoService.java b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/UserInfoService.java
new file mode 100644
index 00000000..e0240e87
--- /dev/null
+++ b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/UserInfoService.java
@@ -0,0 +1,16 @@
+package com.zyplayer.doc.data.service.manage;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zyplayer.doc.data.repository.manage.entity.UserInfo;
+
+/**
+ *
+ * 服务类
+ *
+ *
+ * @author 暮光：城中城
+ * @since 2018-12-03
+ */
+public interface UserInfoService extends IService {
+
+}
diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/WikiPageCommentService.java b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/WikiPageCommentService.java
new file mode 100644
index 00000000..a616ac26
--- /dev/null
+++ b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/WikiPageCommentService.java
@@ -0,0 +1,16 @@
+package com.zyplayer.doc.data.service.manage;
+
+import com.zyplayer.doc.data.repository.manage.entity.WikiPageComment;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ *
+ * 服务类
+ *
+ *
+ * @author 暮光：城中城
+ * @since 2019-02-26
+ */
+public interface WikiPageCommentService extends IService {
+
+}
diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/WikiPageContentService.java b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/WikiPageContentService.java
new file mode 100644
index 00000000..3fc95543
--- /dev/null
+++ b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/WikiPageContentService.java
@@ -0,0 +1,16 @@
+package com.zyplayer.doc.data.service.manage;
+
+import com.zyplayer.doc.data.repository.manage.entity.WikiPageContent;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ *
+ * 服务类
+ *
+ *
+ * @author 暮光：城中城
+ * @since 2019-02-26
+ */
+public interface WikiPageContentService extends IService {
+
+}
diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/WikiPageFileService.java b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/WikiPageFileService.java
new file mode 100644
index 00000000..38866d0c
--- /dev/null
+++ b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/WikiPageFileService.java
@@ -0,0 +1,16 @@
+package com.zyplayer.doc.data.service.manage;
+
+import com.zyplayer.doc.data.repository.manage.entity.WikiPageFile;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ *
+ * 服务类
+ *
+ *
+ * @author 暮光：城中城
+ * @since 2019-02-26
+ */
+public interface WikiPageFileService extends IService {
+
+}
diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/WikiPageService.java b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/WikiPageService.java
new file mode 100644
index 00000000..0e697971
--- /dev/null
+++ b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/WikiPageService.java
@@ -0,0 +1,16 @@
+package com.zyplayer.doc.data.service.manage;
+
+import com.zyplayer.doc.data.repository.manage.entity.WikiPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ *
+ * 服务类
+ *
+ *
+ * @author 暮光：城中城
+ * @since 2019-02-26
+ */
+public interface WikiPageService extends IService {
+
+}
diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/WikiPageZanService.java b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/WikiPageZanService.java
new file mode 100644
index 00000000..e46e6cbe
--- /dev/null
+++ b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/WikiPageZanService.java
@@ -0,0 +1,16 @@
+package com.zyplayer.doc.data.service.manage;
+
+import com.zyplayer.doc.data.repository.manage.entity.WikiPageZan;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ *
+ * 服务类
+ *
+ *
+ * @author 暮光：城中城
+ * @since 2019-02-26
+ */
+public interface WikiPageZanService extends IService {
+
+}
diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/WikiSpaceService.java b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/WikiSpaceService.java
new file mode 100644
index 00000000..204bb85e
--- /dev/null
+++ b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/WikiSpaceService.java
@@ -0,0 +1,16 @@
+package com.zyplayer.doc.data.service.manage;
+
+import com.zyplayer.doc.data.repository.manage.entity.WikiSpace;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ *
+ * 服务类
+ *
+ *
+ * @author 暮光：城中城
+ * @since 2019-02-26
+ */
+public interface WikiSpaceService extends IService {
+
+}
diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/ZyplayerStorageService.java b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/ZyplayerStorageService.java
new file mode 100644
index 00000000..34fa6b0e
--- /dev/null
+++ b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/ZyplayerStorageService.java
@@ -0,0 +1,16 @@
+package com.zyplayer.doc.data.service.manage;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zyplayer.doc.data.repository.manage.entity.ZyplayerStorage;
+
+/**
+ *
+ * 服务类
+ *
+ *
+ * @author 暮光：城中城
+ * @since 2018-11-27
+ */
+public interface ZyplayerStorageService extends IService {
+
+}
diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/AuthInfoServiceImpl.java b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/AuthInfoServiceImpl.java
new file mode 100644
index 00000000..d70c32d8
--- /dev/null
+++ b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/AuthInfoServiceImpl.java
@@ -0,0 +1,20 @@
+package com.zyplayer.doc.data.service.manage.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zyplayer.doc.data.repository.manage.entity.AuthInfo;
+import com.zyplayer.doc.data.repository.manage.mapper.AuthInfoMapper;
+import com.zyplayer.doc.data.service.manage.AuthInfoService;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ * 服务实现类
+ *
+ *
+ * @author 暮光：城中城
+ * @since 2018-12-03
+ */
+@Service
+public class AuthInfoServiceImpl extends ServiceImpl implements AuthInfoService {
+
+}
diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/UserAuthServiceImpl.java b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/UserAuthServiceImpl.java
new file mode 100644
index 00000000..6b37634f
--- /dev/null
+++ b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/UserAuthServiceImpl.java
@@ -0,0 +1,20 @@
+package com.zyplayer.doc.data.service.manage.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zyplayer.doc.data.repository.manage.entity.UserAuth;
+import com.zyplayer.doc.data.repository.manage.mapper.UserAuthMapper;
+import com.zyplayer.doc.data.service.manage.UserAuthService;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ * 服务实现类
+ *
+ *
+ * @author 暮光：城中城
+ * @since 2018-12-03
+ */
+@Service
+public class UserAuthServiceImpl extends ServiceImpl implements UserAuthService {
+
+}
diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/UserInfoServiceImpl.java b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/UserInfoServiceImpl.java
new file mode 100644
index 00000000..536ba734
--- /dev/null
+++ b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/UserInfoServiceImpl.java
@@ -0,0 +1,20 @@
+package com.zyplayer.doc.data.service.manage.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zyplayer.doc.data.repository.manage.entity.UserInfo;
+import com.zyplayer.doc.data.repository.manage.mapper.UserInfoMapper;
+import com.zyplayer.doc.data.service.manage.UserInfoService;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ * 服务实现类
+ *
+ *
+ * @author 暮光：城中城
+ * @since 2018-12-03
+ */
+@Service
+public class UserInfoServiceImpl extends ServiceImpl implements UserInfoService {
+
+}
diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/WikiPageCommentServiceImpl.java b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/WikiPageCommentServiceImpl.java
new file mode 100644
index 00000000..6936b0a1
--- /dev/null
+++ b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/WikiPageCommentServiceImpl.java
@@ -0,0 +1,20 @@
+package com.zyplayer.doc.data.service.manage.impl;
+
+import com.zyplayer.doc.data.repository.manage.entity.WikiPageComment;
+import com.zyplayer.doc.data.repository.manage.mapper.WikiPageCommentMapper;
+import com.zyplayer.doc.data.service.manage.WikiPageCommentService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ * 服务实现类
+ *
+ *
+ * @author 暮光：城中城
+ * @since 2019-02-26
+ */
+@Service
+public class WikiPageCommentServiceImpl extends ServiceImpl implements WikiPageCommentService {
+
+}
diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/WikiPageContentServiceImpl.java b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/WikiPageContentServiceImpl.java
new file mode 100644
index 00000000..a3a8deb7
--- /dev/null
+++ b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/WikiPageContentServiceImpl.java
@@ -0,0 +1,20 @@
+package com.zyplayer.doc.data.service.manage.impl;
+
+import com.zyplayer.doc.data.repository.manage.entity.WikiPageContent;
+import com.zyplayer.doc.data.repository.manage.mapper.WikiPageContentMapper;
+import com.zyplayer.doc.data.service.manage.WikiPageContentService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ * 服务实现类
+ *
+ *
+ * @author 暮光：城中城
+ * @since 2019-02-26
+ */
+@Service
+public class WikiPageContentServiceImpl extends ServiceImpl implements WikiPageContentService {
+
+}
diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/WikiPageFileServiceImpl.java b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/WikiPageFileServiceImpl.java
new file mode 100644
index 00000000..78a5d925
--- /dev/null
+++ b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/WikiPageFileServiceImpl.java
@@ -0,0 +1,20 @@
+package com.zyplayer.doc.data.service.manage.impl;
+
+import com.zyplayer.doc.data.repository.manage.entity.WikiPageFile;
+import com.zyplayer.doc.data.repository.manage.mapper.WikiPageFileMapper;
+import com.zyplayer.doc.data.service.manage.WikiPageFileService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ * 服务实现类
+ *
+ *
+ * @author 暮光：城中城
+ * @since 2019-02-26
+ */
+@Service
+public class WikiPageFileServiceImpl extends ServiceImpl implements WikiPageFileService {
+
+}
diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/WikiPageServiceImpl.java b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/WikiPageServiceImpl.java
new file mode 100644
index 00000000..93ad9a03
--- /dev/null
+++ b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/WikiPageServiceImpl.java
@@ -0,0 +1,20 @@
+package com.zyplayer.doc.data.service.manage.impl;
+
+import com.zyplayer.doc.data.repository.manage.entity.WikiPage;
+import com.zyplayer.doc.data.repository.manage.mapper.WikiPageMapper;
+import com.zyplayer.doc.data.service.manage.WikiPageService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ * 服务实现类
+ *
+ *
+ * @author 暮光：城中城
+ * @since 2019-02-26
+ */
+@Service
+public class WikiPageServiceImpl extends ServiceImpl implements WikiPageService {
+
+}
diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/WikiPageZanServiceImpl.java b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/WikiPageZanServiceImpl.java
new file mode 100644
index 00000000..728a2c2a
--- /dev/null
+++ b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/WikiPageZanServiceImpl.java
@@ -0,0 +1,20 @@
+package com.zyplayer.doc.data.service.manage.impl;
+
+import com.zyplayer.doc.data.repository.manage.entity.WikiPageZan;
+import com.zyplayer.doc.data.repository.manage.mapper.WikiPageZanMapper;
+import com.zyplayer.doc.data.service.manage.WikiPageZanService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ * 服务实现类
+ *
+ *
+ * @author 暮光：城中城
+ * @since 2019-02-26
+ */
+@Service
+public class WikiPageZanServiceImpl extends ServiceImpl implements WikiPageZanService {
+
+}
diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/WikiSpaceServiceImpl.java b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/WikiSpaceServiceImpl.java
new file mode 100644
index 00000000..77637790
--- /dev/null
+++ b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/WikiSpaceServiceImpl.java
@@ -0,0 +1,20 @@
+package com.zyplayer.doc.data.service.manage.impl;
+
+import com.zyplayer.doc.data.repository.manage.entity.WikiSpace;
+import com.zyplayer.doc.data.repository.manage.mapper.WikiSpaceMapper;
+import com.zyplayer.doc.data.service.manage.WikiSpaceService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ * 服务实现类
+ *
+ *
+ * @author 暮光：城中城
+ * @since 2019-02-26
+ */
+@Service
+public class WikiSpaceServiceImpl extends ServiceImpl implements WikiSpaceService {
+
+}
diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/ZyplayerStorageServiceImpl.java b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/ZyplayerStorageServiceImpl.java
new file mode 100644
index 00000000..fb2130e4
--- /dev/null
+++ b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/ZyplayerStorageServiceImpl.java
@@ -0,0 +1,20 @@
+package com.zyplayer.doc.data.service.manage.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zyplayer.doc.data.repository.manage.entity.ZyplayerStorage;
+import com.zyplayer.doc.data.repository.manage.mapper.ZyplayerStorageMapper;
+import com.zyplayer.doc.data.service.manage.ZyplayerStorageService;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ * 服务实现类
+ *
+ *
+ * @author 暮光：城中城
+ * @since 2018-11-27
+ */
+@Service
+public class ZyplayerStorageServiceImpl extends ServiceImpl implements ZyplayerStorageService {
+
+}
diff --git a/zyplayer-doc-manage/src/main/resources/mapper/manage/AuthInfoMapper.xml b/zyplayer-doc-data/src/main/resources/mapper/manage/AuthInfoMapper.xml
similarity index 100%
rename from zyplayer-doc-manage/src/main/resources/mapper/manage/AuthInfoMapper.xml
rename to zyplayer-doc-data/src/main/resources/mapper/manage/AuthInfoMapper.xml
diff --git a/zyplayer-doc-manage/src/main/resources/mapper/manage/UserAuthMapper.xml b/zyplayer-doc-data/src/main/resources/mapper/manage/UserAuthMapper.xml
similarity index 100%
rename from zyplayer-doc-manage/src/main/resources/mapper/manage/UserAuthMapper.xml
rename to zyplayer-doc-data/src/main/resources/mapper/manage/UserAuthMapper.xml
diff --git a/zyplayer-doc-manage/src/main/resources/mapper/manage/UserInfoMapper.xml b/zyplayer-doc-data/src/main/resources/mapper/manage/UserInfoMapper.xml
similarity index 100%
rename from zyplayer-doc-manage/src/main/resources/mapper/manage/UserInfoMapper.xml
rename to zyplayer-doc-data/src/main/resources/mapper/manage/UserInfoMapper.xml
diff --git a/zyplayer-doc-data/src/main/resources/mapper/manage/WikiPageCommentMapper.xml b/zyplayer-doc-data/src/main/resources/mapper/manage/WikiPageCommentMapper.xml
new file mode 100644
index 00000000..2dac74a5
--- /dev/null
+++ b/zyplayer-doc-data/src/main/resources/mapper/manage/WikiPageCommentMapper.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/zyplayer-doc-data/src/main/resources/mapper/manage/WikiPageContentMapper.xml b/zyplayer-doc-data/src/main/resources/mapper/manage/WikiPageContentMapper.xml
new file mode 100644
index 00000000..604c8e71
--- /dev/null
+++ b/zyplayer-doc-data/src/main/resources/mapper/manage/WikiPageContentMapper.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/zyplayer-doc-data/src/main/resources/mapper/manage/WikiPageFileMapper.xml b/zyplayer-doc-data/src/main/resources/mapper/manage/WikiPageFileMapper.xml
new file mode 100644
index 00000000..9686544d
--- /dev/null
+++ b/zyplayer-doc-data/src/main/resources/mapper/manage/WikiPageFileMapper.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/zyplayer-doc-data/src/main/resources/mapper/manage/WikiPageMapper.xml b/zyplayer-doc-data/src/main/resources/mapper/manage/WikiPageMapper.xml
new file mode 100644
index 00000000..f4f0cba1
--- /dev/null
+++ b/zyplayer-doc-data/src/main/resources/mapper/manage/WikiPageMapper.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/zyplayer-doc-data/src/main/resources/mapper/manage/WikiPageZanMapper.xml b/zyplayer-doc-data/src/main/resources/mapper/manage/WikiPageZanMapper.xml
new file mode 100644
index 00000000..bea2a277
--- /dev/null
+++ b/zyplayer-doc-data/src/main/resources/mapper/manage/WikiPageZanMapper.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/zyplayer-doc-data/src/main/resources/mapper/manage/WikiSpaceMapper.xml b/zyplayer-doc-data/src/main/resources/mapper/manage/WikiSpaceMapper.xml
new file mode 100644
index 00000000..b0728bbc
--- /dev/null
+++ b/zyplayer-doc-data/src/main/resources/mapper/manage/WikiSpaceMapper.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/zyplayer-doc-manage/src/main/resources/mapper/manage/ZyplayerStorageMapper.xml b/zyplayer-doc-data/src/main/resources/mapper/manage/ZyplayerStorageMapper.xml
similarity index 100%
rename from zyplayer-doc-manage/src/main/resources/mapper/manage/ZyplayerStorageMapper.xml
rename to zyplayer-doc-data/src/main/resources/mapper/manage/ZyplayerStorageMapper.xml
diff --git a/zyplayer-doc-dubbo/pom.xml b/zyplayer-doc-dubbo/pom.xml
index e3c8f1a6..63bb9d9c 100644
--- a/zyplayer-doc-dubbo/pom.xml
+++ b/zyplayer-doc-dubbo/pom.xml
@@ -36,7 +36,7 @@
true
${project.build.outputDirectory}/META-INF/resources/webjars/${project.artifactId}/${project.version}
- 1.0.0
+ 1.0.1
@@ -62,7 +62,7 @@
com.zyplayer
zyplayer-doc-core
- ${zyplayer.doc.core.version}
+ ${zyplayer.doc.version}
org.apache.curator
diff --git a/zyplayer-doc-manage/pom.xml b/zyplayer-doc-manage/pom.xml
index 256b295f..4d04d228 100644
--- a/zyplayer-doc-manage/pom.xml
+++ b/zyplayer-doc-manage/pom.xml
@@ -23,15 +23,13 @@
3.0.6
1.2.53
2.0.1
- 1.0.0
2.0
6.1.0
1.1.9
1.8.9
2.9.2
2.9.2
- 1.0.1
- 1.0.1
+ 1.0.1
@@ -87,19 +85,29 @@
com.zyplayer
zyplayer-doc-core
- ${zyplayer.doc.core.version}
+ ${zyplayer.doc.version}
com.zyplayer
zyplayer-doc-db
- ${zyplayer.doc.db.version}
+ ${zyplayer.doc.version}
com.zyplayer
zyplayer-doc-dubbo
- ${zyplayer.doc.dubbo.version}
+ ${zyplayer.doc.version}
+
+
+ com.zyplayer
+ zyplayer-doc-wiki
+ ${zyplayer.doc.version}
+
+
+ com.zyplayer
+ zyplayer-doc-data
+ ${zyplayer.doc.version}
@@ -135,11 +143,6 @@
org.springframework.boot
spring-boot-starter-security
-
- com.zyplayer
- zyplayer-doc-wiki
- 1.0.0
-
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 cb1c0792..0a0b4a3e 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
@@ -7,6 +7,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.context.annotation.ComponentScan;
import org.springframework.core.env.Environment;
import java.net.InetAddress;
@@ -16,6 +17,7 @@ import java.util.Optional;
* 程序启动器
*/
@SpringBootApplication
+@ComponentScan(basePackages = {"com.zyplayer.doc.manage", "com.zyplayer.doc.data"})
public class Application extends SpringBootServletInitializer {
private static Logger logger = LoggerFactory.getLogger(Application.class);
diff --git a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework/config/MybatisPlusConfig.java b/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework/config/MybatisPlusConfig.java
index 4677cd4f..ed6b13fd 100644
--- a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework/config/MybatisPlusConfig.java
+++ b/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework/config/MybatisPlusConfig.java
@@ -1,141 +1,141 @@
-package com.zyplayer.doc.manage.framework.config;
-
-import com.atomikos.icatch.jta.UserTransactionImp;
-import com.atomikos.icatch.jta.UserTransactionManager;
-import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
-import com.baomidou.mybatisplus.extension.plugins.PerformanceInterceptor;
-import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean;
-import com.zyplayer.doc.manage.repository.support.interceptor.SqlLogInterceptor;
-import org.apache.ibatis.plugin.Interceptor;
-import org.mybatis.spring.annotation.MapperScan;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.jta.atomikos.AtomikosDataSourceBean;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
-import org.springframework.transaction.PlatformTransactionManager;
-import org.springframework.transaction.annotation.EnableTransactionManagement;
-import org.springframework.transaction.jta.JtaTransactionManager;
-
-import javax.sql.DataSource;
-import javax.transaction.TransactionManager;
-import javax.transaction.UserTransaction;
-import java.util.Properties;
-
-/**
- * mybatis plus数据库配置
- */
-@Configuration
-public class MybatisPlusConfig {
-
- /**
- * sql日志
- **/
- private static final SqlLogInterceptor SQL_LOG_INTERCEPTOR;
-
- static {
- SQL_LOG_INTERCEPTOR = new SqlLogInterceptor();
- Properties properties = new Properties();
- SQL_LOG_INTERCEPTOR.setProperties(properties);
- }
-
- /**
- * 分布式事务配置
- */
- @Configuration
- static class JTATransactionManagerConfig {
-
- @Bean(name = "userTransaction")
- public UserTransaction userTransaction() throws Throwable {
- UserTransactionImp userTransactionImp = new UserTransactionImp();
- userTransactionImp.setTransactionTimeout(300);
- return userTransactionImp;
- }
-
- @Bean(name = "atomikosTransactionManager")
- public TransactionManager atomikosTransactionManager() {
- UserTransactionManager userTransactionManager = new UserTransactionManager();
- userTransactionManager.setForceShutdown(true);
- return userTransactionManager;
- }
-
- @Bean(name = "transactionManager")
- public PlatformTransactionManager transactionManager() throws Throwable {
- UserTransaction userTransaction = userTransaction();
- TransactionManager atomikosTransactionManager = atomikosTransactionManager();
-
- JtaTransactionManager jtaTransactionManager = new JtaTransactionManager(userTransaction, atomikosTransactionManager);
- jtaTransactionManager.setAllowCustomIsolationLevels(true);
- jtaTransactionManager.setGlobalRollbackOnParticipationFailure(true);
- jtaTransactionManager.setDefaultTimeout(30);
-
- return jtaTransactionManager;
- }
- }
-
- /**
- * 数据库配置
- */
- @Configuration
- @EnableTransactionManagement
- @MapperScan(value = "com.zyplayer.doc.manage.repository.manage.mapper", sqlSessionFactoryRef = "manageSqlSessionFactory")
- static class ManageMybatisDbConfig {
-
- @Value("${zyplayer.doc.manage.datasource.driverClassName}")
- private String driverClassName;
- @Value("${zyplayer.doc.manage.datasource.url}")
- private String url;
- @Value("${zyplayer.doc.manage.datasource.username}")
- private String username;
- @Value("${zyplayer.doc.manage.datasource.password}")
- private String password;
-
- @Bean(name = "manageDatasource")
- public DataSource manageDatasource() {
- Properties xaProperties = new Properties();
- xaProperties.setProperty("driverClassName", driverClassName);
- xaProperties.setProperty("url", url);
- xaProperties.setProperty("username", username);
- xaProperties.setProperty("password", password);
- xaProperties.setProperty("maxActive", "500");
- xaProperties.setProperty("testOnBorrow", "true");
- xaProperties.setProperty("testWhileIdle", "true");
- xaProperties.setProperty("validationQuery", "select 'x'");
-
- AtomikosDataSourceBean xaDataSource = new AtomikosDataSourceBean();
- xaDataSource.setXaProperties(xaProperties);
- xaDataSource.setXaDataSourceClassName("com.alibaba.druid.pool.xa.DruidXADataSource");
- xaDataSource.setUniqueResourceName("manageDatasource");
- xaDataSource.setMaxPoolSize(500);
- xaDataSource.setMinPoolSize(1);
- xaDataSource.setMaxLifetime(60);
- return xaDataSource;
- }
-
- @Bean(name = "manageSqlSessionFactory")
- public MybatisSqlSessionFactoryBean manageSqlSessionFactory() throws Exception {
- MybatisSqlSessionFactoryBean sqlSessionFactoryBean = new MybatisSqlSessionFactoryBean();
- sqlSessionFactoryBean.setDataSource(manageDatasource());
- sqlSessionFactoryBean.setPlugins(new Interceptor[]{SQL_LOG_INTERCEPTOR});
-
- PathMatchingResourcePatternResolver resolver = new PathMatchingResourcePatternResolver();
- sqlSessionFactoryBean.setMapperLocations(resolver.getResources("classpath:/mapper/manage/*Mapper.xml"));
- return sqlSessionFactoryBean;
- }
- }
-
- @Bean
- public PerformanceInterceptor performanceInterceptor() {
- PerformanceInterceptor performanceInterceptor = new PerformanceInterceptor();
- /* */
- performanceInterceptor.setMaxTime(1000);
- /* */
- performanceInterceptor.setFormat(true);
- return performanceInterceptor;
- }
-
- @Bean
- public PaginationInterceptor paginationInterceptor() {
- return new PaginationInterceptor();
- }
-}
\ No newline at end of file
+//package com.zyplayer.doc.manage.framework.config;
+//
+//import com.atomikos.icatch.jta.UserTransactionImp;
+//import com.atomikos.icatch.jta.UserTransactionManager;
+//import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
+//import com.baomidou.mybatisplus.extension.plugins.PerformanceInterceptor;
+//import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean;
+//import com.zyplayer.doc.data.repository.support.interceptor.SqlLogInterceptor;
+//import org.apache.ibatis.plugin.Interceptor;
+//import org.mybatis.spring.annotation.MapperScan;
+//import org.springframework.beans.factory.annotation.Value;
+//import org.springframework.boot.jta.atomikos.AtomikosDataSourceBean;
+//import org.springframework.context.annotation.Bean;
+//import org.springframework.context.annotation.Configuration;
+//import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
+//import org.springframework.transaction.PlatformTransactionManager;
+//import org.springframework.transaction.annotation.EnableTransactionManagement;
+//import org.springframework.transaction.jta.JtaTransactionManager;
+//
+//import javax.sql.DataSource;
+//import javax.transaction.TransactionManager;
+//import javax.transaction.UserTransaction;
+//import java.util.Properties;
+//
+///**
+// * mybatis plus数据库配置
+// */
+////@Configuration
+//public class MybatisPlusConfig {
+//
+// /**
+// * sql日志
+// **/
+// private static final SqlLogInterceptor SQL_LOG_INTERCEPTOR;
+//
+// static {
+// SQL_LOG_INTERCEPTOR = new SqlLogInterceptor();
+// Properties properties = new Properties();
+// SQL_LOG_INTERCEPTOR.setProperties(properties);
+// }
+//
+// /**
+// * 分布式事务配置
+// */
+// @Configuration
+// static class JTATransactionManagerConfig {
+//
+// @Bean(name = "userTransaction")
+// public UserTransaction userTransaction() throws Throwable {
+// UserTransactionImp userTransactionImp = new UserTransactionImp();
+// userTransactionImp.setTransactionTimeout(300);
+// return userTransactionImp;
+// }
+//
+// @Bean(name = "atomikosTransactionManager")
+// public TransactionManager atomikosTransactionManager() {
+// UserTransactionManager userTransactionManager = new UserTransactionManager();
+// userTransactionManager.setForceShutdown(true);
+// return userTransactionManager;
+// }
+//
+// @Bean(name = "transactionManager")
+// public PlatformTransactionManager transactionManager() throws Throwable {
+// UserTransaction userTransaction = userTransaction();
+// TransactionManager atomikosTransactionManager = atomikosTransactionManager();
+//
+// JtaTransactionManager jtaTransactionManager = new JtaTransactionManager(userTransaction, atomikosTransactionManager);
+// jtaTransactionManager.setAllowCustomIsolationLevels(true);
+// jtaTransactionManager.setGlobalRollbackOnParticipationFailure(true);
+// jtaTransactionManager.setDefaultTimeout(30);
+//
+// return jtaTransactionManager;
+// }
+// }
+//
+// /**
+// * 数据库配置
+// */
+// @Configuration
+// @EnableTransactionManagement
+// @MapperScan(value = "com.zyplayer.doc.data.repository.manage.mapper", sqlSessionFactoryRef = "manageSqlSessionFactory")
+// static class ManageMybatisDbConfig {
+//
+// @Value("${zyplayer.doc.manage.datasource.driverClassName}")
+// private String driverClassName;
+// @Value("${zyplayer.doc.manage.datasource.url}")
+// private String url;
+// @Value("${zyplayer.doc.manage.datasource.username}")
+// private String username;
+// @Value("${zyplayer.doc.manage.datasource.password}")
+// private String password;
+//
+// @Bean(name = "manageDatasource")
+// public DataSource manageDatasource() {
+// Properties xaProperties = new Properties();
+// xaProperties.setProperty("driverClassName", driverClassName);
+// xaProperties.setProperty("url", url);
+// xaProperties.setProperty("username", username);
+// xaProperties.setProperty("password", password);
+// xaProperties.setProperty("maxActive", "500");
+// xaProperties.setProperty("testOnBorrow", "true");
+// xaProperties.setProperty("testWhileIdle", "true");
+// xaProperties.setProperty("validationQuery", "select 'x'");
+//
+// AtomikosDataSourceBean xaDataSource = new AtomikosDataSourceBean();
+// xaDataSource.setXaProperties(xaProperties);
+// xaDataSource.setXaDataSourceClassName("com.alibaba.druid.pool.xa.DruidXADataSource");
+// xaDataSource.setUniqueResourceName("manageDatasource");
+// xaDataSource.setMaxPoolSize(500);
+// xaDataSource.setMinPoolSize(1);
+// xaDataSource.setMaxLifetime(60);
+// return xaDataSource;
+// }
+//
+// @Bean(name = "manageSqlSessionFactory")
+// public MybatisSqlSessionFactoryBean manageSqlSessionFactory() throws Exception {
+// MybatisSqlSessionFactoryBean sqlSessionFactoryBean = new MybatisSqlSessionFactoryBean();
+// sqlSessionFactoryBean.setDataSource(manageDatasource());
+// sqlSessionFactoryBean.setPlugins(new Interceptor[]{SQL_LOG_INTERCEPTOR});
+//
+// PathMatchingResourcePatternResolver resolver = new PathMatchingResourcePatternResolver();
+// sqlSessionFactoryBean.setMapperLocations(resolver.getResources("classpath:/mapper/manage/*Mapper.xml"));
+// return sqlSessionFactoryBean;
+// }
+// }
+//
+// @Bean
+// public PerformanceInterceptor performanceInterceptor() {
+// PerformanceInterceptor performanceInterceptor = new PerformanceInterceptor();
+// /* */
+// performanceInterceptor.setMaxTime(1000);
+// /* */
+// performanceInterceptor.setFormat(true);
+// return performanceInterceptor;
+// }
+//
+// @Bean
+// public PaginationInterceptor paginationInterceptor() {
+// return new PaginationInterceptor();
+// }
+//}
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 85a3d53c..6fc90bd1 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
@@ -4,8 +4,8 @@ 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.manage.repository.manage.entity.ZyplayerStorage;
-import com.zyplayer.doc.manage.service.manage.ZyplayerStorageService;
+import com.zyplayer.doc.data.repository.manage.entity.ZyplayerStorage;
+import com.zyplayer.doc.data.service.manage.ZyplayerStorageService;
import org.apache.commons.lang.StringUtils;
import org.springframework.stereotype.Service;
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
index b15d70d2..eb0eb951 100644
--- 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
@@ -2,8 +2,8 @@ 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.manage.repository.manage.entity.ZyplayerStorage;
-import com.zyplayer.doc.manage.service.manage.ZyplayerStorageService;
+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;
diff --git a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework/config/security/DocDetailsServiceImpl.java b/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework/config/security/DocDetailsServiceImpl.java
index 96cb098e..06c1f970 100644
--- a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework/config/security/DocDetailsServiceImpl.java
+++ b/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework/config/security/DocDetailsServiceImpl.java
@@ -1,10 +1,13 @@
package com.zyplayer.doc.manage.framework.config.security;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.stream.Collectors;
-
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.zyplayer.doc.data.config.security.DocUserDetails;
+import com.zyplayer.doc.data.repository.manage.entity.AuthInfo;
+import com.zyplayer.doc.data.repository.manage.entity.UserAuth;
+import com.zyplayer.doc.data.repository.manage.entity.UserInfo;
+import com.zyplayer.doc.data.service.manage.AuthInfoService;
+import com.zyplayer.doc.data.service.manage.UserAuthService;
+import com.zyplayer.doc.data.service.manage.UserInfoService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.core.authority.SimpleGrantedAuthority;
@@ -13,13 +16,10 @@ import org.springframework.security.core.userdetails.UserDetailsService;
import org.springframework.security.core.userdetails.UsernameNotFoundException;
import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.zyplayer.doc.manage.repository.manage.entity.AuthInfo;
-import com.zyplayer.doc.manage.repository.manage.entity.UserAuth;
-import com.zyplayer.doc.manage.repository.manage.entity.UserInfo;
-import com.zyplayer.doc.manage.service.manage.AuthInfoService;
-import com.zyplayer.doc.manage.service.manage.UserAuthService;
-import com.zyplayer.doc.manage.service.manage.UserInfoService;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.stream.Collectors;
@Service
public class DocDetailsServiceImpl implements UserDetailsService {
@@ -55,4 +55,4 @@ public class DocDetailsServiceImpl implements UserDetailsService {
return userDetails;
}
-}
\ No newline at end of file
+}
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/manage/AuthInfoController.java
index 1cb7bd6d..9affacb1 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/manage/AuthInfoController.java
@@ -1,20 +1,19 @@
package com.zyplayer.doc.manage.web.manage;
-import java.util.Date;
-import java.util.List;
-
+import com.zyplayer.doc.core.json.DocResponseJson;
+import com.zyplayer.doc.core.json.ResponseJson;
+import com.zyplayer.doc.data.config.security.DocUserDetails;
+import com.zyplayer.doc.data.config.security.DocUserUtil;
+import com.zyplayer.doc.data.repository.manage.entity.AuthInfo;
+import com.zyplayer.doc.data.service.manage.AuthInfoService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-import com.zyplayer.doc.core.json.DocResponseJson;
-import com.zyplayer.doc.core.json.ResponseJson;
-import com.zyplayer.doc.manage.framework.config.security.DocUserDetails;
-import com.zyplayer.doc.manage.framework.config.security.DocUserUtil;
-import com.zyplayer.doc.manage.repository.manage.entity.AuthInfo;
-import com.zyplayer.doc.manage.service.manage.AuthInfoService;
+import java.util.Date;
+import java.util.List;
@RestController
@RequestMapping("/auth/info")
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/manage/UserAuthController.java
index 0b0dc664..df55413c 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/manage/UserAuthController.java
@@ -1,24 +1,23 @@
package com.zyplayer.doc.manage.web.manage;
-import java.util.Date;
-import java.util.List;
-import java.util.stream.Collectors;
-
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.zyplayer.doc.core.json.DocResponseJson;
+import com.zyplayer.doc.core.json.ResponseJson;
+import com.zyplayer.doc.data.config.security.DocUserDetails;
+import com.zyplayer.doc.data.config.security.DocUserUtil;
+import com.zyplayer.doc.data.repository.manage.entity.AuthInfo;
+import com.zyplayer.doc.data.repository.manage.entity.UserAuth;
+import com.zyplayer.doc.data.service.manage.AuthInfoService;
+import com.zyplayer.doc.data.service.manage.UserAuthService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.zyplayer.doc.core.json.DocResponseJson;
-import com.zyplayer.doc.core.json.ResponseJson;
-import com.zyplayer.doc.manage.framework.config.security.DocUserDetails;
-import com.zyplayer.doc.manage.framework.config.security.DocUserUtil;
-import com.zyplayer.doc.manage.repository.manage.entity.AuthInfo;
-import com.zyplayer.doc.manage.repository.manage.entity.UserAuth;
-import com.zyplayer.doc.manage.service.manage.AuthInfoService;
-import com.zyplayer.doc.manage.service.manage.UserAuthService;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
@RestController
@RequestMapping("/user/auth")
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/manage/UserInfoController.java
index 504b26da..3e3d0c92 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/manage/UserInfoController.java
@@ -1,13 +1,16 @@
package com.zyplayer.doc.manage.web.manage;
-import java.util.*;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
-import com.zyplayer.doc.manage.repository.manage.entity.AuthInfo;
-import com.zyplayer.doc.manage.repository.manage.entity.UserAuth;
-import com.zyplayer.doc.manage.service.manage.AuthInfoService;
-import com.zyplayer.doc.manage.service.manage.UserAuthService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.zyplayer.doc.core.json.DocResponseJson;
+import com.zyplayer.doc.core.json.ResponseJson;
+import com.zyplayer.doc.data.config.security.DocUserDetails;
+import com.zyplayer.doc.data.config.security.DocUserUtil;
+import com.zyplayer.doc.data.repository.manage.entity.AuthInfo;
+import com.zyplayer.doc.data.repository.manage.entity.UserAuth;
+import com.zyplayer.doc.data.repository.manage.entity.UserInfo;
+import com.zyplayer.doc.data.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.vo.AuthInfoVo;
import org.apache.commons.lang.StringUtils;
import org.dozer.Mapper;
@@ -18,13 +21,9 @@ import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.zyplayer.doc.core.json.DocResponseJson;
-import com.zyplayer.doc.core.json.ResponseJson;
-import com.zyplayer.doc.manage.framework.config.security.DocUserDetails;
-import com.zyplayer.doc.manage.framework.config.security.DocUserUtil;
-import com.zyplayer.doc.manage.repository.manage.entity.UserInfo;
-import com.zyplayer.doc.manage.service.manage.UserInfoService;
+import java.util.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;
@RestController
@RequestMapping("/user/info")
@@ -58,7 +57,7 @@ public class UserInfoController {
public ResponseJson
-
\ No newline at end of file
+
diff --git a/zyplayer-doc-wiki/pom.xml b/zyplayer-doc-wiki/pom.xml
index 38ad94e1..a1cd768c 100644
--- a/zyplayer-doc-wiki/pom.xml
+++ b/zyplayer-doc-wiki/pom.xml
@@ -5,7 +5,7 @@
com.zyplayer
zyplayer-doc-wiki
- 1.0.0
+ 1.0.1
jar
zyplayer-doc-wiki
wiki文档工具
@@ -25,211 +25,43 @@
org.springframework.boot
spring-boot-starter-parent
- 1.4.2.RELEASE
+ 2.0.6.RELEASE
-
-
- org.springframework.boot
- spring-boot-starter-web
-
-
- org.springframework.boot
- spring-boot-starter-jdbc
-
-
- org.springframework.boot
- spring-boot-starter-jta-atomikos
-
-
- org.mybatis
- mybatis
- 3.4.6
-
-
- org.mybatis
- mybatis-spring
- 1.3.0
-
-
- io.springfox
- springfox-swagger2
- 2.7.0
-
-
- com.alibaba
- fastjson
- 1.2.44
-
-
- cn.hutool
- hutool-http
- 4.1.8
-
-
- commons-lang
- commons-lang
- 2.6
-
-
- com.zyplayer
- zyplayer-doc-core
- 1.0.0
-
-
-
UTF-8
UTF-8
1.8
-
- true
- ${project.build.outputDirectory}/META-INF/resources/webjars/${project.artifactId}/${project.version}
+ 1.0.1
-
-
- The Apache Software License, Version 2.0
- http://www.apache.org/licenses/LICENSE-2.0.txt
-
-
-
- scm:git@git.oschina.net:zyplayer/zyplayer-doc.git
- scm:git@git.oschina.net:zyplayer/zyplayer-doc.git
- git@git.oschina.net:zyplayer/zyplayer-doc.git
-
-
-
- snapshots
- https://oss.sonatype.org/content/repositories/snapshots/
-
-
- snapshots
- https://oss.sonatype.org/service/local/staging/deploy/maven2/
-
-
+
+
+ org.springframework.boot
+ spring-boot-starter
+
+
+ org.springframework.boot
+ spring-boot-starter-web
+
+
+ com.zyplayer
+ zyplayer-doc-data
+ ${zyplayer.doc.version}
+
+
+ com.zyplayer
+ zyplayer-doc-core
+ ${zyplayer.doc.version}
+
+
-
-
- src/main/resources
- META-INF/resources/
-
-
- src/main/java
-
- **/*
-
-
- **/*.java
-
- false
-
-
- src/main/webapp
-
- **/*
-
- false
-
-
- org.apache.maven.plugins
- maven-javadoc-plugin
- 2.10.2
-
- true
-
-
-
- attach-javadocs
-
- jar
-
-
-
-
-
- org.apache.maven.plugins
- maven-source-plugin
-
-
- attach-sources
-
- jar
-
-
-
-
-
- org.apache.maven.plugins
- maven-compiler-plugin
-
- 1.8
- 1.8
- UTF-8
-
-
-
- org.apache.maven.plugins
- maven-surefire-plugin
- 2.18.1
-
- ${skipTests}
-
+ org.springframework.boot
+ spring-boot-maven-plugin
-
-
- release
-
-
-
- org.apache.maven.plugins
- maven-source-plugin
- 2.2.1
-
-
- package
-
- jar-no-fork
-
-
-
-
-
- org.apache.maven.plugins
- maven-javadoc-plugin
- 2.10.2
-
- true
-
-
-
- attach-javadocs
-
- jar
-
-
-
-
-
- org.apache.maven.plugins
- maven-gpg-plugin
- 1.6
-
-
- verify
-
- sign
-
-
-
-
-
-
-
-
-
\ No newline at end of file
+
diff --git a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiController.java b/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiController.java
deleted file mode 100644
index a4bfc246..00000000
--- a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiController.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.zyplayer.doc.wiki.controller;
-
-import com.zyplayer.doc.core.json.DocResponseJson;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * 文档控制器
- *
- * @author 暮光：城中城
- * @since 2019年2月17日
- */
-@RestController
-@RequestMapping("/zyplayer-doc-wiki/doc-wiki")
-public class WikiController {
- private static Logger logger = LoggerFactory.getLogger(WikiController.class);
-
- /**
- *
- * @author 暮光：城中城
- * @since 2019年2月17日
- **/
- @PostMapping(value = "/list")
- public DocResponseJson list() {
- return DocResponseJson.ok();
- }
-}
-
diff --git a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageCommentController.java b/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageCommentController.java
new file mode 100644
index 00000000..b6e251de
--- /dev/null
+++ b/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageCommentController.java
@@ -0,0 +1,57 @@
+package com.zyplayer.doc.wiki.controller;
+
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.zyplayer.doc.core.json.DocResponseJson;
+import com.zyplayer.doc.core.json.ResponseJson;
+import com.zyplayer.doc.data.config.security.DocUserDetails;
+import com.zyplayer.doc.data.config.security.DocUserUtil;
+import com.zyplayer.doc.data.repository.manage.entity.WikiPageComment;
+import com.zyplayer.doc.data.service.manage.WikiPageCommentService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+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 2019年2月17日
+ */
+@RestController
+@RequestMapping("/zyplayer-doc-wiki/page/comment")
+public class WikiPageCommentController {
+ private static Logger logger = LoggerFactory.getLogger(WikiPageCommentController.class);
+
+ @Resource
+ WikiPageCommentService wikiPageCommentService;
+
+ @PostMapping("/list")
+ public ResponseJson> list(WikiPageComment wikiPageComment) {
+ UpdateWrapper wrapper = new UpdateWrapper<>();
+ wrapper.eq("page_id", wikiPageComment.getPageId());
+ wrapper.eq(wikiPageComment.getParentId() != null, "parent_id", wikiPageComment.getParentId());
+ List authList = wikiPageCommentService.list(wrapper);
+ return DocResponseJson.ok(authList);
+ }
+
+ @PostMapping("/update")
+ public ResponseJson