Merge branch 'develop' of https://github.com/dibo-software/diboot-v2 into develop
This commit is contained in:
mazhicheng
commit
59f0f0ba14
|
|
@ -0,0 +1,201 @@
|
|||
Apache License
|
||||
Version 2.0, January 2004
|
||||
http://www.apache.org/licenses/
|
||||
|
||||
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
|
||||
|
||||
1. Definitions.
|
||||
|
||||
"License" shall mean the terms and conditions for use, reproduction,
|
||||
and distribution as defined by Sections 1 through 9 of this document.
|
||||
|
||||
"Licensor" shall mean the copyright owner or entity authorized by
|
||||
the copyright owner that is granting the License.
|
||||
|
||||
"Legal Entity" shall mean the union of the acting entity and all
|
||||
other entities that control, are controlled by, or are under common
|
||||
control with that entity. For the purposes of this definition,
|
||||
"control" means (i) the power, direct or indirect, to cause the
|
||||
direction or management of such entity, whether by contract or
|
||||
otherwise, or (ii) ownership of fifty percent (50%) or more of the
|
||||
outstanding shares, or (iii) beneficial ownership of such entity.
|
||||
|
||||
"You" (or "Your") shall mean an individual or Legal Entity
|
||||
exercising permissions granted by this License.
|
||||
|
||||
"Source" form shall mean the preferred form for making modifications,
|
||||
including but not limited to software source code, documentation
|
||||
source, and configuration files.
|
||||
|
||||
"Object" form shall mean any form resulting from mechanical
|
||||
transformation or translation of a Source form, including but
|
||||
not limited to compiled object code, generated documentation,
|
||||
and conversions to other media types.
|
||||
|
||||
"Work" shall mean the work of authorship, whether in Source or
|
||||
Object form, made available under the License, as indicated by a
|
||||
copyright notice that is included in or attached to the work
|
||||
(an example is provided in the Appendix below).
|
||||
|
||||
"Derivative Works" shall mean any work, whether in Source or Object
|
||||
form, that is based on (or derived from) the Work and for which the
|
||||
editorial revisions, annotations, elaborations, or other modifications
|
||||
represent, as a whole, an original work of authorship. For the purposes
|
||||
of this License, Derivative Works shall not include works that remain
|
||||
separable from, or merely link (or bind by name) to the interfaces of,
|
||||
the Work and Derivative Works thereof.
|
||||
|
||||
"Contribution" shall mean any work of authorship, including
|
||||
the original version of the Work and any modifications or additions
|
||||
to that Work or Derivative Works thereof, that is intentionally
|
||||
submitted to Licensor for inclusion in the Work by the copyright owner
|
||||
or by an individual or Legal Entity authorized to submit on behalf of
|
||||
the copyright owner. For the purposes of this definition, "submitted"
|
||||
means any form of electronic, verbal, or written communication sent
|
||||
to the Licensor or its representatives, including but not limited to
|
||||
communication on electronic mailing lists, source code control systems,
|
||||
and issue tracking systems that are managed by, or on behalf of, the
|
||||
Licensor for the purpose of discussing and improving the Work, but
|
||||
excluding communication that is conspicuously marked or otherwise
|
||||
designated in writing by the copyright owner as "Not a Contribution."
|
||||
|
||||
"Contributor" shall mean Licensor and any individual or Legal Entity
|
||||
on behalf of whom a Contribution has been received by Licensor and
|
||||
subsequently incorporated within the Work.
|
||||
|
||||
2. Grant of Copyright License. Subject to the terms and conditions of
|
||||
this License, each Contributor hereby grants to You a perpetual,
|
||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||
copyright license to reproduce, prepare Derivative Works of,
|
||||
publicly display, publicly perform, sublicense, and distribute the
|
||||
Work and such Derivative Works in Source or Object form.
|
||||
|
||||
3. Grant of Patent License. Subject to the terms and conditions of
|
||||
this License, each Contributor hereby grants to You a perpetual,
|
||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||
(except as stated in this section) patent license to make, have made,
|
||||
use, offer to sell, sell, import, and otherwise transfer the Work,
|
||||
where such license applies only to those patent claims licensable
|
||||
by such Contributor that are necessarily infringed by their
|
||||
Contribution(s) alone or by combination of their Contribution(s)
|
||||
with the Work to which such Contribution(s) was submitted. If You
|
||||
institute patent litigation against any entity (including a
|
||||
cross-claim or counterclaim in a lawsuit) alleging that the Work
|
||||
or a Contribution incorporated within the Work constitutes direct
|
||||
or contributory patent infringement, then any patent licenses
|
||||
granted to You under this License for that Work shall terminate
|
||||
as of the date such litigation is filed.
|
||||
|
||||
4. Redistribution. You may reproduce and distribute copies of the
|
||||
Work or Derivative Works thereof in any medium, with or without
|
||||
modifications, and in Source or Object form, provided that You
|
||||
meet the following conditions:
|
||||
|
||||
(a) You must give any other recipients of the Work or
|
||||
Derivative Works a copy of this License; and
|
||||
|
||||
(b) You must cause any modified files to carry prominent notices
|
||||
stating that You changed the files; and
|
||||
|
||||
(c) You must retain, in the Source form of any Derivative Works
|
||||
that You distribute, all copyright, patent, trademark, and
|
||||
attribution notices from the Source form of the Work,
|
||||
excluding those notices that do not pertain to any part of
|
||||
the Derivative Works; and
|
||||
|
||||
(d) If the Work includes a "NOTICE" text file as part of its
|
||||
distribution, then any Derivative Works that You distribute must
|
||||
include a readable copy of the attribution notices contained
|
||||
within such NOTICE file, excluding those notices that do not
|
||||
pertain to any part of the Derivative Works, in at least one
|
||||
of the following places: within a NOTICE text file distributed
|
||||
as part of the Derivative Works; within the Source form or
|
||||
documentation, if provided along with the Derivative Works; or,
|
||||
within a display generated by the Derivative Works, if and
|
||||
wherever such third-party notices normally appear. The contents
|
||||
of the NOTICE file are for informational purposes only and
|
||||
do not modify the License. You may add Your own attribution
|
||||
notices within Derivative Works that You distribute, alongside
|
||||
or as an addendum to the NOTICE text from the Work, provided
|
||||
that such additional attribution notices cannot be construed
|
||||
as modifying the License.
|
||||
|
||||
You may add Your own copyright statement to Your modifications and
|
||||
may provide additional or different license terms and conditions
|
||||
for use, reproduction, or distribution of Your modifications, or
|
||||
for any such Derivative Works as a whole, provided Your use,
|
||||
reproduction, and distribution of the Work otherwise complies with
|
||||
the conditions stated in this License.
|
||||
|
||||
5. Submission of Contributions. Unless You explicitly state otherwise,
|
||||
any Contribution intentionally submitted for inclusion in the Work
|
||||
by You to the Licensor shall be under the terms and conditions of
|
||||
this License, without any additional terms or conditions.
|
||||
Notwithstanding the above, nothing herein shall supersede or modify
|
||||
the terms of any separate license agreement you may have executed
|
||||
with Licensor regarding such Contributions.
|
||||
|
||||
6. Trademarks. This License does not grant permission to use the trade
|
||||
names, trademarks, service marks, or product names of the Licensor,
|
||||
except as required for reasonable and customary use in describing the
|
||||
origin of the Work and reproducing the content of the NOTICE file.
|
||||
|
||||
7. Disclaimer of Warranty. Unless required by applicable law or
|
||||
agreed to in writing, Licensor provides the Work (and each
|
||||
Contributor provides its Contributions) on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
||||
implied, including, without limitation, any warranties or conditions
|
||||
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
|
||||
PARTICULAR PURPOSE. You are solely responsible for determining the
|
||||
appropriateness of using or redistributing the Work and assume any
|
||||
risks associated with Your exercise of permissions under this License.
|
||||
|
||||
8. Limitation of Liability. In no event and under no legal theory,
|
||||
whether in tort (including negligence), contract, or otherwise,
|
||||
unless required by applicable law (such as deliberate and grossly
|
||||
negligent acts) or agreed to in writing, shall any Contributor be
|
||||
liable to You for damages, including any direct, indirect, special,
|
||||
incidental, or consequential damages of any character arising as a
|
||||
result of this License or out of the use or inability to use the
|
||||
Work (including but not limited to damages for loss of goodwill,
|
||||
work stoppage, computer failure or malfunction, or any and all
|
||||
other commercial damages or losses), even if such Contributor
|
||||
has been advised of the possibility of such damages.
|
||||
|
||||
9. Accepting Warranty or Additional Liability. While redistributing
|
||||
the Work or Derivative Works thereof, You may choose to offer,
|
||||
and charge a fee for, acceptance of support, warranty, indemnity,
|
||||
or other liability obligations and/or rights consistent with this
|
||||
License. However, in accepting such obligations, You may act only
|
||||
on Your own behalf and on Your sole responsibility, not on behalf
|
||||
of any other Contributor, and only if You agree to indemnify,
|
||||
defend, and hold each Contributor harmless for any liability
|
||||
incurred by, or claims asserted against, such Contributor by reason
|
||||
of your accepting any such warranty or additional liability.
|
||||
|
||||
END OF TERMS AND CONDITIONS
|
||||
|
||||
APPENDIX: How to apply the Apache License to your work.
|
||||
|
||||
To apply the Apache License to your work, attach the following
|
||||
boilerplate notice, with the fields enclosed by brackets "[]"
|
||||
replaced with your own identifying information. (Don't include
|
||||
the brackets!) The text should be enclosed in the appropriate
|
||||
comment syntax for the file format. We also recommend that a
|
||||
file or class name and description of purpose be included on the
|
||||
same "printed page" as the copyright notice for easier
|
||||
identification within third-party archives.
|
||||
|
||||
Copyright [yyyy] [name of copyright owner]
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
36
README.md
36
README.md
|
|
@ -5,14 +5,14 @@
|
|||
</p>
|
||||
|
||||
# diboot-v2
|
||||
diboot 2.0版本项目，实现: diboot-core全新内核 + diboot-devtools代码生成。
|
||||
diboot 2.0版本项目，实现: diboot-core全新内核 + diboot-components-*基础组件 + diboot-devtools代码生成器。
|
||||
|
||||
### ** diboot-core: 精简优化内核
|
||||
全新精简内核，主要实现单表CRUD和多表关联绑定的无SQL实现方案，并提供其他常用开发场景的简单封装。
|
||||
## ** diboot-core: 精简优化内核
|
||||
全新精简内核，主要实现<font color="red">单表CRUD无SQL 和 多表关联查询绑定的无SQL</font>实现方案，并提供其他常用开发场景的简单封装。
|
||||
|
||||
#### 单表CRUD无SQL
|
||||
### 单表CRUD无SQL
|
||||
> 基于Mybatis-Plus实现（Mybatis-Plus具备通用Mapper方案和灵活的查询构造器）
|
||||
#### 多表关联查询无SQL（适用于大多数场景，拆分成单表查询自动实现结果绑定）
|
||||
### 多表关联查询无SQL（适用于多数关联场景，自动实现拆分成单表查询和结果绑定）
|
||||
> 通过注解实现多数场景下的关联查询无SQL化自动绑定
|
||||
|
||||
##### 1. @BindDict 注解自动绑定数据字典(枚举值)的显示值Label
|
||||
|
|
@ -23,24 +23,24 @@ diboot 2.0版本项目，实现: diboot-core全新内核 + diboot-devtools代码
|
|||
具体请查看: [diboot-core 注解自动绑定多表关联](https://github.com/dibo-software/diboot-v2/tree/master/diboot-core "注解自动绑定多表关联").
|
||||
|
||||
|
||||
> ...
|
||||
> .
|
||||
|
||||
|
||||
### ** diboot-shiro: 基于RBAC+Shiro的权限认证模块
|
||||
## ** diboot-shiro: 基于RBAC+Shiro的权限认证模块
|
||||
RBAC的角色权限+基于Shiro的细粒度权限控制
|
||||
|
||||
#### 1、@AuthorizationPrefix
|
||||
### 1、@AuthorizationPrefix
|
||||
类注解，与@AuthorizationWrapper搭配使用，设置通用权限前缀，作用域为当前类的所有方法
|
||||
|
||||
#### 2、@AuthorizationWrapper
|
||||
### 2、@AuthorizationWrapper
|
||||
类/方法注解，在保证shiro的@RequirePermissions注解的功能基础上，增加名称、权限前缀特性，使用方式同@RequiresPermissions
|
||||
|
||||
#### 3、@AuthorizationCache
|
||||
### 3、@AuthorizationCache
|
||||
方法注解，在资源授权校验过程中，系统会频繁与数据库进行交互，故而提供缓存机制
|
||||
* 缓存时机：缓存会在用户第一次进行权限验证的之后缓存数据
|
||||
* 当前注解作用：如果通过系统调整权限，只需要将该注解加在更新或添加权限处，将会清空权限缓存，下次进入将重新加载权限
|
||||
|
||||
#### 3、AuthorizationProperties
|
||||
### 4、AuthorizationProperties
|
||||
提供一些权限相关的配置，主要包括：
|
||||
- 权限环境变量：提供dev、test、prod三种选项
|
||||
- 默认dev，非dev状态下，每次都将读取当前启动系统中所有权限，不在系统内的权限将会自动物理删除，多人协作的开发环境建议使用默认配置
|
||||
|
|
@ -66,14 +66,14 @@ diboot.shiro.cache.permission-caching-enabled=true
|
|||
diboot.shiro.cache.cache-way=memory
|
||||
```
|
||||
|
||||
#### 4、AuthorizationStorage
|
||||
### 5、AuthorizationStorage
|
||||
调用该类autoStorage传入spring上下文参数，使用参考diboot-example 中ExampleListener类
|
||||
|
||||
### ** diboot-example: 示例
|
||||
各组件使用示例项目
|
||||
> 运行example需先执行/resources/init-mysql.sql到数据库。
|
||||
|
||||
### ** diboot-devtools 代码生成工具
|
||||
|
||||
## ** diboot-devtools 代码生成工具
|
||||
> 比 1.x 版本更强大的代码生成工具 ...
|
||||
|
||||
...
|
||||
...
|
||||
|
||||
## 技术支持
|
||||
您可以通过加入QQ群，获取相关的技术支持。群号: 731690096
|
||||
|
|
@ -180,9 +180,7 @@ public class DepartmentController extends BaseCrudRestController {
|
|||
* 根据组织ID获取部门list
|
||||
* */
|
||||
@GetMapping("/getDepartmentList/{orgId}")
|
||||
public JsonResult getDepartmentList(@PathVariable Long orgId, HttpServletRequest request) throws Exception {
|
||||
// 构建分页
|
||||
Pagination pagination = buildPagination(request);
|
||||
public JsonResult getDepartmentList(@PathVariable Long orgId, Pagination pagination, HttpServletRequest request) throws Exception {
|
||||
Wrapper wrapper = new QueryWrapper<Department>()
|
||||
.lambda()
|
||||
.eq(Department::getOrgId, orgId);
|
||||
|
|
|
|||
|
|
@ -14,10 +14,12 @@ import com.diboot.core.vo.Pagination;
|
|||
import com.diboot.core.vo.Status;
|
||||
import com.diboot.example.entity.Department;
|
||||
import com.diboot.example.entity.SysUser;
|
||||
import com.diboot.example.entity.User;
|
||||
import com.diboot.example.service.DepartmentService;
|
||||
import com.diboot.example.service.SysUserService;
|
||||
import com.diboot.example.vo.SysUserListVO;
|
||||
import com.diboot.example.vo.SysUserVO;
|
||||
import com.diboot.example.vo.UserVO;
|
||||
import com.diboot.shiro.authz.annotation.AuthorizationPrefix;
|
||||
import com.diboot.shiro.authz.annotation.AuthorizationWrapper;
|
||||
import com.diboot.shiro.entity.Permission;
|
||||
|
|
@ -62,16 +64,9 @@ public class SysUserController extends BaseCrudRestController {
|
|||
|
||||
@GetMapping("/list")
|
||||
@AuthorizationWrapper(value = @RequiresPermissions("list"), name = "列表")
|
||||
public JsonResult getVOList(HttpServletRequest request) throws Exception{
|
||||
QueryWrapper<SysUser> queryWrapper = buildQuery(request);
|
||||
// 构建分页
|
||||
Pagination pagination = buildPagination(request);
|
||||
// 查询当前页的Entity主表数据
|
||||
List<SysUserVO> voList = sysUserService.getSysUserList(queryWrapper, pagination);
|
||||
//筛选出在列表页展示的字段
|
||||
List<SysUserListVO> userVoList = RelationsBinder.convertAndBind(voList, SysUserListVO.class);
|
||||
// 返回结果
|
||||
return new JsonResult(Status.OK, userVoList).bindPagination(pagination);
|
||||
public JsonResult getVOList(SysUser sysUser, Pagination pagination, HttpServletRequest request) throws Exception{
|
||||
QueryWrapper<User> queryWrapper = super.buildQueryWrapper(sysUser);
|
||||
return super.getVOListWithPaging(queryWrapper, pagination, UserVO.class);
|
||||
}
|
||||
|
||||
/***
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ public class MemoryCondition implements Condition {
|
|||
public boolean matches(ConditionContext context, AnnotatedTypeMetadata metadata) {
|
||||
//获取配置信息
|
||||
Boolean enableCached = context.getEnvironment().getProperty(AuthCacheProperties.CACHE_PREFIX + ".permission-caching-enabled", Boolean.class);
|
||||
enableCached = enableCached == null ? false : enableCached;
|
||||
enableCached = enableCached == null ? true : enableCached;
|
||||
AuthCacheProperties.CacheWay cacheWay = context.getEnvironment().getProperty(AuthCacheProperties.CACHE_PREFIX + ".cache-way", AuthCacheProperties.CacheWay.class);
|
||||
cacheWay = cacheWay == null ? AuthCacheProperties.CacheWay.MEMORY : cacheWay;
|
||||
return enableCached && AuthCacheProperties.CacheWay.MEMORY.equals(cacheWay);
|
||||
|
|
|
|||
|
|
@ -50,10 +50,8 @@ public class RoleController extends BaseCrudRestController {
|
|||
@GetMapping("/list")
|
||||
@AuthorizationWrapper(value = @RequiresPermissions("list"), name = "列表")
|
||||
@AuthorizationCache
|
||||
public JsonResult getVOList(HttpServletRequest request) throws Exception{
|
||||
QueryWrapper<Role> queryWrapper = buildQuery(request);
|
||||
// 构建分页
|
||||
Pagination pagination = buildPagination(request);
|
||||
public JsonResult getVOList(HttpServletRequest request, Pagination pagination) throws Exception{
|
||||
QueryWrapper<Role> queryWrapper = buildQueryWrapper(request);
|
||||
// 获取结果
|
||||
List<RoleVO> voList = roleService.getRoleList(queryWrapper, pagination);
|
||||
// 返回结果
|
||||
|
|
|
|||
Loading…
Reference in New Issue