Skip to content

Commit bc7b765

Browse files
moshowgamemoshowgame
authored
Merge pull request #154 from moshowgame/newui
2024.04.23 | 切换BootCDN进行加速+前端NEWUI改版
2 parents 28ecae4 + 57937c5 commit bc7b765

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+86713
-72
lines changed

‎README.md

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@
3535

3636
- 感谢`卡卡`将他部署在[BEJSON](https://java.bejson.com/generator)上，目前是besjon专供的`金牌工具`(线上版本不一定是最新的，会有延迟，请谅解，谢谢).<br>
3737
- 感谢`jully.top`部署的副本 [https://jully.top/generator/](https://jully.top/generator/)。<br>
38-
- 感谢`三叔`将他部署在[DEVTOOLS](https://java.devtools.cn/) （Demised）上，继续作为Golden Tool开放给大家使用。<br>
39-
- 感谢`七牛`提供的云js/css免费加速服务，它尽可能全面收录优秀的开源库，并免费为之提供 CDN 加速服务，使之有更好的访问速度和稳定的环境。
38+
- 感谢`BootCDN`提供稳定、快速、免费的前端开源项目 CDN 加速服务
4039
- Thanks for `JetBrains` providing us the `Licenses for Open Source Development` ，[Get free access to all JetBrains tools for developing your open source project!](https://www.jetbrains.com/community/opensource/#support) .<br>
4140

4241
| 访问地址 | http://localhost:1234/generator |
4342
|:-----------------------|:--------------------------------------------------------------|
44-
| BEJSON 在线地址 | https://java.bejson.com/generator/ |
43+
| BEJSON 金牌工具 在线地址 | https://java.bejson.com/generator/ |
44+
| JSON.CN 金牌工具 在线地址 | https://java.json.cn/generator/ |
4545
| Jully 在线地址 | https://jully.top/generator/ |
4646
| DEVTOOLS 在线地址（Demised） | https://java.devtools.cn |
4747
| CSDN BLOG | https://zhengkai.blog.csdn.net |
@@ -59,7 +59,7 @@
5959
- 可设置`表名前缀`，例如sys_user前缀为sys_之后可以正确生成user类
6060
- 可在`applicaltion.yml`中的`OEM.mode`设置`js/css引入模式`为`local`(本地模式，默认)/`CDN`(云CDN模式，在线网站推荐，省流量)
6161
- OEM信息可以在`applicaltion.yml`中的`OEM`中更改
62-
- *支持公共js/css的Local/CDN模式切换，方便`本地`或者`工具站`进行部署，可以在`application.yml`的`OEM.Mode=`进行设置，之后请在`header-CDN.html`/`header-local.html`中检查对应js/css配置是否正确。
62+
- *支持公共js/css的Local/CDN模式切换，方便`本地`或者`工具站`进行部署，可以在`application.yml`的`OEM.Mode=`进行设置，之后请在`header-CDN-v2.html`/`header-local-v2.html`中检查对应js/css配置是否正确。默认为`CDN`模式。对于没有网络的环境请使用`local`模式。
6363

6464
# Branch Detail 分支介绍
6565
- Master：主力分支，基于SpringBoot3+，需要JDK17+
@@ -68,11 +68,11 @@
6868

6969
# 更新预告
7070
1.计划引入DJANGO等其他语言的ORM模板，欢迎大家submit相关代码供参考
71-
2.计划升级一下UI界面
7271

7372
# Update Logs
7473
| 更新日期 | 更新内容 |
7574
|:-----------|:------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
75+
| 2024.04.23 | 切换为更快更稳定的BootCDN进行加速。<br>前端NEWUI改版（基于AdminLTE+Bootstrap+Vue+ElementUI混合模式）。|
7676
| 2024.04.22 | [Java CI with Maven](https://github.com/moshowgame/SpringBootCodeGenerator/actions/workflows/maven.yml) 更新<br>SpringBoot升级到3.2.5<br>FastJSON升级到FastJSON2.0.49|
7777
| 2024.04.21 | 推出JDK11分支，支持JDK8/JDK11/JDK17等版本，兼容性较好但维护速度较慢，为了更好兼容旧机器和旧环境|
7878
| 2024.04.20 | 修复CDN版本cdn.staticfile.org域名备份失败问题，已同步更新到cdn.staticfile.net（本地版本则不受影响）|
@@ -181,9 +181,18 @@
181181
- 当项目从2.7.x的springboot升级到3.0.x的时候，遇到一个问题“java: 程序包javax.servlet.http不存在” 问题：
182182
[java: 程序包javax.servlet.http不存在](https://zhengkai.blog.csdn.net/article/details/131362304)
183183

184+
2024 NEWUI版本
185+
<img src="./newui_version.png">
186+
2021 半Vue半JS版本
184187
<img src="./codegenerator1.png">
188+
2019 初代版本
189+
<img src="./old_version.png">
190+
配置模板
185191
<img src="./codegenerator2.png">
192+
网站流量分析-2024
186193
<img src="./site_analysis-2024.png">
194+
网站流量分析-2022
187195
<img src="./site_analysis.png">
196+
代码与你，越变越美
188197
<img src="./donate.png">
189198

‎generator-web/src/main/resources/application-bejson.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,10 @@ OEM:
5252
keywords: sql转实体类,sql转DAO,SQL转service,SQL转JPA实现,SQL转MYBATIS实现
5353
title: JAVA在线代码生成
5454
slogan: For reducing the repetitive CRUD work
55-
description: SpringBootCodeGenerator(JAVA代码生成平台)，又名`大狼狗代码生成器`、`SQL转JAVA`、`SQL转JPA`、`SQL转Mybatis`、`Mybatis在线生成器`、`SQL转Java JPA、MYBATIS实现类代码生成平台`。
55+
description: <p>SpringBootCodeGenerator(JAVA代码生成平台)，<br>又名`大狼狗代码生成器`、`SQL转JAVA`、`SQL转JPA`、`SQL转Mybatis`、`Mybatis在线生成器`、`SQL转Java JPA、MYBATIS实现类代码生成平台`。</p><p>——以解放双手为目的，减少大量的重复CRUD工作，可通过建表SQL语句生成JPA/JdbcTemplate/Mybatis/MybatisPlus/BeetlSQL/CommonMapper等相关模板代码。</p>
5656
author: BEJSON
5757
packageName: www.bejson.com
58-
copyright: powered by Moshow郑锴(大狼狗)
58+
copyright: Powered by Moshow郑锴 , Might the holy light be with you !
5959
returnUtilSuccess: ReturnT.success
6060
returnUtilFailure: ReturnT.error
6161
outputStr: www.bejson.com

‎generator-web/src/main/resources/application-dev.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,11 @@ OEM:
5252
keywords: sql转实体类,sql转DAO,SQL转service,SQL转JPA实现,SQL转MYBATIS实现
5353
title: JAVA代码生成平台
5454
slogan: For reducing the repetitive CRUD work
55-
description: SpringBootCodeGenerator(JAVA代码生成平台)，又名`大狼狗代码生成器`、`SQL转JAVA`、`SQL转JPA`、`SQL转Mybatis`、`Mybatis在线生成器`、`SQL转Java JPA、MYBATIS实现类代码生成平台`。
56-
author: zhengkai.blog.csdn.net
55+
description: <p>SpringBootCodeGenerator(JAVA代码生成平台)，<br>又名`大狼狗代码生成器`、`SQL转JAVA`、`SQL转JPA`、`SQL转Mybatis`、`Mybatis在线生成器`、`SQL转Java JPA、MYBATIS实现类代码生成平台`。</p><p>——以解放双手为目的，减少大量的重复CRUD工作，可通过建表SQL语句生成JPA/JdbcTemplate/Mybatis/MybatisPlus/BeetlSQL/CommonMapper等相关模板代码。</p>
56+
author: Zhengkai.blog.csdn.net
5757
packageName: com.software.system
58-
copyright: powered by Moshow郑锴(大狼狗)
58+
copyright: Powered by Moshow郑锴 , Might the holy light be with you !
5959
returnUtilSuccess: ReturnT.success
6060
returnUtilFailure: ReturnT.error
61-
outputStr: zhengkai.blog.csdn.net
61+
outputStr: Zhengkai.blog.csdn.net
6262
mode: local

‎generator-web/src/main/resources/statics/css/google.css

Lines changed: 252 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,252 @@
1+
/* cyrillic-ext */
2+
@font-face {
3+
font-family: 'Source Sans Pro';
4+
font-style: italic;
5+
font-weight: 400;
6+
font-display: fallback;
7+
src: url(6xK1dSBYKcSV-LCoeQqfX1RYOo3qPZ7qsDJT9g.woff2) format('woff2');
8+
unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
9+
}
10+
/* cyrillic */
11+
@font-face {
12+
font-family: 'Source Sans Pro';
13+
font-style: italic;
14+
font-weight: 400;
15+
font-display: fallback;
16+
src: url(6xK1dSBYKcSV-LCoeQqfX1RYOo3qPZ7jsDJT9g.woff2) format('woff2');
17+
unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
18+
}
19+
/* greek-ext */
20+
@font-face {
21+
font-family: 'Source Sans Pro';
22+
font-style: italic;
23+
font-weight: 400;
24+
font-display: fallback;
25+
src: url(6xK1dSBYKcSV-LCoeQqfX1RYOo3qPZ7rsDJT9g.woff2) format('woff2');
26+
unicode-range: U+1F00-1FFF;
27+
}
28+
/* greek */
29+
@font-face {
30+
font-family: 'Source Sans Pro';
31+
font-style: italic;
32+
font-weight: 400;
33+
font-display: fallback;
34+
src: url(6xK1dSBYKcSV-LCoeQqfX1RYOo3qPZ7ksDJT9g.woff2) format('woff2');
35+
unicode-range: U+0370-03FF;
36+
}
37+
/* vietnamese */
38+
@font-face {
39+
font-family: 'Source Sans Pro';
40+
font-style: italic;
41+
font-weight: 400;
42+
font-display: fallback;
43+
src: url(6xK1dSBYKcSV-LCoeQqfX1RYOo3qPZ7osDJT9g.woff2) format('woff2');
44+
unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
45+
}
46+
/* latin-ext */
47+
@font-face {
48+
font-family: 'Source Sans Pro';
49+
font-style: italic;
50+
font-weight: 400;
51+
font-display: fallback;
52+
src: url(6xK1dSBYKcSV-LCoeQqfX1RYOo3qPZ7psDJT9g.woff2) format('woff2');
53+
unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
54+
}
55+
/* latin */
56+
@font-face {
57+
font-family: 'Source Sans Pro';
58+
font-style: italic;
59+
font-weight: 400;
60+
font-display: fallback;
61+
src: url(6xK1dSBYKcSV-LCoeQqfX1RYOo3qPZ7nsDI.woff2) format('woff2');
62+
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
63+
}
64+
/* cyrillic-ext */
65+
@font-face {
66+
font-family: 'Source Sans Pro';
67+
font-style: normal;
68+
font-weight: 300;
69+
font-display: fallback;
70+
src: url(6xKydSBYKcSV-LCoeQqfX1RYOo3ik4zwmhduz8A.woff2) format('woff2');
71+
unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
72+
}
73+
/* cyrillic */
74+
@font-face {
75+
font-family: 'Source Sans Pro';
76+
font-style: normal;
77+
font-weight: 300;
78+
font-display: fallback;
79+
src: url(6xKydSBYKcSV-LCoeQqfX1RYOo3ik4zwkxduz8A.woff2) format('woff2');
80+
unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
81+
}
82+
/* greek-ext */
83+
@font-face {
84+
font-family: 'Source Sans Pro';
85+
font-style: normal;
86+
font-weight: 300;
87+
font-display: fallback;
88+
src: url(6xKydSBYKcSV-LCoeQqfX1RYOo3ik4zwmxduz8A.woff2) format('woff2');
89+
unicode-range: U+1F00-1FFF;
90+
}
91+
/* greek */
92+
@font-face {
93+
font-family: 'Source Sans Pro';
94+
font-style: normal;
95+
font-weight: 300;
96+
font-display: fallback;
97+
src: url(6xKydSBYKcSV-LCoeQqfX1RYOo3ik4zwlBduz8A.woff2) format('woff2');
98+
unicode-range: U+0370-03FF;
99+
}
100+
/* vietnamese */
101+
@font-face {
102+
font-family: 'Source Sans Pro';
103+
font-style: normal;
104+
font-weight: 300;
105+
font-display: fallback;
106+
src: url(6xKydSBYKcSV-LCoeQqfX1RYOo3ik4zwmBduz8A.woff2) format('woff2');
107+
unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
108+
}
109+
/* latin-ext */
110+
@font-face {
111+
font-family: 'Source Sans Pro';
112+
font-style: normal;
113+
font-weight: 300;
114+
font-display: fallback;
115+
src: url(6xKydSBYKcSV-LCoeQqfX1RYOo3ik4zwmRduz8A.woff2) format('woff2');
116+
unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
117+
}
118+
/* latin */
119+
@font-face {
120+
font-family: 'Source Sans Pro';
121+
font-style: normal;
122+
font-weight: 300;
123+
font-display: fallback;
124+
src: url(6xKydSBYKcSV-LCoeQqfX1RYOo3ik4zwlxdu.woff2) format('woff2');
125+
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
126+
}
127+
/* cyrillic-ext */
128+
@font-face {
129+
font-family: 'Source Sans Pro';
130+
font-style: normal;
131+
font-weight: 400;
132+
font-display: fallback;
133+
src: url(6xK3dSBYKcSV-LCoeQqfX1RYOo3qNa7lqDY.woff2) format('woff2');
134+
unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
135+
}
136+
/* cyrillic */
137+
@font-face {
138+
font-family: 'Source Sans Pro';
139+
font-style: normal;
140+
font-weight: 400;
141+
font-display: fallback;
142+
src: url(6xK3dSBYKcSV-LCoeQqfX1RYOo3qPK7lqDY.woff2) format('woff2');
143+
unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
144+
}
145+
/* greek-ext */
146+
@font-face {
147+
font-family: 'Source Sans Pro';
148+
font-style: normal;
149+
font-weight: 400;
150+
font-display: fallback;
151+
src: url(6xK3dSBYKcSV-LCoeQqfX1RYOo3qNK7lqDY.woff2) format('woff2');
152+
unicode-range: U+1F00-1FFF;
153+
}
154+
/* greek */
155+
@font-face {
156+
font-family: 'Source Sans Pro';
157+
font-style: normal;
158+
font-weight: 400;
159+
font-display: fallback;
160+
src: url(6xK3dSBYKcSV-LCoeQqfX1RYOo3qO67lqDY.woff2) format('woff2');
161+
unicode-range: U+0370-03FF;
162+
}
163+
/* vietnamese */
164+
@font-face {
165+
font-family: 'Source Sans Pro';
166+
font-style: normal;
167+
font-weight: 400;
168+
font-display: fallback;
169+
src: url(6xK3dSBYKcSV-LCoeQqfX1RYOo3qN67lqDY.woff2) format('woff2');
170+
unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
171+
}
172+
/* latin-ext */
173+
@font-face {
174+
font-family: 'Source Sans Pro';
175+
font-style: normal;
176+
font-weight: 400;
177+
font-display: fallback;
178+
src: url(6xK3dSBYKcSV-LCoeQqfX1RYOo3qNq7lqDY.woff2) format('woff2');
179+
unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
180+
}
181+
/* latin */
182+
@font-face {
183+
font-family: 'Source Sans Pro';
184+
font-style: normal;
185+
font-weight: 400;
186+
font-display: fallback;
187+
src: url(6xK3dSBYKcSV-LCoeQqfX1RYOo3qOK7l.woff2) format('woff2');
188+
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
189+
}
190+
/* cyrillic-ext */
191+
@font-face {
192+
font-family: 'Source Sans Pro';
193+
font-style: normal;
194+
font-weight: 700;
195+
font-display: fallback;
196+
src: url(6xKydSBYKcSV-LCoeQqfX1RYOo3ig4vwmhduz8A.woff2) format('woff2');
197+
unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
198+
}
199+
/* cyrillic */
200+
@font-face {
201+
font-family: 'Source Sans Pro';
202+
font-style: normal;
203+
font-weight: 700;
204+
font-display: fallback;
205+
src: url(6xKydSBYKcSV-LCoeQqfX1RYOo3ig4vwkxduz8A.woff2) format('woff2');
206+
unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
207+
}
208+
/* greek-ext */
209+
@font-face {
210+
font-family: 'Source Sans Pro';
211+
font-style: normal;
212+
font-weight: 700;
213+
font-display: fallback;
214+
src: url(6xKydSBYKcSV-LCoeQqfX1RYOo3ig4vwmxduz8A.woff2) format('woff2');
215+
unicode-range: U+1F00-1FFF;
216+
}
217+
/* greek */
218+
@font-face {
219+
font-family: 'Source Sans Pro';
220+
font-style: normal;
221+
font-weight: 700;
222+
font-display: fallback;
223+
src: url(6xKydSBYKcSV-LCoeQqfX1RYOo3ig4vwlBduz8A.woff2) format('woff2');
224+
unicode-range: U+0370-03FF;
225+
}
226+
/* vietnamese */
227+
@font-face {
228+
font-family: 'Source Sans Pro';
229+
font-style: normal;
230+
font-weight: 700;
231+
font-display: fallback;
232+
src: url(6xKydSBYKcSV-LCoeQqfX1RYOo3ig4vwmBduz8A.woff2) format('woff2');
233+
unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
234+
}
235+
/* latin-ext */
236+
@font-face {
237+
font-family: 'Source Sans Pro';
238+
font-style: normal;
239+
font-weight: 700;
240+
font-display: fallback;
241+
src: url(6xKydSBYKcSV-LCoeQqfX1RYOo3ig4vwmRduz8A.woff2) format('woff2');
242+
unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
243+
}
244+
/* latin */
245+
@font-face {
246+
font-family: 'Source Sans Pro';
247+
font-style: normal;
248+
font-weight: 700;
249+
font-display: fallback;
250+
src: url(6xKydSBYKcSV-LCoeQqfX1RYOo3ig4vwlxdu.woff2) format('woff2');
251+
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
252+
}

‎generator-web/src/main/resources/statics/img/AdminLTELogo.png

2.58 KB
Loading

‎generator-web/src/main/resources/statics/js/common.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,13 @@ $.ajaxSetup({
2323
//重写alert
2424
window.alert = function(msg, callback){
2525
//重写为msg而不是alert
26-
parent.layer.msg(msg, {icon: 6});
26+
// parent.layer.msg(msg, {icon: 6});
27+
toastr.success(msg)
2728
}
2829
window.error = function(msg, callback){
2930
//重写为msg而不是alert
30-
parent.layer.msg(msg, {icon: 5});
31+
// parent.layer.msg(msg, {icon: 5});
32+
toastr.error(msg)
3133
}
3234
//重写confirm式样框
3335
window.confirm = function(msg, callback){

‎generator-web/src/main/resources/statics/js/main.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ const vm = new Vue({
121121
generate : function(){
122122
//get value from codemirror
123123
vm.formData.tableSql=$.inputArea.getValue();
124-
axios.post("code/generate",vm.formData).then(function(res){
124+
axios.post(basePath+"/code/generate",vm.formData).then(function(res){
125125
if(res.code===500){
126126
error("生成失败");
127127
return;
@@ -146,7 +146,7 @@ const vm = new Vue({
146146
},
147147
created: function () {
148148
//load all templates for selections 加载所有模板供选择
149-
axios.post("template/all",{
149+
axios.post(basePath+"/template/all",{
150150
id:1234
151151
}).then(function(res){
152152
//console.log(res.templates);

‎generator-web/src/main/resources/statics/plugins/admin-lte/adminlte.min.css

Lines changed: 12 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎generator-web/src/main/resources/statics/plugins/admin-lte/adminlte.min.css.map

Whitespace-only changes.

‎generator-web/src/main/resources/statics/plugins/admin-lte/adminlte.min.js

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎generator-web/src/main/resources/statics/plugins/admin-lte/adminlte.min.js.map

Whitespace-only changes.

‎generator-web/src/main/resources/statics/plugins/axios/axios.min.map

Whitespace-only changes.

0 commit comments

Comments
 (0)