diff --git a/Docker方式快速运行.MD b/Docker方式快速运行.MD new file mode 100644 index 0000000..59a9ef1 --- /dev/null +++ b/Docker方式快速运行.MD @@ -0,0 +1,70 @@ +**支持Linux和Windows下运行 + +**Docker环境请自行准备 + +- # 构建后台 + +1. yml配置文件请确保每一项下面按正确配置 +``` +server: + port: 8080 + servlet: + context-path: /ky +base: + #上传文件保存的路径 + upload-dir: /kykms/KmDocs + # libreOffice安装路径 + soffice-path: /usr/bin/soffice +esclient: + master-host: kykms-ES + master-port: 9200 +spring: + datasource: + dynamic: + datasource: + # 数据库登录信息配置 + master: + url: jdbc:mysql://kykms-mysql:3306/km?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai + username: root + password: root + #redis 配置 + redis: + database: 0 + host: kykms-redis + password: '' + port: 6379 +``` +2. 通过jeecg-boot-parent项目 maven打包，执行install +3. 打包Docker容器 +``` + 进入jeecg-boot根路径下面命令、启动镜像容器组 + + docker-compose up -d +``` +4. 访问后台项目（注意要开启swagger）http://localhost:8080/jeecg-boot/doc.html + +- # 构建前端 +1. 修改前端项目的后台域名 +.env.production + +``` +VUE_APP_API_BASE_URL=http://localhost:8080/ky +``` + +2. 进入ant-design-vue-jeecg根目录 + +``` +yarn run build +``` + +3. 构建镜像(注意后面的".“) +``` +docker build -t nginx:kykms . +``` + +4. 启动镜像 + +``` +docker run --name kykms-nginx -p 80:80 -d nginx:kykms +``` +5. 访问前台项目 http://localhost:80 \ No newline at end of file diff --git a/ES安装.MD b/ES安装.MD index 3264e27..08f110d 100644 --- a/ES安装.MD +++ b/ES安装.MD @@ -15,7 +15,6 @@ tar zxvf elasticsearch-7.6.1-linux-x86_64.tar.gz ## 配置ES cd /usr/local/elasticsearch-7.6.1/config vi elasticsearch.yml 增加配置： - xpack.security.enabled: true discovery.type: single-node network.host: 0.0.0.0 indices.query.bool.max_clause_count: 102400 @@ -35,11 +34,8 @@ cd /usr/local/elasticsearch-7.6.1/bin ## 启动es： cd /usr/local/elasticsearch-7.6.1/bin su elasticsearch - ./elasticsearch -d + ./elasticsearch -d -## 创建elastic 的Elastic用户 -./elasticsearch-setup-passwords auto -拷贝用户elastic的密码，配置到application.yml文件 - # **Windows环境安装** @@ -49,8 +45,7 @@ cd /usr/local/elasticsearch-7.6.1/bin ## 配置ES cd C:\software\elasticsearch-7.6.1\config -### 编辑 elasticsearch.yml 增加配置： - xpack.security.enabled: true +### 编辑 elasticsearch.yml 增加配置： discovery.type: single-node network.host: 0.0.0.0 indices.query.bool.max_clause_count: 102400 @@ -66,7 +61,4 @@ cd /usr/local/elasticsearch-7.6.1/bin ## 启动es： cd C:\software\elasticsearch-7.6.1\config\bin 执行 elasticsearch.bat - -## 创建elastic 的Elastic用户 -执行 elasticsearch-setup-passwords.bat auto -拷贝用户elastic的密码，配置到application.yml文件 + \ No newline at end of file diff --git a/ant-design-vue-jeecg/.env.development b/ant-design-vue-jeecg/.env.development index 8a1b3ba..61476cc 100644 --- a/ant-design-vue-jeecg/.env.development +++ b/ant-design-vue-jeecg/.env.development @@ -1,4 +1,4 @@ NODE_ENV=development -VUE_APP_API_BASE_URL=http://localhost:9090/ky +VUE_APP_API_BASE_URL=http://localhost:8080/ky VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas VUE_APP_ONLINE_BASE_URL=http://localhost/onlinePreview \ No newline at end of file diff --git a/ant-design-vue-jeecg/.env.production b/ant-design-vue-jeecg/.env.production index 54d56dd..0b5a543 100644 --- a/ant-design-vue-jeecg/.env.production +++ b/ant-design-vue-jeecg/.env.production @@ -1,4 +1,4 @@ NODE_ENV=production -VUE_APP_API_BASE_URL=http://172.16.2.47:8080/ky +VUE_APP_API_BASE_URL=http://localhost:8080/ky VUE_APP_CAS_BASE_URL=http://localhost:8888/cas VUE_APP_ONLINE_BASE_URL=http://localhost/onlinePreview \ No newline at end of file diff --git a/ant-design-vue-jeecg/.env.test b/ant-design-vue-jeecg/.env.test index e48e030..0447062 100644 --- a/ant-design-vue-jeecg/.env.test +++ b/ant-design-vue-jeecg/.env.test @@ -1,4 +1,4 @@ NODE_ENV=test -VUE_APP_API_BASE_URL=http://119.29.145.199:8080/ky +VUE_APP_API_BASE_URL=http://localhost:8080/ky VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas VUE_APP_ONLINE_BASE_URL=http://localhost/onlinePreview \ No newline at end of file diff --git a/ant-design-vue-jeecg/Dockerfile b/ant-design-vue-jeecg/Dockerfile index 13b8769..05bca74 100644 --- a/ant-design-vue-jeecg/Dockerfile +++ b/ant-design-vue-jeecg/Dockerfile @@ -1,12 +1,12 @@ FROM nginx -MAINTAINER jeecgos@163.com +MAINTAINER hnliuwx@gmail.com VOLUME /tmp ENV LANG en_US.UTF-8 RUN echo "server { \ - listen 80; \ - location ^~ /jeecg-boot { \ - proxy_pass http://jeecg-boot-system:8080/jeecg-boot/; \ - proxy_set_header Host jeecg-boot-system; \ + listen 81; \ + location ^~ /ky { \ + proxy_pass http://localhost:8080/ky/; \ + proxy_set_header Host localhost; \ proxy_set_header X-Real-IP \$remote_addr; \ proxy_set_header X-Forwarded-For \$proxy_add_x_forwarded_for; \ } \ diff --git a/ant-design-vue-jeecg/vue.config.js b/ant-design-vue-jeecg/vue.config.js index 5b9175c..2d7c331 100644 --- a/ant-design-vue-jeecg/vue.config.js +++ b/ant-design-vue-jeecg/vue.config.js @@ -76,7 +76,7 @@ module.exports = { }, devServer: { - port: 3000, + port: 80, proxy: { /* '/api': { target: 'https://mock.ihx.me/mock/5baf3052f7da7e07e04a5116/antd-pro', //mock API接口系统 diff --git a/jeecg-boot/DB/Dockerfile b/jeecg-boot/DB/Dockerfile new file mode 100644 index 0000000..7d06060 --- /dev/null +++ b/jeecg-boot/DB/Dockerfile @@ -0,0 +1,9 @@ +FROM mysql:5.7 + +MAINTAINER hnliuwx@gmail.com + +ENV TZ=Asia/Shanghai + +RUN ln -sf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone + +COPY ./km_mysql.sql /docker-entrypoint-initdb.d \ No newline at end of file diff --git a/DB/km_mysql.sql b/jeecg-boot/DB/km_mysql.sql similarity index 100% rename from DB/km_mysql.sql rename to jeecg-boot/DB/km_mysql.sql diff --git a/DB/km_oracle.sql b/jeecg-boot/DB/km_oracle.sql similarity index 100% rename from DB/km_oracle.sql rename to jeecg-boot/DB/km_oracle.sql diff --git a/jeecg-boot/docker-compose-businessl.yml b/jeecg-boot/docker-compose-businessl.yml new file mode 100644 index 0000000..152d1d5 --- /dev/null +++ b/jeecg-boot/docker-compose-businessl.yml @@ -0,0 +1,62 @@ +## 商业版试用镜像提供源下载，仅限于个人学习用途，如擅自用于商业用途，带来的一切后果由个人负责 +## !!!!暂未完善，如有需求请联系作者!!!!! +##执行启动命令 docker-compose -f ./docker-compose-business.yml up +version: '2' +services: + kykms-mysql: + image: mahonelau/kykms-mysql:business + environment: + MYSQL_ROOT_PASSWORD: root + MYSQL_ROOT_HOST: '%' + TZ: Asia/Shanghai + restart: always + container_name: kykms-mysql + command: + --character-set-server=utf8mb4 + --collation-server=utf8mb4_general_ci + --explicit_defaults_for_timestamp=true + --lower_case_table_names=1 + --max_allowed_packet=128M + ports: + - 3306:3306 + + kykms-redis: + image: redis:5.0 + ports: + - 6379:6379 + restart: always + container_name: kykms-redis + + kykms-ES: + image: mahonelau/kykms-es:business + restart: always + hostname: kykms-ES + container_name: kykms-ES + ports: + - 9200:9200 + - 9300:9300 + environment: + discovery.type: single-node + ES_JAVA_OPTS: "-Xms512m -Xmx512m" + cpuset-cpus: 1 + m: 2G + + kykms: + image: mahonelau/kykms:business + restart: always + container_name: kykms + volumes: + - /data/config:/kykms/config + ports: + - 8080:8080 + + kykms-nginx: + image: mahonelau/kykms-nginx:business + restart: always + - kykms-mysql + - kykms-redis + - kykms + - kykms-ES + container_name: kykms-nginx + ports: + - 80:80 \ No newline at end of file diff --git a/jeecg-boot/docker-compose-official.yml b/jeecg-boot/docker-compose-official.yml new file mode 100644 index 0000000..3c67322 --- /dev/null +++ b/jeecg-boot/docker-compose-official.yml @@ -0,0 +1,63 @@ +#### 镜像上传 +# 仓库私服： 81.70.17.111:5000 +# 第一步：上传前端镜像到docker仓库 +#docker tag kykms-nginx 81.70.17.111:5000/kykms-nginx:1.0 + +#docker push 81.70.17.111:5000/kykms-nginx:1.0 + +# 第二步：将此yml文件上传服务器，执行启动命令 docker-compose -f ./docker-compose-official.yml up +version: '2' +services: + kykms-mysql: + image: mahonelau/kykms-mysql:latest + environment: + MYSQL_ROOT_PASSWORD: root + restart: always + container_name: kykms-mysql + command: + --character-set-server=utf8mb4 + --collation-server=utf8mb4_general_ci + --explicit_defaults_for_timestamp=true + --lower_case_table_names=1 + --max_allowed_packet=128M + ports: + - 3306:3306 + + kykms-redis: + image: redis:5.0 + ports: + - 6379:6379 + restart: always + container_name: kykms-redis + + kykms-ES: + build: + context: ./ES + image: mahonelau/kykms-es:latest + restart: always + hostname: kykms-ES + container_name: kykms-ES + ports: + - 9200:9200 + - 9300:9300 + environment: + discovery.type: single-node + ES_JAVA_OPTS: "-Xms512m -Xmx512m" + cpuset-cpus: 1 + m: 2G + + kykms: + image: mahonelau/kykms:latest + restart: always + container_name: kykms + volumes: + - /data/config:/kykms/config + ports: + - 8080:8080 + + kykms-nginx: + image: 81.70.17.111:5000/kykms-nginx:1.0 + restart: always + container_name: kykms-nginx + ports: + - 80:80 \ No newline at end of file diff --git a/jeecg-boot/docker-compose-server.yml b/jeecg-boot/docker-compose-server.yml index c45a6a5..5793f34 100644 --- a/jeecg-boot/docker-compose-server.yml +++ b/jeecg-boot/docker-compose-server.yml @@ -1,23 +1,25 @@ #### 镜像上传 # 仓库私服： 81.70.17.111:5000 # 第一步：上传镜像到docker仓库 -#docker tag jeecg-boot-mysql 81.70.17.111:5000/jeecg-boot-mysql:1.1 -#docker tag jeecg-boot-system 81.70.17.111:5000/jeecg-boot-system:1.0 -#docker tag nginxhtml:jeecgboot 81.70.17.111:5000/nginxhtml:1.2 +#docker tag kykms-mysql 81.70.17.111:5000/kykms-mysql:1.0 +#docker tag kykms 81.70.17.111:5000/kykms:1.0 +#docker tag kykms-nginx 81.70.17.111:5000/kykms-nginx:1.0 +#docker tag kykms-es 81.70.17.111:5000/kykms-es:1.0 -#docker push 81.70.17.111:5000/jeecg-boot-mysql:1.1 -#docker push 81.70.17.111:5000/jeecg-boot-system:1.0 -#docker push 81.70.17.111:5000/nginxhtml:1.2 +#docker push 81.70.17.111:5000/kykms-mysql:1.0 +#docker push 81.70.17.111:5000/kykms:1.0 +#docker push 81.70.17.111:5000/kykms-nginx:1.0 +#docker push 81.70.17.111:5000/kykms-es:1.0 # 第二步：将此yml文件上传服务器，执行启动命令 docker-compose -f ./docker-compose-server.yml up version: '2' services: - jeecg-boot-mysql: - image: 81.70.17.111:5000/jeecg-boot-mysql:1.0 + kykms-mysql: + image: 81.70.17.111:5000/kykms-mysql:1.0 environment: MYSQL_ROOT_PASSWORD: root restart: always - container_name: jeecg-boot-mysql + container_name: kykms-mysql command: --character-set-server=utf8mb4 --collation-server=utf8mb4_general_ci @@ -25,27 +27,41 @@ services: --lower_case_table_names=1 --max_allowed_packet=128M ports: - - 3306:3306 + - 3306:3306 - jeecg-boot-redis: + kykms-redis: image: redis:5.0 ports: - - 6379:6379 + - 6379:6379 restart: always - container_name: jeecg-boot-redis + container_name: kykms-redis - jeecg-boot-system: - image: 81.70.17.111:5000/jeecg-boot-system:1.0 + kykms-ES: + image: 81.70.17.111:5000/kykms-es:1.0 restart: always - container_name: jeecg-boot-system + hostname: kykms-ES + container_name: kykms-ES + ports: + - 9200:9200 + - 9300:9300 + environment: + discovery.type: single-node + ES_JAVA_OPTS: "-Xms512m -Xmx512m" + cpuset-cpus: 1 + m: 2G + + kykms: + image: 81.70.17.111:5000/kykms:1.0 + restart: always + container_name: kykms volumes: - - /data/config:/jeecg-boot/config + - /data/config:/kykms/config ports: - - 8080:8080 + - 8080:8080 - jeecg-boot-nginx: - image: 81.70.17.111:5000/nginxhtml + kykms-nginx: + image: 81.70.17.111:5000/kykms-nginx:1.0 restart: always - container_name: jeecg-boot-nginx + container_name: kykms-nginx ports: - - 80:80 \ No newline at end of file + - 80:80 \ No newline at end of file diff --git a/jeecg-boot/docker-compose.yml b/jeecg-boot/docker-compose.yml index 86a6fdd..afc0017 100644 --- a/jeecg-boot/docker-compose.yml +++ b/jeecg-boot/docker-compose.yml @@ -1,6 +1,6 @@ version: '2' services: - jeecg-boot-mysql: + kykms-mysql: build: context: ./db environment: @@ -8,35 +8,53 @@ services: MYSQL_ROOT_HOST: '%' TZ: Asia/Shanghai restart: always - container_name: jeecg-boot-mysql - image: jeecg-boot-mysql + container_name: kykms-mysql + image: mysql:5.7 command: --character-set-server=utf8mb4 --collation-server=utf8mb4_general_ci --explicit_defaults_for_timestamp=true --lower_case_table_names=1 --max_allowed_packet=128M - --default-authentication-plugin=caching_sha2_password +# --default-authentication-plugin=caching_sha2_password ports: - 3306:3306 - jeecg-boot-redis: + kykms-redis: image: redis:5.0 ports: - 6379:6379 restart: always - hostname: jeecg-boot-redis - container_name: jeecg-boot-redis + hostname: kykms-redis + container_name: kykms-redis - jeecg-boot-system: + kykms-ES: + build: + context: ./ES + image: elasticsearch:7.6.1 + restart: always + hostname: kykms-ES + container_name: kykms-ES + ports: + - 9200:9200 + - 9300:9300 + environment: + discovery.type: single-node + ES_JAVA_OPTS: "-Xms512m -Xmx512m" + cpuset-cpus: 1 + m: 2G + + kykms: build: context: ./jeecg-boot-module-system restart: on-failure + privileged: true depends_on: - - jeecg-boot-mysql - - jeecg-boot-redis - container_name: jeecg-boot-system - image: jeecg-boot-system - hostname: jeecg-boot-system + - kykms-mysql + - kykms-redis + - kykms-ES + container_name: kykms + image: kykms + hostname: kykms ports: - 8080:8080 \ No newline at end of file diff --git a/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/WebSocketConfig.java b/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/WebSocketConfig.java index 0fd0077..27c10d7 100644 --- a/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/WebSocketConfig.java +++ b/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/WebSocketConfig.java @@ -1,18 +1,18 @@ -//package org.jeecg.config; -// -//import org.springframework.context.annotation.Bean; -//import org.springframework.context.annotation.Configuration; -//import org.springframework.web.socket.server.standard.ServerEndpointExporter; -// -//@Configuration -//public class WebSocketConfig { -// /** -// * 注入ServerEndpointExporter， -// * 这个bean会自动注册使用了@ServerEndpoint注解声明的Websocket endpoint -// */ -// @Bean -// public ServerEndpointExporter serverEndpointExporter() { -// return new ServerEndpointExporter(); -// } -// -//} +package org.jeecg.config; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.socket.server.standard.ServerEndpointExporter; + +@Configuration +public class WebSocketConfig { + /** + * 注入ServerEndpointExporter， + * 这个bean会自动注册使用了@ServerEndpoint注解声明的Websocket endpoint + */ + @Bean + public ServerEndpointExporter serverEndpointExporter() { + return new ServerEndpointExporter(); + } + +} diff --git a/jeecg-boot/jeecg-boot-module-KM/src/main/java/org/jeecg/modules/KM/common/config/ElasticsearchConfig.java b/jeecg-boot/jeecg-boot-module-KM/src/main/java/org/jeecg/modules/KM/common/config/ElasticsearchConfig.java index 9cfe56d..d48d2a0 100644 --- a/jeecg-boot/jeecg-boot-module-KM/src/main/java/org/jeecg/modules/KM/common/config/ElasticsearchConfig.java +++ b/jeecg-boot/jeecg-boot-module-KM/src/main/java/org/jeecg/modules/KM/common/config/ElasticsearchConfig.java @@ -63,9 +63,9 @@ public class ElasticsearchConfig { HttpHost host=new HttpHost(masterHost, masterPort, HttpHost.DEFAULT_SCHEME_NAME); RestClientBuilder builder=RestClient.builder(host); - CredentialsProvider credentialsProvider = new BasicCredentialsProvider(); - credentialsProvider.setCredentials(AuthScope.ANY, new UsernamePasswordCredentials(masterUserName, masterUserPwd)); - builder.setHttpClientConfigCallback(f -> f.setDefaultCredentialsProvider(credentialsProvider)); +// CredentialsProvider credentialsProvider = new BasicCredentialsProvider(); +// credentialsProvider.setCredentials(AuthScope.ANY, new UsernamePasswordCredentials(masterUserName, masterUserPwd)); +// builder.setHttpClientConfigCallback(f -> f.setDefaultCredentialsProvider(credentialsProvider)); RestHighLevelClient restClient = new RestHighLevelClient( builder); return restClient; diff --git a/jeecg-boot/jeecg-boot-module-system/Dockerfile b/jeecg-boot/jeecg-boot-module-system/Dockerfile index 7ef2a80..1213512 100644 --- a/jeecg-boot/jeecg-boot-module-system/Dockerfile +++ b/jeecg-boot/jeecg-boot-module-system/Dockerfile @@ -1,15 +1,25 @@ -FROM anapsix/alpine-java:8_server-jre_unlimited +FROM ansible/centos7-ansible -MAINTAINER jeecgos@163.com +ENV container docker -RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime +RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime; \ +cd /etc/yum.repos.d;\ +curl -o /etc/yum.repos.d/Centos-7.repo http://mirrors.aliyun.com/repo/Centos-7.repo;\ +curl -o /etc/yum.repos.d/epel-7.repo http://mirrors.aliyun.com/repo/epel-7.repo;\ +curl -o /etc/yum.repos.d/CentOS7-Base-163.repo http://mirrors.163.com/.help/CentOS7-Base-163.repo;\ +yum clean all;\ +yum makecache;\ +yum install libreoffice-writer.x86_64 -y; \ -RUN mkdir -p /jeecg-boot +mkdir /kykms -WORKDIR /jeecg-boot +WORKDIR /kykms EXPOSE 8080 ADD ./target/jeecg-boot-module-system-2.4.5.jar ./ +ADD ./simsun.ttc /usr/share/fonts -CMD sleep 60;java -Djava.security.egd=file:/dev/./urandom -jar jeecg-boot-module-system-2.4.5.jar \ No newline at end of file +CMD /usr/sbin/init;\ +sleep 10;\ +java -Djava.security.egd=file:/dev/./urandom -jar jeecg-boot-module-system-2.4.5.jar diff --git a/jeecg-boot/jeecg-boot-module-system/pom.xml b/jeecg-boot/jeecg-boot-module-system/pom.xml index e2dde57..bdd2d81 100644 --- a/jeecg-boot/jeecg-boot-module-system/pom.xml +++ b/jeecg-boot/jeecg-boot-module-system/pom.xml @@ -9,7 +9,7 @@ 4.0.0 jeecg-boot-module-system - war + jar @@ -59,16 +59,16 @@ - - - - - - - - - - - - + + + + org.springframework.boot + spring-boot-maven-plugin + + + false + + + + \ No newline at end of file diff --git a/jeecg-boot/jeecg-boot-module-system/simsun.ttc b/jeecg-boot/jeecg-boot-module-system/simsun.ttc new file mode 100644 index 0000000..5f22ce3 Binary files /dev/null and b/jeecg-boot/jeecg-boot-module-system/simsun.ttc differ diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/application-dev.yml b/jeecg-boot/jeecg-boot-module-system/src/main/resources/application-dev.yml index 722f5a8..20e1dd3 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/resources/application-dev.yml +++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/application-dev.yml @@ -1,5 +1,5 @@ server: - port: 9090 + port: 8080 tomcat: max-swallow-size: -1 error: diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/application-prod.yml b/jeecg-boot/jeecg-boot-module-system/src/main/resources/application-prod.yml index b98c742..950292d 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/resources/application-prod.yml +++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/application-prod.yml @@ -22,17 +22,16 @@ management: ##文件上传和转换工具的配置 base: #上传文件保存的路径 - upload-dir: /opt/KmDocs + upload-dir: /kykms/KmDocs # libreOffice安装路径 - soffice-path: /opt/libreoffice7.0/program/soffice + soffice-path: /usr/bin/soffice +# soffice-path: /opt/libreoffice7.0/program/soffice one-system-url: ##ElasticSearch服务配置 for highLevelRestClient esclient: - master-host: 127.0.0.1 + master-host: kykms-ES master-port: 9200 - master-user-name: elastic - master-user-pwd: xxxxxxxx spring: servlet: @@ -97,14 +96,14 @@ spring: datasource: # 数据库登录信息配置 master: - url: jdbc:mysql://127.0.0.1:3306/km?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai + url: jdbc:mysql://kykms-mysql:3306/km?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai username: root - password: xxxxxxxx + password: root driver-class-name: com.mysql.cj.jdbc.Driver #redis 配置 redis: database: 0 - host: 127.0.0.1 + host: kykms-redis lettuce: pool: max-active: 8 diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/application-test.yml b/jeecg-boot/jeecg-boot-module-system/src/main/resources/application-test.yml index 6b799e5..2e0ed45 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/resources/application-test.yml +++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/application-test.yml @@ -21,27 +21,26 @@ management: ##文件上传和转换工具的配置 base: -# upload-dir: /opt/KmDocs -# soffice-path: /opt/libreoffice7.0/program/soffice - upload-dir: c:\KmDocs - soffice-path: C:\Program Files\LibreOffice\program\soffice.exe + #上传文件保存的路径 + upload-dir: /kykms/KmDocs + # libreOffice安装路径 + soffice-path: /usr/bin/soffice + # soffice-path: /opt/libreoffice7.0/program/soffice one-system-url: ##ElasticSearch服务配置 for highLevelRestClient esclient: - master-host: 127.0.0.1 + master-host: kykms-ES master-port: 9200 - master-user-name: elastic - master-user-pwd: xxxxxxxx spring: servlet: multipart: - max-file-size: 2MB - max-request-size: 20MB + max-file-size: 2000MB + max-request-size: 2000MB mail: - host: smtp.163.com - username: jeecgos@163.com + host: + username: password: ?? properties: mail: @@ -50,27 +49,19 @@ spring: starttls: enable: true required: true - #json 时间戳统一转换 jackson: date-format: yyyy-MM-dd HH:mm:ss time-zone: GMT+8 aop: proxy-target-class: true - #配置freemarker freemarker: - # 设置模板后缀名 suffix: .ftl - # 设置文档类型 content-type: text/html - # 设置页面编码格式 charset: UTF-8 - # 设置页面缓存 cache: false prefer-file-system-access: false - # 设置ftl文件路径 template-loader-path: - classpath:/templates - # 设置静态文件路径，js,css等 mvc: static-path-pattern: /** resource: @@ -87,93 +78,72 @@ spring: web-stat-filter: enabled: true dynamic: - druid: # 全局druid参数，绝大部分值和默认保持一致。(现已支持的参数如下,不清楚含义不要乱设置) - # 连接池的配置信息 - # 初始化大小，最小，最大 + druid: initial-size: 5 min-idle: 5 maxActive: 1000 - # 配置获取连接等待超时的时间 maxWait: 60000 - # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒 timeBetweenEvictionRunsMillis: 60000 - # 配置一个连接在池中最小生存的时间，单位是毫秒 minEvictableIdleTimeMillis: 300000 validationQuery: SELECT 1 FROM DUAL testWhileIdle: true testOnBorrow: false testOnReturn: false - # 打开PSCache，并且指定每个连接上PSCache的大小,mysql建议关闭 poolPreparedStatements: false maxPoolPreparedStatementPerConnectionSize: -1 - # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙 filters: stat,wall,slf4j - # 通过connectProperties属性来打开mergeSql功能；慢SQL记录 connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000 datasource: + # 数据库登录信息配置 master: - url: jdbc:mysql://127.0.0.1:3306/km?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai + url: jdbc:mysql://kykms-mysql:3306/km?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai username: root - password: xxxxxxxx + password: root driver-class-name: com.mysql.cj.jdbc.Driver #redis 配置 redis: database: 0 - host: 127.0.0.1 + host: kykms-redis lettuce: pool: - max-active: 8 #最大连接数据库连接数,设 -1 为没有限制 - max-idle: 8 #最大等待连接中的数量,设 0 为没有限制 - max-wait: -1ms #最大建立连接等待时间。如果超过此时间将接到异常。设为-1表示无限制。 - min-idle: 0 #最小等待连接中的数量,设 0 为没有限制 + max-active: 8 + max-idle: 8 + max-wait: -1ms + min-idle: 0 shutdown-timeout: 100ms password: '' port: 6379 -#mybatis plus 设置 + mybatis-plus: mapper-locations: classpath*:org/jeecg/modules/**/xml/*Mapper.xml global-config: - # 关闭MP3.0自带的banner banner: false db-config: - #主键类型 0:"数据库ID自增",1:"该类型为未设置主键类型", 2:"用户输入ID",3:"全局唯一ID (数字类型唯一ID)", 4:"全局唯一ID UUID",5:"字符串全局唯一ID (idWorker 的字符串表示)"; id-type: ASSIGN_ID - # 默认数据库表下划线命名 table-underline: true configuration: - # 这个配置会将执行的sql打印出来，在开发或测试的时候可以用 - log-impl: org.apache.ibatis.logging.stdout.StdOutImpl - # 返回类型为Map,显示null对应的字段 + #log-impl: org.apache.ibatis.logging.stdout.StdOutImpl call-setters-on-nulls: true -#jeecg专用配置 -minidao : - base-package: org.jeecg.modules.jmreport.* - #DB类型（mysql | postgresql | oracle | sqlserver| other） - db-type: mysql + jeecg : - # 本地：local\Minio：minio\阿里云：alioss uploadType: alioss path : - #文件上传根目录 设置 - upload: /opt/jeecg-boot/upload - #webapp文件路径 - webapp: /opt/jeecg-boot/webapp + upload: /opt/upload + webapp: /opt/webapp shiro: excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**,/sys/loginThird,/KM/EsMgnt/** - #阿里云oss存储和大鱼短信秘钥配置 + oss: accessKey: ?? secretKey: ?? endpoint: oss-cn-beijing.aliyuncs.com bucketName: ?? staticDomain: https://static.jeecg.com - # minio文件上传 minio: minio_url: http://minio.jeecg.com minio_name: ?? minio_pass: ?? bucketName: ?? - #xxl-job配置 xxljob: enabled: false adminAddresses: http://127.0.0.1:9080/xxl-job-admin @@ -184,29 +154,24 @@ jeecg : port: 30007 logPath: logs/jeecg/job/jobhandler/ logRetentionDays: 30 - #自定义路由配置 yml nacos database route: config: data-id: jeecg-gateway-router group: DEFAULT_GROUP data-type: yml - #分布式锁配置 redisson: address: 127.0.0.1:6379 password: type: STANDALONE enabled: true -#cas单点登录 cas: prefixUrl: http://cas.example.org:8443/cas -#Mybatis输出sql日志 logging: level: org.jeecg.modules.system.mapper : info -#swagger knife4j: production: false basic: enable: true username: jeecg - password: jeecg1314 \ No newline at end of file + password: jeecg1314 diff --git a/开发环境准备与运行.MD b/开发环境准备与运行.MD index 5326856..5c710ad 100644 --- a/开发环境准备与运行.MD +++ b/开发环境准备与运行.MD @@ -6,8 +6,10 @@ > 3. 安装Mysql5.7，启动 > 4. 安装Elasticsearch，具体可参考：ES安装.md > 5. 安装LibreOffice： -> [linux下载链接](https://download.documentfoundation.org/libreoffice/stable/7.2.6/rpm/x86_64/LibreOffice_7.2.6_Linux_x86-64_rpm.tar.gz) -> [win下载链接](http://download.documentfoundation.org/libreoffice/stable/7.2.6/win/x86_64/LibreOffice_7.2.6_Win_x64.msi) +> [linux下载链接](https://download.documentfoundation.org/libreoffice/stable/7.2.7/rpm/x86_64/LibreOffice_7.2.7_Linux_x86-64_rpm.tar.gz) +> [win下载链接](http://download.documentfoundation.org/libreoffice/stable/7.2.7/win/x86_64/LibreOffice_7.2.7_Win_x64.msi) +# Docker快速运行 +用IDE将代码编译环境与Maven环境搭建好，在Docker环境下，可以快速启动，具体参见 Docker方式快速运行.MD # 项目启动与运行 @@ -76,4 +78,4 @@ VUE_APP_API_BASE_URL=http://localhost:8080/km 5. 点击serve 启动项目，看到如下日志 则启动成功 ![KY KMS](./Docs/Pics/web_success.png) -6. 通过 http://localhost:3000 访问前端项目，默认账号密码： admin/123456 \ No newline at end of file +6. 通过 http://localhost 访问前端项目，默认账号密码： admin/123456 \ No newline at end of file