| 2024.04.23 | 切换为更快更稳定的BootCDN进行加速。<br>前端NEWUI改版（基于AdminLTE+Bootstrap+Vue+ElementUI混合模式）。|

| 2024.04.23 | 切换为更快更稳定的BootCDN进行加速。<br>前端NEWUI改版（基于AdminLTE+Bootstrap+Vue+ElementUI混合模式）。|

README.md

@@ -59,7 +59,7 @@
 - 可设置`表名前缀`，例如sys_user前缀为sys_之后可以正确生成user类
 - 可在`applicaltion.yml`中的`OEM.mode`设置`js/css引入模式`为`local`(本地模式，默认)/`CDN`(云CDN模式，在线网站推荐，省流量)
 - OEM信息可以在`applicaltion.yml`中的`OEM`中更改
-- *支持公共js/css的Local/CDN模式切换，方便`本地`或者`工具站`进行部署，可以在`application.yml`的`OEM.Mode=`进行设置，之后请在`header-CDN.html`/`header-local.html`中检查对应js/css配置是否正确。
+- *支持公共js/css的Local/CDN模式切换，方便`本地`或者`工具站`进行部署，可以在`application.yml`的`OEM.Mode=`进行设置，之后请在`header-CDN-v2.html`/`header-local-v2.html`中检查对应js/css配置是否正确。默认为`CDN`模式。对于没有网络的环境请使用`local`模式。
 
 # Branch Detail 分支介绍
 - Master：主力分支，基于SpringBoot3+，需要JDK17+
@@ -68,11 +68,11 @@
 
 # 更新预告
 1.计划引入DJANGO等其他语言的ORM模板，欢迎大家submit相关代码供参考
-2.计划升级一下UI界面
 
 # Update Logs
 | 更新日期       | 更新内容                                                                                                                                                                                                                                                              |
 |:-----------|:------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| 2024.04.23 | 切换为更快更稳定的BootCDN进行加速。<br>前端NEWUI改版（基于AdminLTE+Bootstrap+Vue+ElementUI混合模式）。|
 | 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|
 | 2024.04.21 | 推出JDK11分支，支持JDK8/JDK11/JDK17等版本，兼容性较好但维护速度较慢，为了更好兼容旧机器和旧环境|
 | 2024.04.20 | 修复CDN版本cdn.staticfile.org域名备份失败问题，已同步更新到cdn.staticfile.net（本地版本则不受影响）|
@@ -181,9 +181,18 @@
 - 当项目从2.7.x的springboot升级到3.0.x的时候，遇到一个问题“java: 程序包javax.servlet.http不存在” 问题：
  [java: 程序包javax.servlet.http不存在](https://zhengkai.blog.csdn.net/article/details/131362304)
 
+2024 NEWUI版本
+<img src="./newui_version.png">
+2021 半Vue半JS版本
 <img src="./codegenerator1.png">
+2019 初代版本
+<img src="./old_version.png">
+配置模板
 <img src="./codegenerator2.png">
+网站流量分析-2024
 <img src="./site_analysis-2024.png">
+网站流量分析-2022
 <img src="./site_analysis.png">
+代码与你，越变越美
 <img src="./donate.png">
 

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

@@ -52,10 +52,10 @@ OEM:
   keywords: sql转实体类,sql转DAO,SQL转service,SQL转JPA实现,SQL转MYBATIS实现
   title: JAVA在线代码生成
   slogan: For reducing the repetitive CRUD work
-  description: SpringBootCodeGenerator(JAVA代码生成平台)，又名`大狼狗代码生成器`、`SQL转JAVA`、`SQL转JPA`、`SQL转Mybatis`、`Mybatis在线生成器`、`SQL转Java JPA、MYBATIS实现类代码生成平台`。
+  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>
   author: BEJSON
   packageName: www.bejson.com
-  copyright: powered by Moshow郑锴(大狼狗)
+  copyright: Powered by Moshow郑锴 , Might the holy light be with you ! 
   returnUtilSuccess: ReturnT.success
   returnUtilFailure: ReturnT.error
   outputStr: www.bejson.com

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

@@ -52,11 +52,11 @@ OEM:
   keywords: sql转实体类,sql转DAO,SQL转service,SQL转JPA实现,SQL转MYBATIS实现
   title: JAVA代码生成平台
   slogan: For reducing the repetitive CRUD work
-  description: SpringBootCodeGenerator(JAVA代码生成平台)，又名`大狼狗代码生成器`、`SQL转JAVA`、`SQL转JPA`、`SQL转Mybatis`、`Mybatis在线生成器`、`SQL转Java JPA、MYBATIS实现类代码生成平台`。
-  author: zhengkai.blog.csdn.net
+  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>
+  author: Zhengkai.blog.csdn.net
   packageName: com.software.system
-  copyright: powered by Moshow郑锴(大狼狗)
+  copyright: Powered by Moshow郑锴 , Might the holy light be with you ! 
   returnUtilSuccess: ReturnT.success
   returnUtilFailure: ReturnT.error
-  outputStr: zhengkai.blog.csdn.net
+  outputStr: Zhengkai.blog.csdn.net
   mode: local

generator-web/src/main/resources/statics/plugins/layer/mobile/layer.js

@@ -1,2 +0,0 @@
-/*! layer mobile-v2.0.0 Web 弹层组件 MIT License */
- ;!function(e){"use strict";var t=document,n="querySelectorAll",i="getElementsByClassName",a=function(e){return t[n](e)},s={type:0,shade:!0,shadeClose:!0,fixed:!0,anim:"scale"},l={extend:function(e){var t=JSON.parse(JSON.stringify(s));for(var n in e)t[n]=e[n];return t},timer:{},end:{}};l.touch=function(e,t){e.addEventListener("click",function(e){t.call(this,e)},!1)};var r=0,o=["layui-m-layer"],c=function(e){var t=this;t.config=l.extend(e),t.view()};c.prototype.view=function(){var e=this,n=e.config,s=t.createElement("div");e.id=s.id=o[0]+r,s.setAttribute("class",o[0]+" "+o[0]+(n.type||0)),s.setAttribute("index",r);var l=function(){var e="object"==typeof n.title;return n.title?'<h3 style="'+(e?n.title[1]:"")+'">'+(e?n.title[0]:n.title)+"</h3>":""}(),c=function(){"string"==typeof n.btn&&(n.btn=[n.btn]);var e,t=(n.btn||[]).length;return 0!==t&&n.btn?(e='<span yes type="1">'+n.btn[0]+"</span>",2===t&&(e='<span no type="0">'+n.btn[1]+"</span>"+e),'<div class="layui-m-layerbtn">'+e+"</div>"):""}();if(n.fixed||(n.top=n.hasOwnProperty("top")?n.top:100,n.style=n.style||"",n.style+=" top:"+(t.body.scrollTop+n.top)+"px"),2===n.type&&(n.content='<i></i><i class="layui-m-layerload"></i><i></i><p>'+(n.content||"")+"</p>"),n.skin&&(n.anim="up"),"msg"===n.skin&&(n.shade=!1),s.innerHTML=(n.shade?"<div "+("string"==typeof n.shade?'style="'+n.shade+'"':"")+' class="layui-m-layershade"></div>':"")+'<div class="layui-m-layermain" '+(n.fixed?"":'style="position:static;"')+'><div class="layui-m-layersection"><div class="layui-m-layerchild '+(n.skin?"layui-m-layer-"+n.skin+" ":"")+(n.className?n.className:"")+" "+(n.anim?"layui-m-anim-"+n.anim:"")+'" '+(n.style?'style="'+n.style+'"':"")+">"+l+'<div class="layui-m-layercont">'+n.content+"</div>"+c+"</div></div></div>",!n.type||2===n.type){var d=t[i](o[0]+n.type),y=d.length;y>=1&&layer.close(d[0].getAttribute("index"))}document.body.appendChild(s);var u=e.elem=a("#"+e.id)[0];n.success&&n.success(u),e.index=r++,e.action(n,u)},c.prototype.action=function(e,t){var n=this;e.time&&(l.timer[n.index]=setTimeout(function(){layer.close(n.index)},1e3*e.time));var a=function(){var t=this.getAttribute("type");0==t?(e.no&&e.no(),layer.close(n.index)):e.yes?e.yes(n.index):layer.close(n.index)};if(e.btn)for(var s=t[i]("layui-m-layerbtn")[0].children,r=s.length,o=0;o<r;o++)l.touch(s[o],a);if(e.shade&&e.shadeClose){var c=t[i]("layui-m-layershade")[0];l.touch(c,function(){layer.close(n.index,e.end)})}e.end&&(l.end[n.index]=e.end)},e.layer={v:"2.0",index:r,open:function(e){var t=new c(e||{});return t.index},close:function(e){var n=a("#"+o[0]+e)[0];n&&(n.innerHTML="",t.body.removeChild(n),clearTimeout(l.timer[e]),delete l.timer[e],"function"==typeof l.end[e]&&l.end[e](),delete l.end[e])},closeAll:function(){for(var e=t[i](o[0]),n=0,a=e.length;n<a;n++)layer.close(0|e[0].getAttribute("index"))}},"function"==typeof define?define(function(){return layer}):function(){var e=document.scripts,n=e[e.length-1],i=n.src,a=i.substring(0,i.lastIndexOf("/")+1);n.getAttribute("merge")||document.head.appendChild(function(){var e=t.createElement("link");return e.href=a+"need/layer.css?2.0",e.type="text/css",e.rel="styleSheet",e.id="layermcss",e}())}()}(window);

generator-web/src/main/resources/templates/header-local-v2.html

@@ -9,15 +9,22 @@
 <link rel="stylesheet" href="${request.contextPath}/statics/plugins/element-ui/theme-chalk/index.min.css">
 <script src="${request.contextPath}/statics/plugins/axios/axios.min.js"></script>
 
+<!--common.js-->
 <script src="${request.contextPath}/statics/js/common.js"></script>
-<link rel="stylesheet" href="${request.contextPath}/statics/css/main.css">
 
 <!--[if lt IE 9]>
 <script src="${request.contextPath}/statics/plugins/IE/html5shiv.min.js"></script>
 <script src="${request.contextPath}/statics/plugins/IE/respond.min.js"></script>
 <![endif]-->
 
-<!-- codemirror -->
+<!-- Bootstrap 4 -->
+<script src="${request.contextPath}/statics/plugins/bootstrap/js/bootstrap.bundle.min.js"></script>
+<!-- AdminLTE 3 -->
+<script src="${request.contextPath}/statics/plugins/admin-lte/adminlte.min.js"></script>
+<!-- Toastr 2 -->
+<script src="${request.contextPath}/statics/plugins/toastr/toastr.min.js"></script>
+
+<!-- import codemirror -->
 <script src="${request.contextPath}/statics/plugins/codemirror/codemirror.min.js"></script>
 <script src="${request.contextPath}/statics/plugins/codemirror/javascript.min.js"></script>
 <script src="${request.contextPath}/statics/plugins/codemirror/clike.min.js"></script>
@@ -26,19 +33,12 @@
 <link rel="stylesheet" href="${request.contextPath}/statics/plugins/codemirror/codemirror.min.css">
 <link rel="stylesheet" href="${request.contextPath}/statics/plugins/codemirror/idea.min.css">
 
-<!-- bootstrap -->
-<link rel="stylesheet" href="${request.contextPath}/statics/css/AdminLTE.min.css">
-<link rel="stylesheet" href="${request.contextPath}/statics/css/all-skins.min.css">
-<link rel="stylesheet" href="${request.contextPath}/statics/css/bootstrap.min.css">
-<!--<link rel="stylesheet" href="${request.contextPath}/statics/css/font-awesome.min.css">-->
-<!--<script src="${request.contextPath}/statics/libs/bootstrap.min.js"></script>-->
+<!--bootsrap css-->
+<link rel="stylesheet" href="${request.contextPath}/statics/plugins/bootstrap/css/bootstrap.min.css">
+<link rel="stylesheet" href="${request.contextPath}/statics/plugins/fontawesome-free/css/all.min.css">
 
 
-
-
-
-<!-- layer -->
-<script src="${request.contextPath}/statics/plugins/layer/layer.js"></script>
-<link rel="stylesheet" href="${request.contextPath}/statics/plugins/layer/theme/default/layer.css">
-<!--<script src="${request.contextPath}/statics/plugins/layer/mobile/layer.js"></script>
-<link rel="stylesheet" href="${request.contextPath}/statics/plugins/layer/mobile/layer.css">-->
+<!-- Admin-LTE主题样式 -->
+<link rel="stylesheet" href="${request.contextPath}/statics/plugins/admin-lte/adminlte.min.css">
+<!-- Toastr CSS -->
+<link rel="stylesheet" href="${request.contextPath}/statics/plugins/toastr/toastr.min.css">

generator-web/src/main/resources/templates/header.html

@@ -13,7 +13,7 @@
         var s = document.getElementsByTagName("script")[0];
         s.parentNode.insertBefore(hm, s);
     })();
-
+    //set base path for fixing the revertProxy forwarding path issue
     var basePath = "${request.contextPath}";
     console.log("basePath",basePath)
 </script>

generator-web/src/main/resources/templates/index.html

@@ -56,9 +56,7 @@ by https://zhengkai.blog.csdn.net
           <div class="col-lg-12">
 
             <blockquote class="quote-secondary">
-              <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>
-        
+              ${(value.description)!!}
             </blockquote>
 
             <!-- <div class="card">
@@ -116,7 +114,7 @@ by https://zhengkai.blog.csdn.net
       Version ${(value.version)!!}
     </div>
     <!-- Default to the left -->
-    <strong>Powered by Moshow郑锴 , Might the holy light be with you ! <a href="https://zhengkai.blog.csdn.net" target="_blank"><i class="fa fa-fw fa-thumbs-up"></i>zhengkai.blog.csdn.net</a> <a href="https://github.com/moshowgame/SpringBootCodeGenerator/blob/master/donate.png?raw=true" target="_blank"><i class="fa fa-fw fa-credit-card"></i>打赏</a>
+    <strong>${(value.copyright)!!} <a href="https://zhengkai.blog.csdn.net" target="_blank"><i class="fa fa-fw fa-thumbs-up"></i>zhengkai.blog.csdn.net</a> <a href="https://github.com/moshowgame/SpringBootCodeGenerator/blob/master/donate.png?raw=true" target="_blank"><i class="fa fa-fw fa-credit-card"></i>打赏</a>
   </footer>
 </div>
 <!-- ./wrapper -->