Skip to content

Commit

Permalink
升级v6.0
Browse files Browse the repository at this point in the history
  • Loading branch information
stylefeng committed Oct 25, 2019
1 parent b02a028 commit 9ae6af9
Show file tree
Hide file tree
Showing 1,667 changed files with 73,767 additions and 130,078 deletions.
56 changes: 56 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
GNU LESSER GENERAL PUBLIC LICENSE
Version 3, 29 June 2007

Copyright © 2007 Free Software Foundation, Inc. <https://fsf.org/>

Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.

This version of the GNU Lesser General Public License incorporates the terms and conditions of version 3 of the GNU General Public License, supplemented by the additional permissions listed below.

0. Additional Definitions.
As used herein, “this License” refers to version 3 of the GNU Lesser General Public License, and the “GNU GPL” refers to version 3 of the GNU General Public License.

“The Library” refers to a covered work governed by this License, other than an Application or a Combined Work as defined below.

An “Application” is any work that makes use of an interface provided by the Library, but which is not otherwise based on the Library. Defining a subclass of a class defined by the Library is deemed a mode of using an interface provided by the Library.

A “Combined Work” is a work produced by combining or linking an Application with the Library. The particular version of the Library with which the Combined Work was made is also called the “Linked Version”.

The “Minimal Corresponding Source” for a Combined Work means the Corresponding Source for the Combined Work, excluding any source code for portions of the Combined Work that, considered in isolation, are based on the Application, and not on the Linked Version.

The “Corresponding Application Code” for a Combined Work means the object code and/or source code for the Application, including any data and utility programs needed for reproducing the Combined Work from the Application, but excluding the System Libraries of the Combined Work.

1. Exception to Section 3 of the GNU GPL.
You may convey a covered work under sections 3 and 4 of this License without being bound by section 3 of the GNU GPL.

2. Conveying Modified Versions.
If you modify a copy of the Library, and, in your modifications, a facility refers to a function or data to be supplied by an Application that uses the facility (other than as an argument passed when the facility is invoked), then you may convey a copy of the modified version:

a) under this License, provided that you make a good faith effort to ensure that, in the event an Application does not supply the function or data, the facility still operates, and performs whatever part of its purpose remains meaningful, or
b) under the GNU GPL, with none of the additional permissions of this License applicable to that copy.
3. Object Code Incorporating Material from Library Header Files.
The object code form of an Application may incorporate material from a header file that is part of the Library. You may convey such object code under terms of your choice, provided that, if the incorporated material is not limited to numerical parameters, data structure layouts and accessors, or small macros, inline functions and templates (ten or fewer lines in length), you do both of the following:

a) Give prominent notice with each copy of the object code that the Library is used in it and that the Library and its use are covered by this License.
b) Accompany the object code with a copy of the GNU GPL and this license document.
4. Combined Works.
You may convey a Combined Work under terms of your choice that, taken together, effectively do not restrict modification of the portions of the Library contained in the Combined Work and reverse engineering for debugging such modifications, if you also do each of the following:

a) Give prominent notice with each copy of the Combined Work that the Library is used in it and that the Library and its use are covered by this License.
b) Accompany the Combined Work with a copy of the GNU GPL and this license document.
c) For a Combined Work that displays copyright notices during execution, include the copyright notice for the Library among these notices, as well as a reference directing the user to the copies of the GNU GPL and this license document.
d) Do one of the following:
0) Convey the Minimal Corresponding Source under the terms of this License, and the Corresponding Application Code in a form suitable for, and under terms that permit, the user to recombine or relink the Application with a modified version of the Linked Version to produce a modified Combined Work, in the manner specified by section 6 of the GNU GPL for conveying Corresponding Source.
1) Use a suitable shared library mechanism for linking with the Library. A suitable mechanism is one that (a) uses at run time a copy of the Library already present on the user's computer system, and (b) will operate properly with a modified version of the Library that is interface-compatible with the Linked Version.
e) Provide Installation Information, but only if you would otherwise be required to provide such information under section 6 of the GNU GPL, and only to the extent that such information is necessary to install and execute a modified version of the Combined Work produced by recombining or relinking the Application with a modified version of the Linked Version. (If you use option 4d0, the Installation Information must accompany the Minimal Corresponding Source and Corresponding Application Code. If you use option 4d1, you must provide the Installation Information in the manner specified by section 6 of the GNU GPL for conveying Corresponding Source.)
5. Combined Libraries.
You may place library facilities that are a work based on the Library side by side in a single library together with other library facilities that are not Applications and are not covered by this License, and convey such a combined library under terms of your choice, if you do both of the following:

a) Accompany the combined library with a copy of the same work based on the Library, uncombined with any other library facilities, conveyed under the terms of this License.
b) Give prominent notice with the combined library that part of it is a work based on the Library, and explaining where to find the accompanying uncombined form of the same work.
6. Revised Versions of the GNU Lesser General Public License.
The Free Software Foundation may publish revised and/or new versions of the GNU Lesser General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.

Each version is given a distinguishing version number. If the Library as you received it specifies that a certain numbered version of the GNU Lesser General Public License “or any later version” applies to it, you have the option of following the terms and conditions either of that published version or of any later version published by the Free Software Foundation. If the Library as you received it does not specify a version number of the GNU Lesser General Public License, you may choose any version of the GNU Lesser General Public License ever published by the Free Software Foundation.

If the Library as you received it specifies that a proxy can decide whether future versions of the GNU Lesser General Public License shall apply, that proxy's public statement of acceptance of any version is permanent authorization for you to choose that version for the Library.
52 changes: 29 additions & 23 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,33 +13,30 @@
</span>
<br>
<br>
<a href="https://getbootstrap.com/">
<img src="https://img.shields.io/badge/easyweb-3.1.1-green.svg" alt="bootstrap">
<a href="https://easyweb.vip/">
<img src="https://img.shields.io/badge/easyweb-3.1.5-green.svg" alt="bootstrap">
</a>
<a href="https://getbootstrap.com/">
<img src="https://img.shields.io/badge/layui-2.4.5-blue.svg" alt="bootstrap">
<a href="https://www.layui.com">
<img src="https://img.shields.io/badge/layui-2.5.5-blue.svg" alt="bootstrap">
</a>
+
<a href="http://spring.io/projects/spring-boot">
<img src="https://img.shields.io/badge/spring--boot-2.1.1-green.svg" alt="spring-boot">
<img src="https://img.shields.io/badge/spring--boot-2.2.0-green.svg" alt="spring-boot">
</a>
<a href="http://mp.baomidou.com">
<img src="https://img.shields.io/badge/mybatis--plus-3.0-blue.svg" alt="mybatis-plus">
</a>
<a href="http://ibeetl.com/">
<img src="https://img.shields.io/badge/beetl-2.9.3-yellow.svg" alt="beetl">
</a>
<a href="https://shiro.apache.org/">
<img src="https://img.shields.io/badge/shiro-1.4.0-blue.svg" alt="shiro">
</a>
</p>
</p>

-----------------------------------------------------------------------------------------------

### 在线demo
* 账号密码:admin/111111,地址:http://demo.stylefeng.cn
* 阿里云5折优惠券,[点我领取](https://promotion.aliyun.com/ntms/yunparter/invite.html?userCode=p4kqz45e)
* 阿里云双十一特惠,1C2G 86/年 [点我领取](https://www.aliyun.com/1111/2019/group-buying-share?ptCode=CFCF7A45B182263D40A14DAAB0B30EFD647C88CF896EF535&userCode=p4kqz45e&share_source=copy_link)

### 最新免费教程
[https://www.bilibili.com/video/av56718207](https://www.bilibili.com/video/av56718207)
Expand All @@ -56,40 +53,49 @@
</tr>
</table>

### 最新6.0更新内容如下(更新日期2019.10.25)

1. 前端框架升级easyweb 3.1.5,layui升级2.5.5。
2. 优化整体前端UI界面,更加简洁,大气。
3. 抽象出一套权限模型,利用接口进行权限控制和调用规则,方便在权限控制方面进行拓展。
4. 替换掉了以往的ShiroKit,采用LoginContextHolder.getContext().getUser()获取当前登录用户。
5. 权限框架替换为spring security + jwt,采用令牌登录方式,更加灵活可拓展,同时方便对接多系统SSO。
6. 新增常量容器模型,对系统变量,常量,以及用户自定义的一些参数进行在线维护,在线刷新参数值,无需重启。
7. 系统的验证码开关,顶部导航栏开关,系统默认密码等在常量容器进行维护,极大方便了系统使用。
8. 所有页面加载的css和js进行版本控制,当升级项目时,更新对应版本号,可控制浏览器对缓存js和css的刷新。
9. 增加用户的职务管理,可对用户进行职务绑定。

### Guns版本说明

| 版本名称 | 说明 | 地址 |
| :---: | :---: | :---: |
| Guns旗舰版 v2.5 | 最新开源版本,master分支 | https://gitee.com/stylefeng/guns |
| Guns v6.0 | 最新开源版本,采用layui | https://gitee.com/stylefeng/guns |
| Guns v5.1 | Guns经典版的最新版,采用bootstrap 3 | https://gitee.com/stylefeng/guns/tree/v5.1-final |

### Guns 企业版
* 企业级,功能更强大,创新代码生成,高级sso,微服务,容器化部署等,详情点击[https://www.stylefeng.cn](https://www.stylefeng.cn)
* 买企业版送最新Guns技术文档和视频教程,[点击查看技术文档](https://gitee.com/stylefeng/guns/wikis/pages?title=Guns%E6%8A%80%E6%9C%AF%E6%96%87%E6%A1%A3&parent=)[点击查看视频教程](https://gitee.com/stylefeng/guns/wikis/pages?title=Guns%E8%A7%86%E9%A2%91%E6%95%99%E7%A8%8B&parent=)

### Guns&Roses架构师视频
* 深入了解Guns的核心,spring cloud微服务,docker等技术,详情点击[https://www.stylefeng.cn/video/roses](https://www.stylefeng.cn/video/roses)

### 版权声明
* Guns采用定制协议:您可以随意下载,学习,或使用Guns,但禁止二次包装出售以及任何商业行为,如需商用请[购买授权](https://www.stylefeng.cn)
Guns采用LGPL-3.0开源协议

### Guns前端模板
* Guns最新旗舰版,所用前端模板为EasyWeb后台开发框架,官网地址为:[https://easyweb.vip/](https://easyweb.vip/),使用时已征求作者允许。

### 管理系统功能
1.用户管理 2.角色管理 3.部门管理 4.菜单管理 5.字典管理 6.业务日志 7.登录日志 8.监控管理 9.通知管理 10.代码生成
1.用户管理 2.角色管理 3.部门管理 4.菜单管理 5.字典管理 6.业务日志 7.登录日志 8.监控管理 9.通知管理 10.职务管理 11.代码生成 12.在线参数配置

### 项目特点
1. 基于SpringBoot,简化了大量项目配置和maven依赖,让您更专注于业务开发,独特的分包方式,代码多而不乱。
2. 完善的日志记录体系,可记录登录日志,业务操作日志(可记录操作前和操作后的数据),异常日志到数据库,通过@BussinessLog注解和LogObjectHolder.me().set()方法,业务操作日志可具体记录哪个用户,执行了哪些业务,修改了哪些数据,并且日志记录为异步执行,详情请见@BussinessLog注解和LogObjectHolder,LogManager,LogAop类。
3. 利用beetl模板引擎对前台页面进行封装和拆分,使臃肿的html代码变得简洁,更加易维护。
4. 对常用js插件进行二次封装,使js代码变得简洁,更加易维护,具体请见webapp/static/js/common文件夹内js代码
5. 利用ehcache框架对经常调用的查询进行缓存,提升运行速度,具体请见ConstantFactory类中@Cacheable标记的方法
6. controller层采用map + warpper方式的返回结果,返回给前端更为灵活的数据,具体参见com.stylefeng.guns.modular.system.warpper包中具体类
7. 防止XSS攻击,通过XssFilter类对所有的输入的非法字符串进行过滤以及替换
8. 简单可用的代码生成体系,通过SimpleTemplateEngine可生成带有主页跳转和增删改查的通用控制器、html页面以及相关的js,还可以生成Service和Dao,并且这些生成项都为可选的,通过ContextConfig下的一些列xxxSwitch开关,可灵活控制生成模板代码,让您把时间放在真正的业务上
9. 控制器层统一的异常拦截机制,利用@ControllerAdvice统一对异常拦截,具体见com.stylefeng.guns.core.aop.GlobalExceptionHandler类
10. 页面统一的js key-value单例模式写法,每个页面生成一个唯一的全局变量,提高js的利用效率,并且有效防止多个人员开发引起的函数名/类名冲突,并且可以更好地去维护代码
4. 对常用js插件进行二次封装,使js代码变得简洁,更加易维护。
5. controller层采用map + warpper方式的返回结果,返回给前端更为灵活的数据,具体参见com.stylefeng.guns.modular.system.warpper包中具体类
6. 防止XSS攻击,通过XssFilter类对所有的输入的非法字符串进行过滤以及替换
7. 简单可用的代码生成体系,通过SimpleTemplateEngine可生成带有主页跳转和增删改查的通用控制器、html页面以及相关的js,还可以生成Service和Dao,并且这些生成项都为可选的,通过ContextConfig下的一些列xxxSwitch开关,可灵活控制生成模板代码,让您把时间放在真正的业务上
8. 控制器层统一的异常拦截机制,利用@ControllerAdvice统一对异常拦截,具体见com.stylefeng.guns.core.aop.GlobalExceptionHandler类
9. 页面统一的js key-value单例模式写法,每个页面生成一个唯一的全局变量,提高js的利用效率,并且有效防止多个人员开发引起的函数名/类名冲突,并且可以更好地去维护代码
10. 在线系统参数配置,灵活控制常用功能的开关,无需重启项目即可生效,实时刷新

### 业务日志记录
日志记录采用aop(LogAop类)方式对所有包含@BussinessLog注解的方法进行aop切入,会记录下当前用户执行了哪些操作(即@BussinessLog value属性的内容),如果涉及到数据修改,会取当前http请求的所有requestParameters与LogObjectHolder类中缓存的Object对象的所有字段作比较(所以在编辑之前的获取详情接口中需要缓存被修改对象之前的字段信息),日志内容会异步存入数据库中(通过ScheduledThreadPoolExecutor类)。
Expand Down Expand Up @@ -170,7 +176,7 @@ Guns的数据范围控制是指,对拥有相同角色的用户,根据部门
### swagger api管理使用说明
swagger会管理所有包含@ApiOperation注解的控制器方法,同时,可利用@ApiImplicitParams注解标记接口中的参数,具体用法请参考CodeController类中的用法。
```
@ApiOperation("生成代码")
@ApiOperation("业务测试接口")
@ApiImplicitParams({
@ApiImplicitParam(name = "moduleName", value = "模块名称", required = true, dataType = "String"),
@ApiImplicitParam(name = "bizChName", value = "业务名称", required = true, dataType = "String"),
Expand Down
Loading

0 comments on commit 9ae6af9

Please sign in to comment.