diff --git a/README.md b/README.md index 39aee48d..23c8eb07 100644 --- a/README.md +++ b/README.md @@ -12,21 +12,21 @@ zyplayer-doc是一款适合团队和个人使用的WIKI文档管理工具，同 # 快速启动 ## 数据库依赖 -你得有一个MySQL数据库，建议版本号为：5.7.25，建库：zyplayer_doc_manage，再执行脚本建表：[全量建表语句.sql](https://gitee.com/zyplayer/zyplayer-doc/blob/master/zyplayer-doc-manage/src/main/resources/sql/全量建表语句.sql) +你得有一个MySQL数据库，建议版本号为：5.7.25，建库：zyplayer_doc_manage ## main方法启动 1. 修改 zyplayer-doc/zyplayer-doc-manage/src/main/resources/application.yml 配置文件里面的数据库账号密码 -2. 执行 com.zyplayer.doc.manage.Application.main 方法启动项目，启动后访问：http://127.0.0.1:8083/zyplayer-doc-manage/ +2. 执行 com.zyplayer.doc.manage.Application.main 方法启动项目，启动后访问：http://127.0.0.1:8083/zyplayer-doc/ ## jar方式启动 -1. 直接下载：直接下载编译好的jar打包文件，下载地址：https://pan.baidu.com/s/1yMmnle01XR4TDjo2hfvw-Q 提取码: 3adf，下载最新版后解压 +1. 直接下载：直接下载编译好的jar打包文件，加入QQ群即可下载编译好的最新版，QQ群号：466363173 2. 自行编译：也可以自己动手编译，双击执行：zyplayer-doc\build.bat，将使用maven编译整个项目为可执行的jar文件，编译结果文件放在：zyplayer-doc\dist\version 文件夹下，如果电脑没有安装maven则需要先安装 3. 修改第一步或第二步结果文件夹下的 application.yml 文件里面数据库帐号密码 -4. 双击第一步或第二步结果文件夹下的 startup.bat 启动项目，启动后访问：http://127.0.0.1:8083/zyplayer-doc-manage/ +4. 双击第一步或第二步结果文件夹下的 startup.bat 启动项目，启动后访问：http://127.0.0.1:8083/zyplayer-doc/ ## Tomcat容器启动 -1. 直接下载编译好的war打包文件，下载地址：https://pan.baidu.com/s/1yMmnle01XR4TDjo2hfvw-Q 提取码: 3adf，下载最新版后解压 -2. 修改配置文件：zyplayer-doc.zip\apache-tomcat\webapps\zyplayer-doc-manage\WEB-INF\classes\application.yml 配置文件里面的数据库账号密码 +1. 直接下载编译好的war打包文件，加入QQ群即可下载编译好的最新版，QQ群号：466363173 +2. 修改配置文件：zyplayer-doc.zip\apache-tomcat\webapps\zyplayer-doc\WEB-INF\classes\application.yml 配置文件里面的数据库账号密码 3. 双击tomcat\bin\startup.bat启动即可 默认登录账号：zyplayer 密码：123456 diff --git a/build.bat b/build.bat index 89fc2744..e2d4f7bb 100644 --- a/build.bat +++ b/build.bat @@ -18,7 +18,7 @@ rd /q /s %target_dir% md %target_dir% -copy zyplayer-doc-manage\target\zyplayer-doc-manage.jar %target_dir% +copy zyplayer-doc-manage\target\zyplayer-doc.jar %target_dir% copy zyplayer-doc-manage\src\main\resources\application.yml %target_dir% xcopy /e /y /q zyplayer-doc-other\script %target_dir% diff --git a/build.sh b/build.sh index b0f16663..378e32de 100644 --- a/build.sh +++ b/build.sh @@ -23,7 +23,7 @@ fi rm -rf $target_dir/* # 复制服务端资源 -cp -r zyplayer-doc-manage/target/zyplayer-doc-manage.jar $target_dir +cp -r zyplayer-doc-manage/target/zyplayer-doc.jar $target_dir cp -r zyplayer-doc-manage/src/main/resources/application.yml $target_dir cp -r zyplayer-doc-other/script/* $target_dir diff --git a/zyplayer-doc-manage/pom.xml b/zyplayer-doc-manage/pom.xml index b3fa7d90..d2afe4d8 100644 --- a/zyplayer-doc-manage/pom.xml +++ b/zyplayer-doc-manage/pom.xml @@ -73,7 +73,7 @@ - zyplayer-doc-manage + zyplayer-doc src/main/resources/dist diff --git a/zyplayer-doc-manage/src/main/resources/application.yml b/zyplayer-doc-manage/src/main/resources/application.yml index 760968aa..6ace3449 100644 --- a/zyplayer-doc-manage/src/main/resources/application.yml +++ b/zyplayer-doc-manage/src/main/resources/application.yml @@ -3,7 +3,7 @@ server: port: 8083 servlet: - context-path: /zyplayer-doc-manage + context-path: /zyplayer-doc # 整个文档项目的配置 zyplayer: @@ -47,7 +47,7 @@ zyplayer: spring: application: - name: zyplayer-doc-manage + name: zyplayer-doc servlet: multipart: max-file-size: 100MB @@ -61,32 +61,3 @@ spring: base: dc=xx,dc=net username: cn=Manager,dc=xx,dc=net password: MKDSHYDNIS - -# 下面的配置可以不用管了 -mybatis-plus: - mapper-locations: classpath:/mapper/**/*Mapper.xml - #实体扫描，多个package用逗号或者分号分隔 - typeAliasesPackage: com.zyplayer.doc.manage.repository.manage.entity - typeEnumsPackage: - global-config: - # 数据库相关配置 - db-config: - #主键类型 AUTO:"数据库ID自增", INPUT:"用户输入ID",ID_WORKER:"全局唯一ID (数字类型唯一ID)", UUID:"全局唯一ID UUID"; - id-type: AUTO - #字段策略 IGNORED:"忽略判断",NOT_NULL:"非 NULL 判断"),NOT_EMPTY:"非空判断" - field-strategy: not_empty - #驼峰下划线转换 - column-underline: true - #数据库大写下划线转换 - #capital-mode: true - #逻辑删除配置 - logic-delete-value: 0 - logic-not-delete-value: 1 - db-type: mysql - #刷新mapper 调试神器 - refresh: true - # 原生配置 - configuration: - map-underscore-to-camel-case: true - cache-enabled: false - diff --git a/zyplayer-doc-manage/src/main/resources/logback.xml b/zyplayer-doc-manage/src/main/resources/logback.xml index bc0d87cc..b44b2f28 100644 --- a/zyplayer-doc-manage/src/main/resources/logback.xml +++ b/zyplayer-doc-manage/src/main/resources/logback.xml @@ -9,25 +9,10 @@ ${outPattern} - - ./logs/zyplayer-doc-manage/error.log - - ./logs/zyplayer-doc-manage/error.%d{yyyy-MM-dd}.log - ${maxHistory} - - - ${outPattern} - - - ERROR - ACCEPT - DENY - - - ./logs/zyplayer-doc-manage/common.log + ./logs/zyplayer-doc/output.log - ./logs/zyplayer-doc-manage/common.%d{yyyy-MM-dd}.log + ./logs/zyplayer-doc/output.%d{yyyy-MM-dd}.log ${maxHistory} @@ -38,6 +23,5 @@ - diff --git a/zyplayer-doc-other/script/shutdown.sh b/zyplayer-doc-other/script/shutdown.sh index acf6f73b..0089da63 100644 --- a/zyplayer-doc-other/script/shutdown.sh +++ b/zyplayer-doc-other/script/shutdown.sh @@ -1,7 +1,7 @@ #!/bin/sh # 执行文件名称 -app_name="zyplayer-doc-manage" +app_name="zyplayer-doc" pid=$(ps -ef | grep $app_name.jar | grep -v grep | awk '{print $2}') if [ -n "$pid" ]; then diff --git a/zyplayer-doc-other/script/startup.bat b/zyplayer-doc-other/script/startup.bat index 36c25363..0f0a9201 100644 --- a/zyplayer-doc-other/script/startup.bat +++ b/zyplayer-doc-other/script/startup.bat @@ -1,5 +1,5 @@ @echo off -set app_name=zyplayer-doc-manage +set app_name=zyplayer-doc java -jar -Xms512m -Xmx512m %app_name%.jar diff --git a/zyplayer-doc-other/script/startup.sh b/zyplayer-doc-other/script/startup.sh index e0846af9..c4d35bb1 100644 --- a/zyplayer-doc-other/script/startup.sh +++ b/zyplayer-doc-other/script/startup.sh @@ -1,7 +1,7 @@ #!/bin/sh # 执行文件名称 -app_name="zyplayer-doc-manage" +app_name="zyplayer-doc" # 先关闭服务 sh shutdown.sh diff --git a/zyplayer-doc-ui/api-ui/.env.development b/zyplayer-doc-ui/api-ui/.env.development index 489e86c8..cc6d1393 100644 --- a/zyplayer-doc-ui/api-ui/.env.development +++ b/zyplayer-doc-ui/api-ui/.env.development @@ -8,6 +8,6 @@ VITE_APP_BASE_URL_ONLINE=http://doc.zyplayer.com VITE_APP_CUSTOM_URL_ONLINE=http://doc.zyplayer.com # 本地环境 -VITE_APP_BASE_URL_DEV=http://local.zyplayer.com:8083/zyplayer-doc-manage -VITE_APP_CUSTOM_URL_DEV=http://local.zyplayer.com:8083/zyplayer-doc-manage +VITE_APP_BASE_URL_DEV=http://local.zyplayer.com:8083/zyplayer-doc +VITE_APP_CUSTOM_URL_DEV=http://local.zyplayer.com:8083/zyplayer-doc diff --git a/zyplayer-doc-ui/api-ui/src/views/common/AboutDialog.vue b/zyplayer-doc-ui/api-ui/src/views/common/AboutDialog.vue index c4b5723e..f932f265 100644 --- a/zyplayer-doc-ui/api-ui/src/views/common/AboutDialog.vue +++ b/zyplayer-doc-ui/api-ui/src/views/common/AboutDialog.vue @@ -13,9 +13,7 @@ -
特性关注&技术交流QQ群：466363173
- UI/设计/开发/测试 - +
新功能关注&技术交流QQ群：466363173
diff --git a/zyplayer-doc-ui/console-ui/.env.development b/zyplayer-doc-ui/console-ui/.env.development index b7dbffe4..c2e84188 100644 --- a/zyplayer-doc-ui/console-ui/.env.development +++ b/zyplayer-doc-ui/console-ui/.env.development @@ -2,7 +2,7 @@ ENV = 'development' # base api -VUE_APP_BASE_API = 'http://local.zyplayer.com:8083/zyplayer-doc-manage' +VUE_APP_BASE_API = 'http://local.zyplayer.com:8083/zyplayer-doc' # VUE_APP_BASE_API = 'http://doc.zyplayer.com' diff --git a/zyplayer-doc-ui/db-ui/.env.development b/zyplayer-doc-ui/db-ui/.env.development index 233f868e..aa66557b 100644 --- a/zyplayer-doc-ui/db-ui/.env.development +++ b/zyplayer-doc-ui/db-ui/.env.development @@ -2,7 +2,7 @@ ENV = 'development' # base api -VUE_APP_BASE_API = 'http://local.zyplayer.com:8083/zyplayer-doc-manage' +VUE_APP_BASE_API = 'http://local.zyplayer.com:8083/zyplayer-doc' # VUE_APP_BASE_API = 'http://doc.zyplayer.com' VUE_CLI_BABEL_TRANSPILE_MODULES = true diff --git a/zyplayer-doc-ui/db-ui/src/views/common/AboutDialog.vue b/zyplayer-doc-ui/db-ui/src/views/common/AboutDialog.vue index 196522c4..2d3904ff 100644 --- a/zyplayer-doc-ui/db-ui/src/views/common/AboutDialog.vue +++ b/zyplayer-doc-ui/db-ui/src/views/common/AboutDialog.vue @@ -13,9 +13,7 @@ -
特性关注&技术交流QQ群：466363173
- UI/设计/开发/测试 - +
新功能关注&技术交流QQ群：466363173
diff --git a/zyplayer-doc-ui/wiki-ui/.env.development b/zyplayer-doc-ui/wiki-ui/.env.development index 88215103..6284305e 100644 --- a/zyplayer-doc-ui/wiki-ui/.env.development +++ b/zyplayer-doc-ui/wiki-ui/.env.development @@ -2,7 +2,7 @@ ENV = 'development' # base api -VITE_APP_BASE_API = 'http://local.zyplayer.com:8083/zyplayer-doc-manage' +VITE_APP_BASE_API = 'http://local.zyplayer.com:8083/zyplayer-doc' # VITE_APP_BASE_API = 'http://doc.zyplayer.com'