Skip to content

Commit b3cf13a

Browse files
0xJacky0xJacky
authored
[v1.3 RC] Enhanced domain add, optimized dashboard.
2 parents c8282da + da31777 commit b3cf13a

File tree

14 files changed

+302
-226
lines changed

14 files changed

+302
-226
lines changed

‎README-zh_CN.md‎

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ Nginx 网络管理界面，由 [0xJacky](https://jackyu.cn/) 与 [Hintay](https
7676
- 在线编辑 Nginx 配置文件，编辑器支持 Nginx 配置语法高亮
7777
- 使用 Go 和 Vue 开发，发行版本为单个可执行的二进制文件
7878
- 前端支持暗夜模式
79+
- 保存配置文件后自动测试配置文件并重载 Nginx
7980

8081
### 国际化
8182

@@ -195,51 +196,51 @@ go build -o nginx-ui -v main.go
195196
**安装或升级**
196197

197198
```shell
198-
bash <(curl -L -s https://raw.githubusercontent.com/0xJacky/nginx-ui/master/install.sh) install
199+
bash <(curl -L -s https://ghproxy.com/https://raw.githubusercontent.com/0xJacky/nginx-ui/master/install.sh) install -r https://ghproxy.com/
199200
```
200201
一键安装脚本默认设置的监听端口为 `9000`，HTTP Challenge 端口默认为 `9180`，如果出现端口冲突请进入 `/usr/local/etc/nginx-ui/app.ini` 修改，并使用 `systemctl restart nginx-ui` 重启 Nginx UI 服务。
201202

202203
**卸载 Nginx UI 但保留配置和数据库文件**
203204

204205
```shell
205-
bash <(curl -L -s https://raw.githubusercontent.com/0xJacky/nginx-ui/master/install.sh) remove
206+
bash <(curl -L -s https://ghproxy.com/https://raw.githubusercontent.com/0xJacky/nginx-ui/master/install.sh) remove
206207
```
207208

208209
### 更多用法
209210

210211
````shell
211-
bash <(curl -L -s https://raw.githubusercontent.com/0xJacky/nginx-ui/master/install.sh) help
212+
bash <(curl -L -s https://ghproxy.com/https://raw.githubusercontent.com/0xJacky/nginx-ui/master/install.sh) help
212213
````
213214

214215
## Nginx 反向代理配置示例
215216

216217
```nginx
217218
server {
218-
listen 80;
219-
listen [::]:80;
219+
listen 80;
220+
listen [::]:80;
220221
221-
server_name <your_server_name>;
222+
server_name <your_server_name>;
222223
rewrite ^(.*)$ https://$host$1 permanent;
223224
}
224225
225226
server {
226-
listen 443 ssl http2;
227-
listen [::]:443 ssl http2;
227+
listen 443 ssl http2;
228+
listen [::]:443 ssl http2;
228229
229-
server_name <your_server_name>;
230+
server_name <your_server_name>;
230231
231-
ssl_certificate /path/to/ssl_cert;
232-
ssl_certificate_key /path/to/ssl_cert_key;
232+
ssl_certificate /path/to/ssl_cert;
233+
ssl_certificate_key /path/to/ssl_cert_key;
233234
234235
location / {
235-
proxy_set_header Host $host;
236-
proxy_set_header X-Real-IP $remote_addr;
237-
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
238-
proxy_set_header X-Forwarded-Proto $scheme;
239-
proxy_http_version 1.1;
240-
proxy_set_header Upgrade $http_upgrade;
241-
proxy_set_header Connection upgrade;
242-
proxy_pass http://127.0.0.1:9000/;
236+
proxy_set_header Host $host;
237+
proxy_set_header X-Real-IP $remote_addr;
238+
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
239+
proxy_set_header X-Forwarded-Proto $scheme;
240+
proxy_http_version 1.1;
241+
proxy_set_header Upgrade $http_upgrade;
242+
proxy_set_header Connection upgrade;
243+
proxy_pass http://127.0.0.1:9000/;
243244
}
244245
}
245246
```

‎README-zh_TW.md‎

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ Nginx 網路管理介面，由 [0xJacky](https://jackyu.cn/) 與 [Hintay](https
7878
- 線上編輯 Nginx 配置檔案，編輯器支援 Nginx 配置語法高亮
7979
- 使用 Go 和 Vue 開發，發行版本為單個可執行的二進位制檔案
8080
- 前端支援暗夜模式
81+
- 保存配置文件後自動測試配置文件並重載 Nginx
8182

8283
### 國際化
8384

@@ -215,31 +216,31 @@ bash <(curl -L -s https://raw.githubusercontent.com/0xJacky/nginx-ui/master/inst
215216

216217
```nginx
217218
server {
218-
listen 80;
219-
listen [::]:80;
219+
listen 80;
220+
listen [::]:80;
220221
221-
server_name <your_server_name>;
222+
server_name <your_server_name>;
222223
rewrite ^(.*)$ https://$host$1 permanent;
223224
}
224225
225226
server {
226-
listen 443 ssl http2;
227-
listen [::]:443 ssl http2;
227+
listen 443 ssl http2;
228+
listen [::]:443 ssl http2;
228229
229-
server_name <your_server_name>;
230+
server_name <your_server_name>;
230231
231-
ssl_certificate /path/to/ssl_cert;
232-
ssl_certificate_key /path/to/ssl_cert_key;
232+
ssl_certificate /path/to/ssl_cert;
233+
ssl_certificate_key /path/to/ssl_cert_key;
233234
234235
location / {
235-
proxy_set_header Host $host;
236-
proxy_set_header X-Real-IP $remote_addr;
237-
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
238-
proxy_set_header X-Forwarded-Proto $scheme;
239-
proxy_http_version 1.1;
240-
proxy_set_header Upgrade $http_upgrade;
241-
proxy_set_header Connection upgrade;
242-
proxy_pass http://127.0.0.1:9000/;
236+
proxy_set_header Host $host;
237+
proxy_set_header X-Real-IP $remote_addr;
238+
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
239+
proxy_set_header X-Forwarded-Proto $scheme;
240+
proxy_http_version 1.1;
241+
proxy_set_header Upgrade $http_upgrade;
242+
proxy_set_header Connection upgrade;
243+
proxy_pass http://127.0.0.1:9000/;
243244
}
244245
}
245246
```

‎README.md‎

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ URL：[https://nginxui.jackyu.cn](https://nginxui.jackyu.cn)
7474
- Online editing websites configuration files, the editor support highlight nginx configuration syntax.
7575
- Written in Go and Vue, distribution is a single executable binary.
7676
- Frontend support Dark Mode
77+
- Automatically test configuration file and reload nginx after saving configuration.
7778

7879
### Internationalization
7980

@@ -214,31 +215,31 @@ bash <(curl -L -s https://raw.githubusercontent.com/0xJacky/nginx-ui/master/inst
214215

215216
```nginx
216217
server {
217-
listen 80;
218-
listen [::]:80;
218+
listen 80;
219+
listen [::]:80;
219220
220-
server_name <your_server_name>;
221+
server_name <your_server_name>;
221222
rewrite ^(.*)$ https://$host$1 permanent;
222223
}
223224
224225
server {
225-
listen 443 ssl http2;
226-
listen [::]:443 ssl http2;
226+
listen 443 ssl http2;
227+
listen [::]:443 ssl http2;
227228
228-
server_name <your_server_name>;
229+
server_name <your_server_name>;
229230
230-
ssl_certificate /path/to/ssl_cert;
231-
ssl_certificate_key /path/to/ssl_cert_key;
231+
ssl_certificate /path/to/ssl_cert;
232+
ssl_certificate_key /path/to/ssl_cert_key;
232233
233234
location / {
234-
proxy_set_header Host $host;
235-
proxy_set_header X-Real-IP $remote_addr;
236-
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
237-
proxy_set_header X-Forwarded-Proto $scheme;
238-
proxy_http_version 1.1;
239-
proxy_set_header Upgrade $http_upgrade;
240-
proxy_set_header Connection upgrade;
241-
proxy_pass http://127.0.0.1:9000/;
235+
proxy_set_header Host $host;
236+
proxy_set_header X-Real-IP $remote_addr;
237+
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
238+
proxy_set_header X-Forwarded-Proto $scheme;
239+
proxy_http_version 1.1;
240+
proxy_set_header Upgrade $http_upgrade;
241+
proxy_set_header Connection upgrade;
242+
proxy_pass http://127.0.0.1:9000/;
242243
}
243244
}
244245
```

‎frontend/src/components/Chart/RadialBarChart.vue‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,20 +35,20 @@ export default {
3535
series: this.series,
3636
chart: {
3737
type: 'radialBar',
38-
offsetY: 0
38+
offsetY: -30
3939
},
4040
plotOptions: {
4141
radialBar: {
4242
startAngle: -135,
4343
endAngle: 135,
4444
dataLabels: {
4545
name: {
46-
fontSize: '15px',
46+
fontSize: '14px',
4747
color: this.colors,
48-
offsetY: 56
48+
offsetY: 36
4949
},
5050
value: {
51-
offsetY: 60,
51+
offsetY: 50,
5252
fontSize: '14px',
5353
color: undefined,
5454
formatter: () => {return ''}
@@ -82,16 +82,16 @@ export default {
8282
.container {
8383
position: relative;
8484
margin: 0 auto;
85-
height: 172px;
85+
height: 112px!important;
8686
.text {
8787
position: absolute;
88-
top: calc(50% - 3px);
88+
top: calc(50% - 5px);
8989
width: 100%;
9090
text-align: center;
9191
}
9292
.bottom_text {
9393
position: absolute;
94-
top: calc(152px);
94+
top: calc(106px);
9595
font-weight: 600;
9696
width: 100%;
9797
text-align: center;

‎frontend/src/lazy.js‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,8 @@ import {
4747
Tabs,
4848
Tooltip,
4949
Transfer,
50-
Upload
50+
Upload,
51+
Tag
5152
} from 'ant-design-vue'
5253

5354
Vue.use(ConfigProvider)
@@ -97,6 +98,7 @@ Vue.use(Result)
9798
Vue.use(pageHeader)
9899
Vue.use(Switch)
99100
Vue.use(Space)
101+
Vue.use(Tag)
100102

101103
Vue.prototype.$confirm = Modal.confirm
102104
Vue.prototype.$message = message

0 commit comments

Comments
 (0)