diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..4f6d7ab --- /dev/null +++ b/Dockerfile @@ -0,0 +1,11 @@ +FROM nginx:stable-alpine-perl + +RUN rm -f /etc/nginx/nginx.conf \ + && rm -f /etc/nginx/conf.d/default.conf +COPY docker/nginx.k8s.conf /etc/nginx/nginx.conf + +EXPOSE 80 + +COPY ./dist /usr/share/nginx/html + +ENTRYPOINT ["nginx", "-g", "daemon off;"] diff --git a/README.md b/README.md index f203499..87cc9d0 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@
-
+
@@ -28,6 +28,9 @@
## 架构图
+## 趋势图
+
+
## 工程结构
```
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)
## 技术文档
+* [SpringBlade常见问题集锦](https://sns.bladex.vip/article-14966.html)
* [SpringBlade开发手册一览](https://gitee.com/smallc/SpringBlade/wikis/SpringBlade开发手册)
-* [常见问题集锦](https://sns.bladex.vip/article-14966.html)
+* [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 5d7ad80..5ae2fb2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "saber-admin",
- "version": "3.0.2",
+ "version": "3.0.3",
"private": true,
"scripts": {
"serve": "vue-cli-service serve",
diff --git a/src/views/wel/index.vue b/src/views/wel/index.vue
index 3a1f7d3..7c2f5a9 100644
--- a/src/views/wel/index.vue
+++ b/src/views/wel/index.vue
@@ -3,7 +3,7 @@
-
+
@@ -125,6 +125,15 @@