From cd392bce3bac36eac0aaca52a2c167e3aadb0bea Mon Sep 17 00:00:00 2001 From: smallchill Date: Fri, 7 May 2021 13:30:15 +0800 Subject: [PATCH] =?UTF-8?q?:tada:=203.0.3.RELEASE=20=E6=96=B0=E5=A2=9E=20k?= =?UTF-8?q?uboard-k8s=20=E8=84=9A=E6=9C=AC=E4=B8=80=E9=94=AE=E9=83=A8?= =?UTF-8?q?=E7=BD=B2=E6=96=B9=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 15 ++++----- README.md | 13 ++++--- docker/nginx.k8s.conf | 58 ++++++++++++++++++++++++++++++++ package.json | 2 +- src/pages/Dashboard/Workplace.js | 15 +++++++-- 5 files changed, 87 insertions(+), 16 deletions(-) create mode 100644 docker/nginx.k8s.conf diff --git a/Dockerfile b/Dockerfile index 7cbc5c3..4f6d7ab 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,12 +1,11 @@ -FROM circleci/node:latest-browsers +FROM nginx:stable-alpine-perl -WORKDIR /usr/src/app/ -USER root -COPY package.json ./ -RUN yarn +RUN rm -f /etc/nginx/nginx.conf \ + && rm -f /etc/nginx/conf.d/default.conf +COPY docker/nginx.k8s.conf /etc/nginx/nginx.conf -COPY ./ ./ +EXPOSE 80 -RUN npm run test:all +COPY ./dist /usr/share/nginx/html -CMD ["npm", "run", "build"] +ENTRYPOINT ["nginx", "-g", "daemon off;"] diff --git a/README.md b/README.md index 20cecbb..7b5825c 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@

- Downloads + Downloads Build Status Build Status Coverage Status @@ -28,6 +28,9 @@ ## 架构图 +## 趋势图 +Stargazers over time + ## 工程结构 ``` SpringBlade @@ -60,7 +63,8 @@ SpringBlade * 交流二群：`751253339`(满) * 交流三群：`784729540`(满) * 交流四群：`1034621754`(满) -* 交流五群：`946350912` +* 交流五群：`946350912`(满) +* 交流六群：`511624269` ## 在线演示 * Saber-基于Vue：[https://saber.bladex.vip](https://saber.bladex.vip) @@ -69,8 +73,9 @@ SpringBlade * Caster-数据大屏展示系统：[https://data.avuejs.com](https://data.avuejs.com) ## 技术文档 -* [开发手册一览](https://gitee.com/smallc/SpringBlade/wikis/SpringBlade开发手册) -* [常见问题集锦](https://sns.bladex.vip/article-14966.html) +* [SpringBlade常见问题集锦](https://sns.bladex.vip/article-14966.html) +* [SpringBlade开发手册一览](https://gitee.com/smallc/SpringBlade/wikis/SpringBlade开发手册) +* [SpringBlade基于Kuboard部署K8S](https://kuboard.cn/learning/k8s-practice/spring-blade/) ## 项目地址 * 后端Gitee地址：[https://gitee.com/smallc/SpringBlade](https://gitee.com/smallc/SpringBlade) diff --git a/docker/nginx.k8s.conf b/docker/nginx.k8s.conf new file mode 100644 index 0000000..212781c --- /dev/null +++ b/docker/nginx.k8s.conf @@ -0,0 +1,58 @@ + +user root; +worker_processes 1; + +error_log /var/log/nginx/error.log warn; +pid /var/run/nginx.pid; + + +events { + worker_connections 1024; +} + + +http { + include /etc/nginx/mime.types; + default_type application/octet-stream; + + log_format main '$remote_addr - $remote_user [$time_local] "$request" ' + '$status $body_bytes_sent "$http_referer" ' + '"$http_user_agent" "$http_x_forwarded_for"'; + + access_log /var/log/nginx/access.log main; + + sendfile on; + #tcp_nopush on; + + keepalive_timeout 65; + + #gzip on; + + #include /etc/nginx/conf.d/*.conf; + + upstream gateway { + server blade-gateway; + } + + + server { + listen 80; + server_name web; + root /usr/share/nginx/html; + + location / { + + } + + location ^~/api { + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_buffering off; + rewrite ^/api/(.*)$ /$1 break; + proxy_pass http://gateway; + } + } + + +} diff --git a/package.json b/package.json index d8c99a1..dd4aa75 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "sword", - "version": "3.0.2", + "version": "3.0.3", "description": "An out-of-box UI solution for enterprise applications", "private": true, "scripts": { diff --git a/src/pages/Dashboard/Workplace.js b/src/pages/Dashboard/Workplace.js index c0f646d..c32caff 100644 --- a/src/pages/Dashboard/Workplace.js +++ b/src/pages/Dashboard/Workplace.js @@ -20,14 +20,14 @@ class Workplace extends PureComponent {

- Downloads + Downloads Build Status Coverage Status Downloads @@ -212,7 +212,16 @@ class Workplace extends PureComponent { - + + +
1.新增blade-develop的dockerfile
+
2.新增blade-develop推送docker配置
+
3.新增saber的dockerfile
+
4.新增kuboard k8s部署脚本
+
5.新增kuboard k8s部署方案
+
6.优化pom配置适配新版部署方案
+
7.优化swagger加载逻辑默认开启knife4j
+
1.升级 SpringBoot 至 2.4.4
2.升级 SpringCloud 至 2020.0.2