mirror of
https://github.com/jeecgboot/JeecgBoot.git
synced 2025-12-08 17:12:28 +08:00
Compare commits
105 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 7167668c2a | |||
| 1a722fcb07 | |||
| 648e66d5ef | |||
| e6e6902e85 | |||
| 04dd6b056f | |||
| 96b3ba6e9a | |||
| 8d22362fff | |||
| 436bfbced9 | |||
| 5273b81f94 | |||
| 6134db4984 | |||
| 6e7d9e8e5d | |||
| 741dc958f1 | |||
| 101ffd91af | |||
| cecbc3f628 | |||
| dd7bf104e7 | |||
| 6e85584c43 | |||
| c579dbb24d | |||
| 452132ca38 | |||
| ebc396340e | |||
| 5946aa79c3 | |||
| 2bc20aaa5e | |||
| 793295a8fe | |||
| eaf3e32fdd | |||
| ba40a797df | |||
| 545679f999 | |||
| 1a74dd1a2e | |||
| 9dd8b05fd7 | |||
| e273008b37 | |||
| 53684d224e | |||
| f9e843571c | |||
| 14e9adb3af | |||
| fedb7bf46f | |||
| ce520be8ca | |||
| 9d92c316c1 | |||
| f077cafcfe | |||
| fd7d0b7202 | |||
| 96586517bd | |||
| 5b5a2c0180 | |||
| b089bb96f1 | |||
| 9da4850bd7 | |||
| a6bcb376fc | |||
| 7abc07424b | |||
| e9f2bbca23 | |||
| b0ede05cf4 | |||
| ca1218f792 | |||
| 8ed2da601b | |||
| 08696dbb5f | |||
| 645ea40bfd | |||
| b970af00c1 | |||
| 5fe9508428 | |||
| a302fcd963 | |||
| 5258228d3b | |||
| 1c00be39f0 | |||
| cf1fe01d03 | |||
| 4c78bad14f | |||
| ebcddad130 | |||
| 42589cd1dc | |||
| d81fa1f908 | |||
| 217fe0dce4 | |||
| fffa7f327b | |||
| 5417f1285a | |||
| b75cbcc911 | |||
| a68f304307 | |||
| 0a00bd8a7c | |||
| e90efbb52f | |||
| 3c320a5769 | |||
| 98472b5c35 | |||
| 3f2354a8ac | |||
| 8a94c40e0e | |||
| 42eedcd3b3 | |||
| 3c2038ac0e | |||
| c8323540cc | |||
| ec80530afc | |||
| c76e7f344c | |||
| 5aca8260dc | |||
| c4baa2ecb8 | |||
| 420375ecab | |||
| f07e1c02e9 | |||
| eb054736a5 | |||
| 9d771b5d9b | |||
| d0a6282ce9 | |||
| d84cf92b03 | |||
| b679fb75ba | |||
| a3c0127a7a | |||
| c46ec2415b | |||
| f0e060f12e | |||
| 65a0d3b9df | |||
| 1a48fb86bc | |||
| 0fc374de47 | |||
| f94c5e1f3f | |||
| 352bd3e98f | |||
| 22fe4475d0 | |||
| 7a3d1f1a58 | |||
| 3159c822c7 | |||
| fa0ce6e7e1 | |||
| c29794d07b | |||
| 6ba5536554 | |||
| e6b93c2fca | |||
| b362147577 | |||
| 347b13beb4 | |||
| 16b8aac08f | |||
| b0b517e71e | |||
| cf3d746d63 | |||
| 0fdbf642d8 | |||
| 0ebd1df81d |
7
LICENSE
7
LICENSE
@ -203,11 +203,14 @@
|
|||||||
In any case, you must not make any such use of this software as to develop software which may be considered competitive with this software.
|
In any case, you must not make any such use of this software as to develop software which may be considered competitive with this software.
|
||||||
|
|
||||||
开源协议补充
|
开源协议补充
|
||||||
JeecgBoot 是由 北京国炬信息技术有限公司 发行的软件。 总部位于北京，地址：中国·北京·朝阳区科荟前街1号院奥林佳泰大厦。邮箱：jeecgos@163.com
|
JeecgBoot 是由 北京敲敲云科技有限公司 发行的软件。 总部位于北京，地址：中国·北京·朝阳区科荟前街1号院奥林佳泰大厦。邮箱：jeecgos@163.com
|
||||||
本软件受适用的国家软件著作权法（包括国际条约）和双重保护许可。
|
本软件受适用的国家软件著作权法（包括国际条约）和双重保护许可。
|
||||||
|
|
||||||
1.允许基于本平台软件开展业务系统开发。
|
1.允许基于本平台软件开展业务系统开发。
|
||||||
2.不得基于该平台软件的基础，修改包装成一个与JeecgBoot平台软件功能类似的产品进行发布、销售，或与JeecgBoot参与同类软件产品市场的竞争。
|
2.JeecgBoot底层依赖的非开源功能：online lib依赖、仪表盘lib依赖等，统一采用LGPL开源协议（不二次改造、不拆分出jeecgboot之外使用，就不产生侵权）
|
||||||
|
3.不得基于该平台软件的基础，修改包装成一个与JeecgBoot平台软件功能类似的产品进行发布、销售，或与JeecgBoot参与同类软件产品市场的竞争。
|
||||||
违反此条款属于侵权行为，须赔偿侵权经济损失，同时立即停止著作权侵权行为。
|
违反此条款属于侵权行为，须赔偿侵权经济损失，同时立即停止著作权侵权行为。
|
||||||
|
|
||||||
|
总结：在遵循Apache开源协议和开源协议补充条款下，允许商用使用，不会造成侵权行为！
|
||||||
解释权归：http://www.jeecg.com
|
解释权归：http://www.jeecg.com
|
||||||
|
|
||||||
135
README-EN.md
135
README-EN.md
@ -7,13 +7,13 @@
|
|||||||
JEECG BOOT Low Code Development Platform
|
JEECG BOOT Low Code Development Platform
|
||||||
===============
|
===============
|
||||||
|
|
||||||
The Latest Version： 3.4.4（Release date：2022-11-21）
|
The Latest Version： 3.5.3（Release date：2023-07-24）
|
||||||
|
|
||||||
|
|
||||||
[](https://github.com/zhangdaiscott/jeecg-boot/blob/master/LICENSE)
|
[](https://github.com/zhangdaiscott/jeecg-boot/blob/master/LICENSE)
|
||||||
[](http://www.jeecg.com)
|
[](http://www.jeecg.com)
|
||||||
[](https://jeecg.blog.csdn.net)
|
[](https://jeecg.blog.csdn.net)
|
||||||
[](https://github.com/zhangdaiscott/jeecg-boot)
|
[](https://github.com/zhangdaiscott/jeecg-boot)
|
||||||
[](https://github.com/zhangdaiscott/jeecg-boot)
|
[](https://github.com/zhangdaiscott/jeecg-boot)
|
||||||
[](https://github.com/zhangdaiscott/jeecg-boot)
|
[](https://github.com/zhangdaiscott/jeecg-boot)
|
||||||
|
|
||||||
@ -73,11 +73,9 @@ Jeecg-Boot low code development platform can be applied in the development of an
|
|||||||
Docker starts the project
|
Docker starts the project
|
||||||
-----------------------------------
|
-----------------------------------
|
||||||
|
|
||||||
- [Docker starts the monomer background](http://doc.jeecg.com/2043889)
|
- [Docker starts the monomer background](https://help.jeecg.com/java/setup/docker/up.html)
|
||||||
- [Docker starts the Vue3 front-end](http://vue3.jeecg.com/3028878)
|
- [Docker starts the Vue3 front-end](http://help.jeecg.com/publish/docker.html)
|
||||||
|
- [Docker starts the micro-service background](https://help.jeecg.com/java/springcloud/docker.html)
|
||||||
- [Docker starts the micro-service background](http://doc.jeecg.com/3043472)
|
|
||||||
- [Docker starts the Vue2 front-end](http://doc.jeecg.com/3043612)
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@ -89,13 +87,13 @@ Technical documentation
|
|||||||
|
|
||||||
- Demo ： [Vue3](http://boot3.jeecg.com) | [Vue2](http://boot.jeecg.com)
|
- Demo ： [Vue3](http://boot3.jeecg.com) | [Vue2](http://boot.jeecg.com)
|
||||||
|
|
||||||
- Doc： [Vue3](http://vue3.jeecg.com) | [Main](http://doc.jeecg.com)
|
- Doc： [http://help.jeecg.com](http://help.jeecg.com)
|
||||||
|
|
||||||
- Newbie guide： [Quick start](http://www.jeecg.com/doc/quickstart) | [video](https://space.bilibili.com/454617261/channel/series) | [Q&A ](http://www.jeecg.com/doc/qa) | [help](http://jeecg.com/doc/help) | [1 minute experience](https://my.oschina.net/jeecg/blog/3083313)
|
- Newbie guide： [Quick start](http://www.jeecg.com/doc/quickstart) | [video](https://space.bilibili.com/454617261/channel/series) | [Q&A ](http://www.jeecg.com/doc/qa) | [help](http://jeecg.com/doc/help) | [1 minute experience](https://my.oschina.net/jeecg/blog/3083313)
|
||||||
|
|
||||||
- Microservice Development： [Monomer upgrade to microservice](http://doc.jeecg.com/3043471)
|
- Microservice Development： [Monomer upgrade to microservice](https://help.jeecg.com/java/springcloud/switchcloud/monomer.html)
|
||||||
|
|
||||||
- QQ group ： ⑥730954414、683903138、⑤860162132(full)、④774126647(full)、③816531124(full)、②769925425(full)、①284271917(full)
|
- QQ group ： ⑦791696430、⑥730954414、683903138、⑤860162132(full)、④774126647(full)、③816531124(full)、②769925425(full)、①284271917(full)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@ -207,15 +205,15 @@ Technical Architecture:
|
|||||||
|
|
||||||
#### backend
|
#### backend
|
||||||
|
|
||||||
- Basic framework: Spring Boot 2.6.6
|
- Basic framework: Spring Boot 2.6.14
|
||||||
|
|
||||||
- Microservice framework: Spring Cloud Alibaba 2021.0.1.0
|
- Microservice framework: Spring Cloud Alibaba 2021.0.1.0
|
||||||
|
|
||||||
- Persistence layer framework: MybatisPlus 3.5.1
|
- Persistence layer framework: MybatisPlus 3.5.1
|
||||||
|
|
||||||
- Report tool: JimuReport 1.5.2
|
- Report tool: JimuReport 1.5.8
|
||||||
|
|
||||||
- Security framework: Apache Shiro 1.8.0, Jwt 3.11.0
|
- Security framework: Apache Shiro 1.10.0, Jwt 3.11.0
|
||||||
|
|
||||||
- Microservice technology stack: Spring Cloud Alibaba, Nacos, Gateway, Sentinel, Skywalking
|
- Microservice technology stack: Spring Cloud Alibaba, Nacos, Gateway, Sentinel, Skywalking
|
||||||
|
|
||||||
@ -263,7 +261,7 @@ Technical Architecture:
|
|||||||
|
|
||||||
8. Service monitoring SpringBootAdmin√
|
8. Service monitoring SpringBootAdmin√
|
||||||
|
|
||||||
9. link tracking Skywalking [reference document](http://doc.jeecg.com/2350293)
|
9. link tracking Skywalking [reference document](https://help.jeecg.com/java/springcloud/super/skywarking.html)
|
||||||
|
|
||||||
10. Messaging middleware RabbitMQ √
|
10. Messaging middleware RabbitMQ √
|
||||||
|
|
||||||
@ -437,51 +435,116 @@ Technical Architecture:
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
Effect of system
|
|
||||||
----
|
|
||||||
##### Screen template
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
### Effect of system
|
||||||
|
|
||||||
|
|
||||||
##### PC
|
##### PC
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
##### interactive
|
||||||
|
|
||||||
|
|
||||||
##### Online interface documentation
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
##### Report
|
##### process Designer
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
##### Process
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
##### App
|
|
||||||
|
|
||||||
|
##### min process
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
##### dashboard Designer
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
##### report Designer
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
##### form Designer
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
##### bigscreen Designer
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
##### uniapp
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
##### low app
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
##### app
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
##### PAD
|
##### PAD
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
##### chart
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
##### swagger
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
## donation
|
## donation
|
||||||
|
|
||||||
If so, buy the author a cup of coffee ☺
|
If so, buy the author a cup of coffee ☺
|
||||||
|
|||||||
216
README.md
216
README.md
@ -7,13 +7,13 @@
|
|||||||
JEECG BOOT 低代码开发平台
|
JEECG BOOT 低代码开发平台
|
||||||
===============
|
===============
|
||||||
|
|
||||||
当前最新版本： 3.4.4（发布日期：2022-11-21）
|
当前最新版本： 3.5.3（发布日期：2023-07-24）
|
||||||
|
|
||||||
|
|
||||||
[](https://github.com/zhangdaiscott/jeecg-boot/blob/master/LICENSE)
|
[](https://github.com/zhangdaiscott/jeecg-boot/blob/master/LICENSE)
|
||||||
[](http://www.jeecg.com)
|
[](http://www.jeecg.com)
|
||||||
[](https://jeecg.blog.csdn.net)
|
[](https://jeecg.blog.csdn.net)
|
||||||
[](https://github.com/zhangdaiscott/jeecg-boot)
|
[](https://github.com/zhangdaiscott/jeecg-boot)
|
||||||
[](https://github.com/zhangdaiscott/jeecg-boot)
|
[](https://github.com/zhangdaiscott/jeecg-boot)
|
||||||
[](https://github.com/zhangdaiscott/jeecg-boot)
|
[](https://github.com/zhangdaiscott/jeecg-boot)
|
||||||
|
|
||||||
@ -33,21 +33,26 @@ JeecgBoot 提供了一系列`低代码模块`，实现在线开发`真正的零
|
|||||||
|
|
||||||
`JEECG业务流程:` 采用工作流来实现、扩展出任务接口，供开发编写业务逻辑，表单提供多种解决方案： 表单设计器、online配置表单、编码表单。同时实现了流程与表单的分离设计（松耦合）、并支持任务节点灵活配置，既保证了公司流程的保密性，又减少了开发人员的工作量。
|
`JEECG业务流程:` 采用工作流来实现、扩展出任务接口，供开发编写业务逻辑，表单提供多种解决方案： 表单设计器、online配置表单、编码表单。同时实现了流程与表单的分离设计（松耦合）、并支持任务节点灵活配置，既保证了公司流程的保密性，又减少了开发人员的工作量。
|
||||||
|
|
||||||
|
适用项目
|
||||||
技术支持
|
|
||||||
-----------------------------------
|
-----------------------------------
|
||||||
|
Jeecg-Boot低代码开发平台，可以应用在任何J2EE项目的开发中，尤其适合SAAS项目、企业信息管理系统（MIS）、内部办公系统（OA）、企业资源计划系统（ERP）、客户关系管理系统（CRM）等，其半智能手工Merge的开发方式，可以显著提高开发效率70%以上，极大降低开发成本。
|
||||||
|
|
||||||
关闭gitee的issue通道，使用中遇到问题或者BUG可以在 [Github上提Issues](https://github.com/jeecgboot/jeecg-boot/issues/new)
|
|
||||||
|
|
||||||
官方支持： http://jeecg.com/doc/help
|
|
||||||
|
|
||||||
|
|
||||||
源码下载
|
源码下载
|
||||||
-----------------------------------
|
-----------------------------------
|
||||||
- 后台源码 ：https://github.com/jeecgboot/jeecg-boot
|
|
||||||
- 前端源码(Vue3版)：https://github.com/jeecgboot/jeecgboot-vue3
|
| 源码 | 源码地址 |
|
||||||
- 前端源码(Vue2版)：https://github.com/jeecgboot/ant-design-vue-jeecg
|
|--------------------|------------------------|
|
||||||
- APP配套框架：https://github.com/jeecgboot/jeecg-uniapp
|
| 后台源码 JAVA | https://github.com/jeecgboot/jeecg-boot |
|
||||||
|
| 前端源码 `Vue3版` | https://github.com/jeecgboot/jeecgboot-vue3 |
|
||||||
|
| APP配套框架 | https://github.com/jeecgboot/jeecg-uniapp |
|
||||||
|
|
||||||
|
##### 快速搭建开发环境
|
||||||
|
|
||||||
|
- [通过IDEA启动前后端项目](https://help.jeecg.com/java/setup/idea/startup.html)
|
||||||
|
- [Vue3前端项目快速启动](http://help.jeecg.com/setup/startup.html)
|
||||||
|
- [单体快速切换为微服务版](https://help.jeecg.com/java/springcloud/switchcloud/monomer.html)
|
||||||
|
|
||||||
##### 项目说明
|
##### 项目说明
|
||||||
|
|
||||||
@ -55,51 +60,79 @@ JeecgBoot 提供了一系列`低代码模块`，实现在线开发`真正的零
|
|||||||
|--------------------|------------------------|
|
|--------------------|------------------------|
|
||||||
| `jeecg-boot` | SpringBoot后台源码（支持微服务） |
|
| `jeecg-boot` | SpringBoot后台源码（支持微服务） |
|
||||||
| `jeecgboot-vue3` | Vue3+TS 新版前端源码 |
|
| `jeecgboot-vue3` | Vue3+TS 新版前端源码 |
|
||||||
| `ant-design-vue-jeecg` |Vue2版 前端源码 |
|
|
||||||
| `jeecg-uniapp` | APP开发框架，一份代码多终端适配，同时支持APP、小程序、H5 |
|
| `jeecg-uniapp` | APP开发框架，一份代码多终端适配，同时支持APP、小程序、H5 |
|
||||||
| `jeecg-boot-starter` | [Stater依赖项目单独维护，点击下载](https://gitee.com/jeecg/jeecg-boot-starter) |
|
| `jeecg-boot-starter` | [Stater依赖项目单独维护，点击下载](https://gitee.com/jeecg/jeecg-boot-starter) |
|
||||||
| `更多开源插件` | [更多源码下载](https://github.com/jeecgboot) |
|
| `更多开源插件` | [更多源码下载](https://github.com/jeecgboot) |
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
技术支持
|
||||||
|
|
||||||
适用项目
|
|
||||||
-----------------------------------
|
|
||||||
Jeecg-Boot低代码开发平台，可以应用在任何J2EE项目的开发中，尤其适合SAAS项目、企业信息管理系统（MIS）、内部办公系统（OA）、企业资源计划系统（ERP）、客户关系管理系统（CRM）等，其半智能手工Merge的开发方式，可以显著提高开发效率70%以上，极大降低开发成本。
|
|
||||||
|
|
||||||
|
|
||||||
Docker启动项目
|
|
||||||
-----------------------------------
|
-----------------------------------
|
||||||
|
|
||||||
- [Docker启动单体后台](http://doc.jeecg.com/2043889)
|
关闭gitee的issue通道，使用中遇到问题或者BUG可以在 [Github上提Issues](https://github.com/jeecgboot/jeecg-boot/issues/new)
|
||||||
- [Docker启动Vue3前端](http://vue3.jeecg.com/3028878)
|
|
||||||
|
|
||||||
- [Docker启动微服务后台](http://doc.jeecg.com/3043472)
|
|
||||||
- [Docker启动Vue2前端](http://doc.jeecg.com/3043612)
|
|
||||||
|
|
||||||
|
|
||||||
|
官方支持： [http://jeecg.com/doc/help](http://jeecg.com/doc/help)
|
||||||
|
|
||||||
|
|
||||||
技术文档
|
技术文档
|
||||||
-----------------------------------
|
-----------------------------------
|
||||||
|
|
||||||
- 技术官网： [http://www.jeecg.com](http://www.jeecg.com)
|
- 项目官网： [http://www.jeecg.com](http://www.jeecg.com)
|
||||||
|
|
||||||
- 在线演示 ： [Vue3版本](http://boot3.jeecg.com) | [Vue2版本](http://boot.jeecg.com)
|
- 在线演示 ： [低代码演示](http://boot3.jeecg.com) | [零代码体验](http://app.qiaoqiaoyun.com)
|
||||||
|
|
||||||
- 开发文档： [Vue3文档](http://vue3.jeecg.com) | [主项目文档](http://doc.jeecg.com)
|
- 开发文档： [http://help.jeecg.com](http://help.jeecg.com)
|
||||||
|
|
||||||
- 新手指南： [快速入门](http://www.jeecg.com/doc/quickstart) | [视频教程](https://space.bilibili.com/454617261/channel/series) | [常见问题 ](http://www.jeecg.com/doc/qa) | [技术支持](http://jeecg.com/doc/help) | [1分钟体验低代码](https://my.oschina.net/jeecg/blog/3083313)
|
- 新手指南： [快速入门](http://www.jeecg.com/doc/quickstart) | [常见问题 ](http://www.jeecg.com/doc/qa) | [视频教程](https://space.bilibili.com/454617261/channel/series) | [1分钟低代码体验](https://my.oschina.net/jeecg/blog/3083313)
|
||||||
|
|
||||||
- 微服务开发： [单体升级为微服务](http://doc.jeecg.com/3043471)
|
- QQ交流群 ： ⑦791696430、⑥730954414、VUE3群683903138、⑤860162132(满)、④774126647(满)、③816531124(满)、②769925425(满)、①284271917(满)
|
||||||
|
|
||||||
- QQ交流群 ： ⑥730954414、VUE3群683903138、⑤860162132(满)、④774126647(满)、③816531124(满)、②769925425(满)、①284271917(满)
|
|
||||||
> ` 提醒：【QQ群是自助服务群，建议给帮助您解决问题的同学发送指定红包，表示感谢！】 `
|
> ` 提醒：【QQ群是自助服务群，建议给帮助您解决问题的同学发送指定红包，表示感谢！】 `
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
Docker启动项目
|
||||||
|
-----------------------------------
|
||||||
|
|
||||||
|
- [Docker启动单体后台](https://help.jeecg.com/java/setup/docker/up.html)
|
||||||
|
- [Docker启动Vue3前端](http://help.jeecg.com/publish/docker.html)
|
||||||
|
- [Docker启动微服务后台](https://help.jeecg.com/java/springcloud/docker.html)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
=======【VUE2版本专题介绍】============================================
|
||||||
|
|
||||||
|
VUE2版本专题介绍
|
||||||
|
-----------------------------------
|
||||||
|
#### 项目介绍
|
||||||
|
- 项目名称：ant-design-vue-jeecg
|
||||||
|
- 说明：JeecgBoot前端提供两套解决方案，一套VUE2和一套VUE3版本，目前vue2版本最新代码只支持到jeecgboot 3.4.3版本，一定注意。
|
||||||
|
- 更多介绍：[Vue2版演示](http://boot.jeecg.com) |[开发文档](http://doc.jeecg.com)
|
||||||
|
- [快速启动——Vue2前端](http://doc.jeecg.com/2678320)
|
||||||
|
- [Docker启动——Vue2前端](http://doc.jeecg.com/3043612)
|
||||||
|
|
||||||
|
|
||||||
|
#### Vue2与Vue3版本区别
|
||||||
|
> - VUE3版本彻底抛弃IE兼容，不兼容IE和低版本浏览器，只适配高版本谷歌和Edge
|
||||||
|
（政府、事业类单位项目需要谨慎选择——国产化迁移是一个漫长的过程，万一过程中要求IE兼容，这个不可逆）
|
||||||
|
> - 所以如果对浏览器有要求的项目，请选择VUE2版本。
|
||||||
|
> - VUE3版是全新的技术栈，紧跟主流（前端重写），各个功能都做了优化，拥有更好的体验效果
|
||||||
|
|
||||||
|
|
||||||
|
#### 源码下载
|
||||||
|
| 源码 | 源码地址 |
|
||||||
|
|--------------------|------------------------|
|
||||||
|
| 后端源码 `Vue2版` |https://gitee.com/jeecg/jeecg-boot/tree/v3.4.3last |
|
||||||
|
| 前端源码 `Vue2版` |https://gitee.com/jeecg/ant-design-vue-jeecg |
|
||||||
|
|
||||||
|
=========【VUE2版本专题介绍】=========================================
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
##### Star走势图
|
##### Star走势图
|
||||||
|
|
||||||
[](https://star-history.com/#jeecgboot/jeecg-boot)
|
[](https://star-history.com/#jeecgboot/jeecg-boot)
|
||||||
@ -160,7 +193,7 @@ Docker启动项目
|
|||||||
* 17.支持SAAS服务模式，提供SaaS多租户架构方案。
|
* 17.支持SAAS服务模式，提供SaaS多租户架构方案。
|
||||||
* 18.分布式文件服务，集成minio、阿里OSS等优秀的第三方，提供便捷的文件上传与管理，同时也支持本地存储。
|
* 18.分布式文件服务，集成minio、阿里OSS等优秀的第三方，提供便捷的文件上传与管理，同时也支持本地存储。
|
||||||
* 19.主流数据库兼容，一套代码完全兼容Mysql、Postgresql、Oracle、Sqlserver、MariaDB、达梦等主流数据库。
|
* 19.主流数据库兼容，一套代码完全兼容Mysql、Postgresql、Oracle、Sqlserver、MariaDB、达梦等主流数据库。
|
||||||
* 20.集成工作流activiti，并实现了只需在页面配置流程转向，可极大的简化bpm工作流的开发；用bpm的流程设计器画出了流程走向，一个工作流基本就完成了，只需写很少量的java代码；
|
* 20.集成工作流activiti、flowable，并实现了只需在页面配置流程转向，可极大的简化bpm工作流的开发；用bpm的流程设计器画出了流程走向，一个工作流基本就完成了，只需写很少量的java代码；
|
||||||
* 21.低代码能力：在线流程设计，采用开源Activiti流程引擎，实现在线画流程,自定义表单,表单挂靠,业务流转
|
* 21.低代码能力：在线流程设计，采用开源Activiti流程引擎，实现在线画流程,自定义表单,表单挂靠,业务流转
|
||||||
* 22.多数据源：及其简易的使用方式，在线配置数据源配置，便捷的从其他数据抓取数据；
|
* 22.多数据源：及其简易的使用方式，在线配置数据源配置，便捷的从其他数据抓取数据；
|
||||||
* 23.提供单点登录CAS集成方案，项目中已经提供完善的对接代码
|
* 23.提供单点登录CAS集成方案，项目中已经提供完善的对接代码
|
||||||
@ -205,15 +238,15 @@ Docker启动项目
|
|||||||
|
|
||||||
#### 后端
|
#### 后端
|
||||||
|
|
||||||
- 基础框架：Spring Boot 2.6.6
|
- 基础框架：Spring Boot 2.6.14
|
||||||
|
|
||||||
- 微服务框架： Spring Cloud Alibaba 2021.0.1.0
|
- 微服务框架： Spring Cloud Alibaba 2021.0.1.0
|
||||||
|
|
||||||
- 持久层框架：MybatisPlus 3.5.1
|
- 持久层框架：MybatisPlus 3.5.1
|
||||||
|
|
||||||
- 报表工具： JimuReport 1.5.2
|
- 报表工具： JimuReport 1.5.8
|
||||||
|
|
||||||
- 安全框架：Apache Shiro 1.8.0，Jwt 3.11.0
|
- 安全框架：Apache Shiro 1.10.0，Jwt 3.11.0
|
||||||
|
|
||||||
- 微服务技术栈：Spring Cloud Alibaba、Nacos、Gateway、Sentinel、Skywalking
|
- 微服务技术栈：Spring Cloud Alibaba、Nacos、Gateway、Sentinel、Skywalking
|
||||||
|
|
||||||
@ -261,7 +294,7 @@ Docker启动项目
|
|||||||
|
|
||||||
8、服务监控 SpringBootAdmin√
|
8、服务监控 SpringBootAdmin√
|
||||||
|
|
||||||
9、链路跟踪 Skywalking [参考文档](http://doc.jeecg.com/2350293)
|
9、链路跟踪 Skywalking [参考文档](https://help.jeecg.com/java/springcloud/super/skywarking.html)
|
||||||
|
|
||||||
10、消息中间件 RabbitMQ √
|
10、消息中间件 RabbitMQ √
|
||||||
|
|
||||||
@ -408,7 +441,7 @@ Docker启动项目
|
|||||||
│ ├─数据报表设计
|
│ ├─数据报表设计
|
||||||
│ ├─图形报表设计（支持echart）
|
│ ├─图形报表设计（支持echart）
|
||||||
│ ├─大屏设计器(未开源)
|
│ ├─大屏设计器(未开源)
|
||||||
│─流程模块功能 (未开源)
|
│─更多商业功能 (未开源)
|
||||||
│ ├─流程设计器
|
│ ├─流程设计器
|
||||||
│ ├─表单设计器
|
│ ├─表单设计器
|
||||||
├─大屏设计器
|
├─大屏设计器
|
||||||
@ -435,39 +468,92 @@ Docker启动项目
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
系统效果
|
### 系统效果
|
||||||
----
|
|
||||||
##### 大屏模板
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
##### PC端
|
##### PC端
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
##### 系统交互
|
||||||
|
|
||||||
|
|
||||||
##### 在线接口文档
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
##### 报表
|
##### 流程设计
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
##### 流程
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
##### 简版流程设计
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
##### 仪表盘设计器
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
##### 报表设计器
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
##### 表单设计器
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
##### 大屏设计器
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
##### UNIAPP效果
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
##### 零代码应用
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
##### 手机端
|
##### 手机端
|
||||||
|
|
||||||
@ -476,10 +562,20 @@ Docker启动项目
|
|||||||
##### PAD端
|
##### PAD端
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
##### 图表示例
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
##### 在线接口文档
|
||||||
|
|
||||||
|
|
||||||
## 捐赠
|
## 捐赠
|
||||||
|
|
||||||
如果觉得还不错，请作者喝杯咖啡吧 ☺
|
如果觉得还不错，请作者喝杯咖啡吧 ☺
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
@ -40,17 +40,26 @@ CREATE TABLE `config_info` (
|
|||||||
`effect` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
|
`effect` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
|
||||||
`type` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
|
`type` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
|
||||||
`c_schema` text CHARACTER SET utf8 COLLATE utf8_bin NULL,
|
`c_schema` text CHARACTER SET utf8 COLLATE utf8_bin NULL,
|
||||||
|
`encrypted_data_key` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT '加密key',
|
||||||
PRIMARY KEY (`id`) USING BTREE,
|
PRIMARY KEY (`id`) USING BTREE,
|
||||||
UNIQUE INDEX `uk_configinfo_datagrouptenant`(`data_id`, `group_id`, `tenant_id`) USING BTREE
|
UNIQUE INDEX `uk_configinfo_datagrouptenant`(`data_id`, `group_id`, `tenant_id`) USING BTREE
|
||||||
) ENGINE = InnoDB AUTO_INCREMENT = 43 CHARACTER SET = utf8 COLLATE = utf8_bin COMMENT = 'config_info' ROW_FORMAT = DYNAMIC;
|
) ENGINE = InnoDB AUTO_INCREMENT = 42 CHARACTER SET = utf8 COLLATE = utf8_bin COMMENT = 'config_info' ROW_FORMAT = DYNAMIC;
|
||||||
|
|
||||||
-- ----------------------------
|
-- ----------------------------
|
||||||
-- Records of config_info
|
-- Records of config_info
|
||||||
-- ----------------------------
|
-- ----------------------------
|
||||||
INSERT INTO `config_info` VALUES (1, 'jeecg-dev.yaml', 'DEFAULT_GROUP', 'spring:\n datasource:\n druid:\n stat-view-servlet:\n enabled: true\n loginUsername: admin\n loginPassword: 123456\n allow:\n web-stat-filter:\n enabled: true\n dynamic:\n druid:\n initial-size: 5\n min-idle: 5\n maxActive: 20\n maxWait: 60000\n timeBetweenEvictionRunsMillis: 60000\n minEvictableIdleTimeMillis: 300000\n validationQuery: SELECT 1 FROM DUAL\n testWhileIdle: true\n testOnBorrow: false\n testOnReturn: false\n poolPreparedStatements: true\n maxPoolPreparedStatementPerConnectionSize: 20\n filters: stat,wall,slf4j\n connectionProperties: druid.stat.mergeSql\\=true;druid.stat.slowSqlMillis\\=5000\n datasource:\n master:\n url: jdbc:mysql://jeecg-boot-mysql:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai\n username: root\n password: root\n driver-class-name: com.mysql.cj.jdbc.Driver\n redis:\n database: 0\n host: jeecg-boot-redis\n password:\n port: 6379\n rabbitmq:\n host: jeecg-boot-rabbitmq\n username: guest\n password: guest\n port: 5672\n publisher-confirms: true\n publisher-returns: true\n virtual-host: /\n listener:\n simple:\n acknowledge-mode: manual\n concurrency: 1\n max-concurrency: 1\n retry:\n enabled: true\nminidao:\n base-package: org.jeecg.modules.jmreport.*,org.jeecg.modules.drag.*\njeecg:\n signatureSecret: dd05f1c54d63749eda95f9fa6d49v442a\n signUrls: /sys/dict/getDictItems/*,/sys/dict/loadDict/*,/sys/dict/loadDictOrderByValue/*,/sys/dict/loadDictItem/*,/sys/dict/loadTreeData,/sys/api/queryTableDictItemsByCode,/sys/api/queryFilterTableDictInfo,/sys/api/queryTableDictByKeys,/sys/api/translateDictFromTable,/sys/api/translateDictFromTableByKeys\n uploadType: local\n domainUrl:\n pc: http://localhost:3100\n app: http://localhost:8051\n path:\n upload: /opt/upFiles\n webapp: /opt/webapp\n shiro:\n excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**\n oss:\n endpoint: oss-cn-beijing.aliyuncs.com\n accessKey: ??\n secretKey: ??\n bucketName: jeecgdev\n staticDomain: ??\n elasticsearch:\n cluster-name: jeecg-ES\n cluster-nodes: jeecg-boot-es:9200\n check-enabled: false\n file-view-domain: 127.0.0.1:8012\n minio:\n minio_url: http://minio.jeecg.com\n minio_name: ??\n minio_pass: ??\n bucketName: otatest\n jmreport:\n mode: dev\n is_verify_token: false\n verify_methods: remove,delete,save,add,update\n wps:\n domain: https://wwo.wps.cn/office/\n appid: ??\n appsecret: ??\n xxljob:\n enabled: false\n adminAddresses: http://jeecg-boot-xxljob:9080/xxl-job-admin\n appname: ${spring.application.name}\n accessToken: \'\'\n logPath: logs/jeecg/job/jobhandler/\n logRetentionDays: 30\n redisson:\n address: jeecg-boot-redis:6379\n password:\n type: STANDALONE\n enabled: true\nlogging:\n level:\n org.jeecg.modules.system.mapper : info\ncas:\n prefixUrl: http://localhost:8888/cas\nknife4j:\n production: false\n basic:\n enable: false\n username: jeecg\n password: jeecg1314\njustauth:\n enabled: true\n type:\n GITHUB:\n client-id: ??\n client-secret: ??\n redirect-uri: http://sso.test.com:8080/jeecg-boot/thirdLogin/github/callback\n WECHAT_ENTERPRISE:\n client-id: ??\n client-secret: ??\n redirect-uri: http://sso.test.com:8080/jeecg-boot/thirdLogin/wechat_enterprise/callback\n agent-id: ??\n DINGTALK:\n client-id: ??\n client-secret: ??\n redirect-uri: http://sso.test.com:8080/jeecg-boot/thirdLogin/dingtalk/callback\n cache:\n type: default\n prefix: \'demo::\'\n timeout: 1h\nthird-app:\n enabled: false\n type:\n WECHAT_ENTERPRISE:\n enabled: false\n client-id: ??\n client-secret: ??\n agent-id: ??\n DINGTALK:\n enabled: false\n client-id: ??\n client-secret: ??\n agent-id: ??', 'edb0e79d570edf341755caf3853f11e4', '2021-03-03 13:01:11', '2022-08-06 07:10:17', 'nacos', '0:0:0:0:0:0:0:1', '', '', '', '', '', 'yaml', '');
|
INSERT INTO `config_info` VALUES (1, 'jeecg-dev.yaml', 'DEFAULT_GROUP', 'spring:\n datasource:\n druid:\n stat-view-servlet:\n enabled: true\n loginUsername: admin\n loginPassword: 123456\n allow:\n web-stat-filter:\n enabled: true\n dynamic:\n druid:\n initial-size: 5\n min-idle: 5\n maxActive: 20\n maxWait: 60000\n timeBetweenEvictionRunsMillis: 60000\n minEvictableIdleTimeMillis: 300000\n validationQuery: SELECT 1 FROM DUAL\n testWhileIdle: true\n testOnBorrow: false\n testOnReturn: false\n poolPreparedStatements: true\n maxPoolPreparedStatementPerConnectionSize: 20\n filters: stat,wall,slf4j\n connectionProperties: druid.stat.mergeSql\\=true;druid.stat.slowSqlMillis\\=5000\n datasource:\n master:\n url: jdbc:mysql://jeecg-boot-mysql:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai\n username: root\n password: root\n driver-class-name: com.mysql.cj.jdbc.Driver\n redis:\n database: 0\n host: jeecg-boot-redis\n password:\n port: 6379\n rabbitmq:\n host: jeecg-boot-rabbitmq\n username: guest\n password: guest\n port: 5672\n publisher-confirms: true\n publisher-returns: true\n virtual-host: /\n listener:\n simple:\n acknowledge-mode: manual\n concurrency: 1\n max-concurrency: 1\n retry:\n enabled: true\nminidao:\n base-package: org.jeecg.modules.jmreport.*,org.jeecg.modules.drag.*\njeecg:\n signatureSecret: dd05f1c54d63749eda95f9fa6d49v442a\n signUrls: /sys/dict/getDictItems/*,/sys/dict/loadDict/*,/sys/dict/loadDictOrderByValue/*,/sys/dict/loadDictItem/*,/sys/dict/loadTreeData,/sys/api/queryTableDictItemsByCode,/sys/api/queryFilterTableDictInfo,/sys/api/queryTableDictByKeys,/sys/api/translateDictFromTable,/sys/api/translateDictFromTableByKeys\n uploadType: local\n domainUrl:\n pc: http://localhost:3100\n app: http://localhost:8051\n path:\n upload: /opt/upFiles\n webapp: /opt/webapp\n shiro:\n excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**\n oss:\n endpoint: oss-cn-beijing.aliyuncs.com\n accessKey: ??\n secretKey: ??\n bucketName: jeecgdev\n staticDomain: ??\n elasticsearch:\n cluster-name: jeecg-ES\n cluster-nodes: jeecg-boot-es:9200\n check-enabled: false\n file-view-domain: 127.0.0.1:8012\n minio:\n minio_url: http://minio.jeecg.com\n minio_name: ??\n minio_pass: ??\n bucketName: otatest\n jmreport:\n mode: dev\n is_verify_token: false\n verify_methods: remove,delete,save,add,update\n wps:\n domain: https://wwo.wps.cn/office/\n appid: ??\n appsecret: ??\n xxljob:\n enabled: false\n adminAddresses: http://jeecg-boot-xxljob:9080/xxl-job-admin\n appname: ${spring.application.name}\n accessToken: \'\'\n logPath: logs/jeecg/job/jobhandler/\n logRetentionDays: 30\n redisson:\n address: jeecg-boot-redis:6379\n password:\n type: STANDALONE\n enabled: true\nlogging:\n level:\n org.jeecg.modules.system.mapper : info\ncas:\n prefixUrl: http://localhost:8888/cas\nknife4j:\n production: false\n basic:\n enable: false\n username: jeecg\n password: jeecg1314\njustauth:\n enabled: true\n type:\n GITHUB:\n client-id: ??\n client-secret: ??\n redirect-uri: http://sso.test.com:8080/jeecg-boot/thirdLogin/github/callback\n WECHAT_ENTERPRISE:\n client-id: ??\n client-secret: ??\n redirect-uri: http://sso.test.com:8080/jeecg-boot/thirdLogin/wechat_enterprise/callback\n agent-id: ??\n DINGTALK:\n client-id: ??\n client-secret: ??\n redirect-uri: http://sso.test.com:8080/jeecg-boot/thirdLogin/dingtalk/callback\n cache:\n type: default\n prefix: \'demo::\'\n timeout: 1h\nthird-app:\n enabled: false\n type:\n WECHAT_ENTERPRISE:\n enabled: false\n client-id: ??\n client-secret: ??\n agent-id: ??\n DINGTALK:\n enabled: false\n client-id: ??\n client-secret: ??\n agent-id: ??', 'edb0e79d570edf341755caf3853f11e4', '2021-03-03 13:01:11', '2023-07-17 10:34:57', 'nacos', '192.168.1.129', '', '', '', '', '', 'yaml', '', '');
|
||||||
INSERT INTO `config_info` VALUES (2, 'jeecg.yaml', 'DEFAULT_GROUP', 'server:\n tomcat:\n max-swallow-size: -1\n error:\n include-exception: true\n include-stacktrace: ALWAYS\n include-message: ALWAYS\n compression:\n enabled: true\n min-response-size: 1024\n mime-types: application/javascript,application/json,application/xml,text/html,text/xml,text/plain,text/css,image/*\nmanagement:\n health:\n mail:\n enabled: false\n endpoints:\n web:\n exposure:\n include: \"*\"\n health:\n sensitive: true\n endpoint:\n health:\n show-details: ALWAYS\nspring:\n servlet:\n multipart:\n max-file-size: 10MB\n max-request-size: 10MB\n mail:\n host: smtp.163.com\n username: jeecgos@163.com\n password: ??\n properties:\n mail:\n smtp:\n auth: true\n starttls:\n enable: true\n required: true\n quartz:\n job-store-type: jdbc\n initialize-schema: embedded\n auto-startup: false\n startup-delay: 1s\n overwrite-existing-jobs: true\n properties:\n org:\n quartz:\n scheduler:\n instanceName: MyScheduler\n instanceId: AUTO\n jobStore:\n class: org.springframework.scheduling.quartz.LocalDataSourceJobStore\n driverDelegateClass: org.quartz.impl.jdbcjobstore.StdJDBCDelegate\n tablePrefix: QRTZ_\n isClustered: true\n misfireThreshold: 12000\n clusterCheckinInterval: 15000\n threadPool:\n class: org.quartz.simpl.SimpleThreadPool\n threadCount: 10\n threadPriority: 5\n threadsInheritContextClassLoaderOfInitializingThread: true\n jackson:\n date-format: yyyy-MM-dd HH:mm:ss\n time-zone: GMT+8\n aop:\n proxy-target-class: true\n activiti:\n check-process-definitions: false\n async-executor-activate: false\n job-executor-activate: false\n jpa:\n open-in-view: false\n freemarker:\n suffix: .ftl\n content-type: text/html\n charset: UTF-8\n cache: false\n prefer-file-system-access: false\n template-loader-path:\n - classpath:/templates\n mvc:\n static-path-pattern: /**\n pathmatch:\n matching-strategy: ant_path_matcher\n resource:\n static-locations: classpath:/static/,classpath:/public/\n autoconfigure:\n exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure\nmybatis-plus:\n mapper-locations: classpath*:org/jeecg/modules/**/xml/*Mapper.xml\n global-config:\n banner: false\n db-config:\n id-type: ASSIGN_ID\n table-underline: true\n configuration:\n call-setters-on-nulls: true', '2117a96ba08e8fd0f66825e87416af27', '2021-03-03 13:01:42', '2022-08-05 13:12:21', 'nacos', '0:0:0:0:0:0:0:1', '', '', '', '', '', 'yaml', '');
|
INSERT INTO `config_info` VALUES (2, 'jeecg.yaml', 'DEFAULT_GROUP', 'server:\n tomcat:\n max-swallow-size: -1\n error:\n include-exception: true\n include-stacktrace: ALWAYS\n include-message: ALWAYS\n compression:\n enabled: true\n min-response-size: 1024\n mime-types: application/javascript,application/json,application/xml,text/html,text/xml,text/plain,text/css,image/*\nmanagement:\n health:\n mail:\n enabled: false\n endpoints:\n web:\n exposure:\n include: \"*\"\n health:\n sensitive: true\n endpoint:\n health:\n show-details: ALWAYS\nspring:\n servlet:\n multipart:\n max-file-size: 10MB\n max-request-size: 10MB\n mail:\n host: smtp.163.com\n username: jeecgos@163.com\n password: ??\n properties:\n mail:\n smtp:\n auth: true\n starttls:\n enable: true\n required: true\n quartz:\n job-store-type: jdbc\n initialize-schema: embedded\n auto-startup: false\n startup-delay: 1s\n overwrite-existing-jobs: true\n properties:\n org:\n quartz:\n scheduler:\n instanceName: MyScheduler\n instanceId: AUTO\n jobStore:\n class: org.springframework.scheduling.quartz.LocalDataSourceJobStore\n driverDelegateClass: org.quartz.impl.jdbcjobstore.StdJDBCDelegate\n tablePrefix: QRTZ_\n isClustered: true\n misfireThreshold: 12000\n clusterCheckinInterval: 15000\n threadPool:\n class: org.quartz.simpl.SimpleThreadPool\n threadCount: 10\n threadPriority: 5\n threadsInheritContextClassLoaderOfInitializingThread: true\n jackson:\n date-format: yyyy-MM-dd HH:mm:ss\n time-zone: GMT+8\n aop:\n proxy-target-class: true\n activiti:\n check-process-definitions: false\n async-executor-activate: false\n job-executor-activate: false\n jpa:\n open-in-view: false\n freemarker:\n suffix: .ftl\n content-type: text/html\n charset: UTF-8\n cache: false\n prefer-file-system-access: false\n template-loader-path:\n - classpath:/templates\n mvc:\n static-path-pattern: /**\n pathmatch:\n matching-strategy: ant_path_matcher\n resource:\n static-locations: classpath:/static/,classpath:/public/\n autoconfigure:\n exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure\nmybatis-plus:\n mapper-locations: classpath*:org/jeecg/modules/**/xml/*Mapper.xml\n global-config:\n banner: false\n db-config:\n id-type: ASSIGN_ID\n table-underline: true\n configuration:\n call-setters-on-nulls: true', '2117a96ba08e8fd0f66825e87416af27', '2021-03-03 13:01:42', '2022-08-05 13:12:21', 'nacos', '0:0:0:0:0:0:0:1', '', '', '', '', '', 'yaml', '', NULL);
|
||||||
INSERT INTO `config_info` VALUES (3, 'jeecg-gateway-router.json', 'DEFAULT_GROUP', '[{\n \"id\": \"jeecg-system\",\n \"order\": 0,\n \"predicates\": [{\n \"name\": \"Path\",\n \"args\": {\n \"_genkey_0\": \"/sys/**\",\n \"_genkey_1\": \"/jmreport/**\",\n \"_genkey_3\": \"/online/**\",\n \"_genkey_4\": \"/generic/**\"\n }\n }],\n \"filters\": [],\n \"uri\": \"lb://jeecg-system\"\n}, {\n \"id\": \"jeecg-demo\",\n \"order\": 1,\n \"predicates\": [{\n \"name\": \"Path\",\n \"args\": {\n \"_genkey_0\": \"/mock/**\",\n \"_genkey_1\": \"/test/**\",\n \"_genkey_2\": \"/bigscreen/template1/**\",\n \"_genkey_3\": \"/bigscreen/template2/**\"\n }\n }],\n \"filters\": [],\n \"uri\": \"lb://jeecg-demo\"\n}, {\n \"id\": \"jeecg-system-websocket\",\n \"order\": 2,\n \"predicates\": [{\n \"name\": \"Path\",\n \"args\": {\n \"_genkey_0\": \"/websocket/**\",\n \"_genkey_1\": \"/newsWebsocket/**\"\n }\n }],\n \"filters\": [],\n \"uri\": \"lb:ws://jeecg-system\"\n}, {\n \"id\": \"jeecg-demo-websocket\",\n \"order\": 3,\n \"predicates\": [{\n \"name\": \"Path\",\n \"args\": {\n \"_genkey_0\": \"/vxeSocket/**\"\n }\n }],\n \"filters\": [],\n \"uri\": \"lb:ws://jeecg-demo\"\n}]', 'be6548051d99309d7fa5ac4398404201', '2021-03-03 13:02:14', '2022-02-23 11:49:01', NULL, '0:0:0:0:0:0:0:1', '', '', '', '', '', 'json', '');
|
INSERT INTO `config_info` VALUES (3, 'jeecg-gateway-router.json', 'DEFAULT_GROUP', '[{\n \"id\": \"jeecg-system\",\n \"order\": 0,\n \"predicates\": [{\n \"name\": \"Path\",\n \"args\": {\n \"_genkey_0\": \"/sys/**\",\n \"_genkey_1\": \"/jmreport/**\",\n \"_genkey_3\": \"/online/**\",\n \"_genkey_4\": \"/generic/**\"\n }\n }],\n \"filters\": [],\n \"uri\": \"lb://jeecg-system\"\n}, {\n \"id\": \"jeecg-demo\",\n \"order\": 1,\n \"predicates\": [{\n \"name\": \"Path\",\n \"args\": {\n \"_genkey_0\": \"/mock/**\",\n \"_genkey_1\": \"/test/**\",\n \"_genkey_2\": \"/bigscreen/template1/**\",\n \"_genkey_3\": \"/bigscreen/template2/**\"\n }\n }],\n \"filters\": [],\n \"uri\": \"lb://jeecg-demo\"\n}, {\n \"id\": \"jeecg-system-websocket\",\n \"order\": 2,\n \"predicates\": [{\n \"name\": \"Path\",\n \"args\": {\n \"_genkey_0\": \"/websocket/**\",\n \"_genkey_1\": \"/newsWebsocket/**\"\n }\n }],\n \"filters\": [],\n \"uri\": \"lb:ws://jeecg-system\"\n}, {\n \"id\": \"jeecg-demo-websocket\",\n \"order\": 3,\n \"predicates\": [{\n \"name\": \"Path\",\n \"args\": {\n \"_genkey_0\": \"/vxeSocket/**\"\n }\n }],\n \"filters\": [],\n \"uri\": \"lb:ws://jeecg-demo\"\n}]', 'be6548051d99309d7fa5ac4398404201', '2021-03-03 13:02:14', '2022-02-23 11:49:01', NULL, '0:0:0:0:0:0:0:1', '', '', '', '', '', 'json', '', NULL);
|
||||||
INSERT INTO `config_info` VALUES (20, 'jeecg-gateway-dev.yaml', 'DEFAULT_GROUP', 'jeecg:\n route:\n config:\n #type:database nacos yml\n data-type: database\n group: DEFAULT_GROUP\n data-id: jeecg-gateway-router\nspring:\n redis:\n database: 0\n host: jeecg-boot-redis\n port: 6379\n password:', '0fc619d2d5e304f18bc4ea8be99f68a4', '2022-08-04 16:36:11', '2022-08-06 07:11:34', 'nacos', '0:0:0:0:0:0:0:1', '', '', '', '', '', 'yaml', '');
|
INSERT INTO `config_info` VALUES (11, 'jeecg-sharding.yaml', 'DEFAULT_GROUP', 'spring:\n shardingsphere:\n datasource:\n names: ds0\n ds0:\n driverClassName: com.mysql.cj.jdbc.Driver\n url: jdbc:mysql://jeecg-boot-mysql:3306/jeecg-boot?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai\n username: root\n password: root\n type: com.alibaba.druid.pool.DruidDataSource\n props:\n sql-show: true\n rules:\n sharding:\n binding-tables: sys_log\n key-generators:\n snowflake:\n type: SNOWFLAKE\n props:\n worker-id: 123\n sharding-algorithms:\n table-classbased:\n props:\n strategy: standard\n algorithmClassName: org.jeecg.modules.test.sharding.algorithm.StandardModTableShardAlgorithm\n type: CLASS_BASED\n tables:\n sys_log:\n actual-data-nodes: ds0.sys_log$->{0..1}\n table-strategy:\n standard:\n sharding-algorithm-name: table-classbased\n sharding-column: log_type', 'a93fa455c32cd37ca84631d2bbe13005', '2022-04-13 03:12:28', '2022-08-07 13:13:57', 'nacos', '0:0:0:0:0:0:0:1', '', '', '', '', '', 'yaml', '', NULL);
|
||||||
|
INSERT INTO `config_info` VALUES (20, 'jeecg-gateway-dev.yaml', 'DEFAULT_GROUP', 'jeecg:\n route:\n config:\n #type:database nacos yml\n data-type: database\n data-id: jeecg-gateway-router\nspring:\n redis:\n database: 0\n host: jeecg-boot-redis\n port: 6379\n password:', 'd65267ddfda1b0c0f4462606195d1a5a', '2022-08-04 16:36:11', '2023-04-17 06:05:15', 'nacos', '0:0:0:0:0:0:0:1', '', '', '', '', '', 'yaml', '', NULL);
|
||||||
|
INSERT INTO `config_info` VALUES (22, 'jeecg-sharding-multi.yaml', 'DEFAULT_GROUP', 'spring:\n shardingsphere:\n datasource:\n names: ds0,ds1\n ds0:\n driverClassName: com.mysql.cj.jdbc.Driver\n url: jdbc:mysql://jeecg-boot-mysql:3306/jeecg-boot?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai\n type: com.alibaba.druid.pool.DruidDataSource\n username: root\n password: root\n ds1:\n driverClassName: com.mysql.cj.jdbc.Driver\n url: jdbc:mysql://jeecg-boot-mysql:3306/jeecg-boot2?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai\n type: com.alibaba.druid.pool.DruidDataSource\n username: root\n password: root\n props:\n sql-show: true\n rules:\n replica-query:\n load-balancers:\n round-robin:\n type: ROUND_ROBIN\n props:\n default: 0\n data-sources:\n prds:\n primary-data-source-name: ds0\n replica-data-source-names: ds1\n load-balancer-name: round_robin\n sharding:\n binding-tables:\n - sys_log\n key-generators:\n snowflake:\n type: SNOWFLAKE\n props:\n worker-id: 123\n sharding-algorithms:\n table-classbased:\n props:\n strategy: standard\n algorithmClassName: org.jeecg.modules.test.sharding.algorithm.StandardModTableShardAlgorithm\n type: CLASS_BASED\n database-inline:\n type: INLINE\n props:\n algorithm-expression: ds$->{operate_type % 2}\n tables:\n sys_log:\n actual-data-nodes: ds$->{0..1}.sys_log$->{0..1}\n database-strategy:\n standard:\n sharding-column: operate_type\n sharding-algorithm-name: database-inline\n table-strategy:\n standard:\n sharding-algorithm-name: table-classbased\n sharding-column: log_type', '0fc2b030ca8c0008f148c84ecbd2a8c7', '2022-08-07 06:09:01', '2022-08-07 13:03:52', 'nacos', '0:0:0:0:0:0:0:1', '', '', '', '', '', 'yaml', '', NULL);
|
||||||
|
INSERT INTO `config_info` VALUES (29, 'jeecg-dev.yaml', 'JEECGDEV_GROUP', 'spring:\n datasource:\n druid:\n stat-view-servlet:\n enabled: true\n loginUsername: admin\n loginPassword: 123456\n allow:\n web-stat-filter:\n enabled: true\n dynamic:\n druid:\n initial-size: 5\n min-idle: 5\n maxActive: 20\n maxWait: 60000\n timeBetweenEvictionRunsMillis: 60000\n minEvictableIdleTimeMillis: 300000\n validationQuery: SELECT 1 FROM DUAL\n testWhileIdle: true\n testOnBorrow: false\n testOnReturn: false\n poolPreparedStatements: true\n maxPoolPreparedStatementPerConnectionSize: 20\n filters: stat,wall,slf4j\n connectionProperties: druid.stat.mergeSql\\=true;druid.stat.slowSqlMillis\\=5000\n datasource:\n master:\n url: jdbc:mysql://jeecg-boot-mysql:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai\n username: root\n password: root\n driver-class-name: com.mysql.cj.jdbc.Driver\n redis:\n database: 0\n host: jeecg-boot-redis\n password:\n port: 6379\n rabbitmq:\n host: jeecg-boot-rabbitmq\n username: guest\n password: guest\n port: 5672\n publisher-confirms: true\n publisher-returns: true\n virtual-host: /\n listener:\n simple:\n acknowledge-mode: manual\n concurrency: 1\n max-concurrency: 1\n retry:\n enabled: true\nminidao:\n base-package: org.jeecg.modules.jmreport.*,org.jeecg.modules.drag.*\njeecg:\n signatureSecret: dd05f1c54d63749eda95f9fa6d49v442a\n signUrls: /sys/dict/getDictItems/*,/sys/dict/loadDict/*,/sys/dict/loadDictOrderByValue/*,/sys/dict/loadDictItem/*,/sys/dict/loadTreeData,/sys/api/queryTableDictItemsByCode,/sys/api/queryFilterTableDictInfo,/sys/api/queryTableDictByKeys,/sys/api/translateDictFromTable,/sys/api/translateDictFromTableByKeys\n uploadType: local\n domainUrl:\n pc: http://localhost:3100\n app: http://localhost:8051\n path:\n upload: /opt/upFiles\n webapp: /opt/webapp\n shiro:\n excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**\n oss:\n endpoint: oss-cn-beijing.aliyuncs.com\n accessKey: ??\n secretKey: ??\n bucketName: jeecgdev\n staticDomain: ??\n elasticsearch:\n cluster-name: jeecg-ES\n cluster-nodes: jeecg-boot-es:9200\n check-enabled: false\n file-view-domain: 127.0.0.1:8012\n minio:\n minio_url: http://minio.jeecg.com\n minio_name: ??\n minio_pass: ??\n bucketName: otatest\n jmreport:\n mode: dev\n is_verify_token: false\n verify_methods: remove,delete,save,add,update\n wps:\n domain: https://wwo.wps.cn/office/\n appid: ??\n appsecret: ??\n xxljob:\n enabled: true\n adminAddresses: http://jeecg-boot-xxljob:9080/xxl-job-admin\n appname: ${spring.application.name}\n accessToken: \'\'\n logPath: logs/jeecg/job/jobhandler/\n logRetentionDays: 30\n redisson:\n address: jeecg-boot-redis:6379\n password:\n type: STANDALONE\n enabled: true\nlogging:\n level:\n org.jeecg.modules.system.mapper : info\ncas:\n prefixUrl: http://localhost:8888/cas\nknife4j:\n production: false\n basic:\n enable: false\n username: jeecg\n password: jeecg1314\njustauth:\n enabled: true\n type:\n GITHUB:\n client-id: ??\n client-secret: ??\n redirect-uri: http://sso.test.com:8080/jeecg-boot/thirdLogin/github/callback\n WECHAT_ENTERPRISE:\n client-id: ??\n client-secret: ??\n redirect-uri: http://sso.test.com:8080/jeecg-boot/thirdLogin/wechat_enterprise/callback\n agent-id: ??\n DINGTALK:\n client-id: ??\n client-secret: ??\n redirect-uri: http://sso.test.com:8080/jeecg-boot/thirdLogin/dingtalk/callback\n cache:\n type: default\n prefix: \'demo::\'\n timeout: 1h\nthird-app:\n enabled: false\n type:\n WECHAT_ENTERPRISE:\n enabled: false\n client-id: ??\n client-secret: ??\n agent-id: ??\n DINGTALK:\n enabled: false\n client-id: ??\n client-secret: ??\n agent-id: ??', '6c0ec1ace75d0341a1f83978c864c0b3', '2023-07-17 10:05:06', '2023-07-17 11:49:49', NULL, '0:0:0:0:0:0:0:1', '', 'ac14ab82-51f8-4f0c-aa5b-25fb8384bfb6', '', '', '', 'yaml', '', '');
|
||||||
|
INSERT INTO `config_info` VALUES (30, 'jeecg.yaml', 'JEECGDEV_GROUP', 'server:\n tomcat:\n max-swallow-size: -1\n error:\n include-exception: true\n include-stacktrace: ALWAYS\n include-message: ALWAYS\n compression:\n enabled: true\n min-response-size: 1024\n mime-types: application/javascript,application/json,application/xml,text/html,text/xml,text/plain,text/css,image/*\nmanagement:\n health:\n mail:\n enabled: false\n endpoints:\n web:\n exposure:\n include: \"*\"\n health:\n sensitive: true\n endpoint:\n health:\n show-details: ALWAYS\nspring:\n servlet:\n multipart:\n max-file-size: 10MB\n max-request-size: 10MB\n mail:\n host: smtp.163.com\n username: jeecgos@163.com\n password: ??\n properties:\n mail:\n smtp:\n auth: true\n starttls:\n enable: true\n required: true\n quartz:\n job-store-type: jdbc\n initialize-schema: embedded\n auto-startup: false\n startup-delay: 1s\n overwrite-existing-jobs: true\n properties:\n org:\n quartz:\n scheduler:\n instanceName: MyScheduler\n instanceId: AUTO\n jobStore:\n class: org.springframework.scheduling.quartz.LocalDataSourceJobStore\n driverDelegateClass: org.quartz.impl.jdbcjobstore.StdJDBCDelegate\n tablePrefix: QRTZ_\n isClustered: true\n misfireThreshold: 12000\n clusterCheckinInterval: 15000\n threadPool:\n class: org.quartz.simpl.SimpleThreadPool\n threadCount: 10\n threadPriority: 5\n threadsInheritContextClassLoaderOfInitializingThread: true\n jackson:\n date-format: yyyy-MM-dd HH:mm:ss\n time-zone: GMT+8\n aop:\n proxy-target-class: true\n activiti:\n check-process-definitions: false\n async-executor-activate: false\n job-executor-activate: false\n jpa:\n open-in-view: false\n freemarker:\n suffix: .ftl\n content-type: text/html\n charset: UTF-8\n cache: false\n prefer-file-system-access: false\n template-loader-path:\n - classpath:/templates\n mvc:\n static-path-pattern: /**\n pathmatch:\n matching-strategy: ant_path_matcher\n resource:\n static-locations: classpath:/static/,classpath:/public/\n autoconfigure:\n exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure\nmybatis-plus:\n mapper-locations: classpath*:org/jeecg/modules/**/xml/*Mapper.xml\n global-config:\n banner: false\n db-config:\n id-type: ASSIGN_ID\n table-underline: true\n configuration:\n call-setters-on-nulls: true', '2117a96ba08e8fd0f66825e87416af27', '2023-07-17 10:05:06', '2023-07-17 10:05:06', NULL, '0:0:0:0:0:0:0:1', '', 'ac14ab82-51f8-4f0c-aa5b-25fb8384bfb6', '', NULL, NULL, 'yaml', NULL, '');
|
||||||
|
INSERT INTO `config_info` VALUES (31, 'jeecg-gateway-router.json', 'JEECGDEV_GROUP', '[{\n \"id\": \"jeecg-system\",\n \"order\": 0,\n \"predicates\": [{\n \"name\": \"Path\",\n \"args\": {\n \"_genkey_0\": \"/sys/**\",\n \"_genkey_1\": \"/jmreport/**\",\n \"_genkey_3\": \"/online/**\",\n \"_genkey_4\": \"/generic/**\"\n }\n }],\n \"filters\": [],\n \"uri\": \"lb://jeecg-system\"\n}, {\n \"id\": \"jeecg-demo\",\n \"order\": 1,\n \"predicates\": [{\n \"name\": \"Path\",\n \"args\": {\n \"_genkey_0\": \"/mock/**\",\n \"_genkey_1\": \"/test/**\",\n \"_genkey_2\": \"/bigscreen/template1/**\",\n \"_genkey_3\": \"/bigscreen/template2/**\"\n }\n }],\n \"filters\": [],\n \"uri\": \"lb://jeecg-demo\"\n}, {\n \"id\": \"jeecg-system-websocket\",\n \"order\": 2,\n \"predicates\": [{\n \"name\": \"Path\",\n \"args\": {\n \"_genkey_0\": \"/websocket/**\",\n \"_genkey_1\": \"/newsWebsocket/**\"\n }\n }],\n \"filters\": [],\n \"uri\": \"lb:ws://jeecg-system\"\n}, {\n \"id\": \"jeecg-demo-websocket\",\n \"order\": 3,\n \"predicates\": [{\n \"name\": \"Path\",\n \"args\": {\n \"_genkey_0\": \"/vxeSocket/**\"\n }\n }],\n \"filters\": [],\n \"uri\": \"lb:ws://jeecg-demo\"\n}]', 'be6548051d99309d7fa5ac4398404201', '2023-07-17 10:05:06', '2023-07-17 10:05:06', NULL, '0:0:0:0:0:0:0:1', '', 'ac14ab82-51f8-4f0c-aa5b-25fb8384bfb6', '', NULL, NULL, 'json', NULL, '');
|
||||||
|
INSERT INTO `config_info` VALUES (32, 'jeecg-sharding.yaml', 'JEECGDEV_GROUP', 'spring:\n shardingsphere:\n datasource:\n names: ds0\n ds0:\n driverClassName: com.mysql.cj.jdbc.Driver\n url: jdbc:mysql://jeecg-boot-mysql:3306/jeecg-boot?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai\n username: root\n password: root\n type: com.alibaba.druid.pool.DruidDataSource\n props:\n sql-show: true\n rules:\n sharding:\n binding-tables: sys_log\n key-generators:\n snowflake:\n type: SNOWFLAKE\n props:\n worker-id: 123\n sharding-algorithms:\n table-classbased:\n props:\n strategy: standard\n algorithmClassName: org.jeecg.modules.test.sharding.algorithm.StandardModTableShardAlgorithm\n type: CLASS_BASED\n tables:\n sys_log:\n actual-data-nodes: ds0.sys_log$->{0..1}\n table-strategy:\n standard:\n sharding-algorithm-name: table-classbased\n sharding-column: log_type', 'a93fa455c32cd37ca84631d2bbe13005', '2023-07-17 10:05:06', '2023-07-17 10:05:06', NULL, '0:0:0:0:0:0:0:1', '', 'ac14ab82-51f8-4f0c-aa5b-25fb8384bfb6', '', NULL, NULL, 'yaml', NULL, '');
|
||||||
|
INSERT INTO `config_info` VALUES (33, 'jeecg-gateway-dev.yaml', 'JEECGDEV_GROUP', 'jeecg:\n route:\n config:\n #type:database nacos yml\n data-type: nacos\n data-id: jeecg-gateway-router\nspring:\n redis:\n database: 0\n host: jeecg-boot-redis\n port: 6379\n password:', 'eeb45ae799de89f4d789139de7a7d12d', '2023-07-17 10:05:06', '2023-07-17 11:49:21', NULL, '0:0:0:0:0:0:0:1', '', 'ac14ab82-51f8-4f0c-aa5b-25fb8384bfb6', '', '', '', 'yaml', '', '');
|
||||||
|
INSERT INTO `config_info` VALUES (34, 'jeecg-sharding-multi.yaml', 'JEECGDEV_GROUP', 'spring:\n shardingsphere:\n datasource:\n names: ds0,ds1\n ds0:\n driverClassName: com.mysql.cj.jdbc.Driver\n url: jdbc:mysql://jeecg-boot-mysql:3306/jeecg-boot?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai\n type: com.alibaba.druid.pool.DruidDataSource\n username: root\n password: root\n ds1:\n driverClassName: com.mysql.cj.jdbc.Driver\n url: jdbc:mysql://jeecg-boot-mysql:3306/jeecg-boot2?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai\n type: com.alibaba.druid.pool.DruidDataSource\n username: root\n password: root\n props:\n sql-show: true\n rules:\n replica-query:\n load-balancers:\n round-robin:\n type: ROUND_ROBIN\n props:\n default: 0\n data-sources:\n prds:\n primary-data-source-name: ds0\n replica-data-source-names: ds1\n load-balancer-name: round_robin\n sharding:\n binding-tables:\n - sys_log\n key-generators:\n snowflake:\n type: SNOWFLAKE\n props:\n worker-id: 123\n sharding-algorithms:\n table-classbased:\n props:\n strategy: standard\n algorithmClassName: org.jeecg.modules.test.sharding.algorithm.StandardModTableShardAlgorithm\n type: CLASS_BASED\n database-inline:\n type: INLINE\n props:\n algorithm-expression: ds$->{operate_type % 2}\n tables:\n sys_log:\n actual-data-nodes: ds$->{0..1}.sys_log$->{0..1}\n database-strategy:\n standard:\n sharding-column: operate_type\n sharding-algorithm-name: database-inline\n table-strategy:\n standard:\n sharding-algorithm-name: table-classbased\n sharding-column: log_type', '0fc2b030ca8c0008f148c84ecbd2a8c7', '2023-07-17 10:05:06', '2023-07-17 10:05:06', NULL, '0:0:0:0:0:0:0:1', '', 'ac14ab82-51f8-4f0c-aa5b-25fb8384bfb6', '', NULL, NULL, 'yaml', NULL, '');
|
||||||
|
|
||||||
-- ----------------------------
|
-- ----------------------------
|
||||||
-- Table structure for config_info_aggr
|
-- Table structure for config_info_aggr
|
||||||
@ -90,6 +99,7 @@ CREATE TABLE `config_info_beta` (
|
|||||||
`src_user` text CHARACTER SET utf8 COLLATE utf8_bin NULL COMMENT 'source user',
|
`src_user` text CHARACTER SET utf8 COLLATE utf8_bin NULL COMMENT 'source user',
|
||||||
`src_ip` varchar(20) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT 'source ip',
|
`src_ip` varchar(20) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT 'source ip',
|
||||||
`tenant_id` varchar(128) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT '' COMMENT '租户字段',
|
`tenant_id` varchar(128) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT '' COMMENT '租户字段',
|
||||||
|
`encrypted_data_key` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT '加密key',
|
||||||
PRIMARY KEY (`id`) USING BTREE,
|
PRIMARY KEY (`id`) USING BTREE,
|
||||||
UNIQUE INDEX `uk_configinfobeta_datagrouptenant`(`data_id`, `group_id`, `tenant_id`) USING BTREE
|
UNIQUE INDEX `uk_configinfobeta_datagrouptenant`(`data_id`, `group_id`, `tenant_id`) USING BTREE
|
||||||
) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_bin COMMENT = 'config_info_beta' ROW_FORMAT = DYNAMIC;
|
) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_bin COMMENT = 'config_info_beta' ROW_FORMAT = DYNAMIC;
|
||||||
@ -115,6 +125,7 @@ CREATE TABLE `config_info_tag` (
|
|||||||
`gmt_modified` datetime NOT NULL DEFAULT '2010-05-05 00:00:00' COMMENT '修改时间',
|
`gmt_modified` datetime NOT NULL DEFAULT '2010-05-05 00:00:00' COMMENT '修改时间',
|
||||||
`src_user` text CHARACTER SET utf8 COLLATE utf8_bin NULL COMMENT 'source user',
|
`src_user` text CHARACTER SET utf8 COLLATE utf8_bin NULL COMMENT 'source user',
|
||||||
`src_ip` varchar(20) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT 'source ip',
|
`src_ip` varchar(20) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT 'source ip',
|
||||||
|
`encrypted_data_key` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT '加密key',
|
||||||
PRIMARY KEY (`id`) USING BTREE,
|
PRIMARY KEY (`id`) USING BTREE,
|
||||||
UNIQUE INDEX `uk_configinfotag_datagrouptenanttag`(`data_id`, `group_id`, `tenant_id`, `tag_id`) USING BTREE
|
UNIQUE INDEX `uk_configinfotag_datagrouptenanttag`(`data_id`, `group_id`, `tenant_id`, `tag_id`) USING BTREE
|
||||||
) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_bin COMMENT = 'config_info_tag' ROW_FORMAT = DYNAMIC;
|
) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_bin COMMENT = 'config_info_tag' ROW_FORMAT = DYNAMIC;
|
||||||
@ -185,36 +196,44 @@ CREATE TABLE `his_config_info` (
|
|||||||
`src_ip` varchar(20) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
|
`src_ip` varchar(20) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
|
||||||
`op_type` char(10) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
|
`op_type` char(10) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
|
||||||
`tenant_id` varchar(128) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT '' COMMENT '租户字段',
|
`tenant_id` varchar(128) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT '' COMMENT '租户字段',
|
||||||
|
`encrypted_data_key` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT '加密key',
|
||||||
PRIMARY KEY (`nid`) USING BTREE,
|
PRIMARY KEY (`nid`) USING BTREE,
|
||||||
INDEX `idx_gmt_create`(`gmt_create`) USING BTREE,
|
INDEX `idx_gmt_create`(`gmt_create`) USING BTREE,
|
||||||
INDEX `idx_gmt_modified`(`gmt_modified`) USING BTREE,
|
INDEX `idx_gmt_modified`(`gmt_modified`) USING BTREE,
|
||||||
INDEX `idx_did`(`data_id`) USING BTREE
|
INDEX `idx_did`(`data_id`) USING BTREE
|
||||||
) ENGINE = InnoDB AUTO_INCREMENT = 91 CHARACTER SET = utf8 COLLATE = utf8_bin COMMENT = '多租户改造' ROW_FORMAT = DYNAMIC;
|
) ENGINE = InnoDB AUTO_INCREMENT = 34 CHARACTER SET = utf8 COLLATE = utf8_bin COMMENT = '多租户改造' ROW_FORMAT = DYNAMIC;
|
||||||
|
|
||||||
-- ----------------------------
|
-- ----------------------------
|
||||||
-- Records of his_config_info
|
-- Records of his_config_info
|
||||||
-- ----------------------------
|
-- ----------------------------
|
||||||
INSERT INTO `his_config_info` VALUES (20, 70, 'jeecg-gateway-dev.yaml', 'DEFAULT_GROUP', '', 'jeecg:\n route:\n config:\n #mode: database、nacos、yml\n data-type: database\n #nacos: jeecg-gateway-router.json\n group: DEFAULT_GROUP\n data-id: jeecg-gateway-router\nspring:\n redis:\n database: 0\n host: jeecg-boot-redis\n port: 6379\n password:', '26fff601e10bbc8bc5ff1fa2b192087b', '2010-05-05 00:00:00', '2022-08-05 10:45:21', 'nacos', '0:0:0:0:0:0:0:1', 'U', '');
|
INSERT INTO `his_config_info` VALUES (1, 6, 'jeecg-dev.yaml', 'DEFAULT_GROUP', '', 'spring:\n datasource:\n druid:\n stat-view-servlet:\n enabled: true\n loginUsername: admin\n loginPassword: 123456\n allow:\n web-stat-filter:\n enabled: true\n dynamic:\n druid:\n initial-size: 5\n min-idle: 5\n maxActive: 20\n maxWait: 60000\n timeBetweenEvictionRunsMillis: 60000\n minEvictableIdleTimeMillis: 300000\n validationQuery: SELECT 1 FROM DUAL\n testWhileIdle: true\n testOnBorrow: false\n testOnReturn: false\n poolPreparedStatements: true\n maxPoolPreparedStatementPerConnectionSize: 20\n filters: stat,wall,slf4j\n connectionProperties: druid.stat.mergeSql\\=true;druid.stat.slowSqlMillis\\=5000\n datasource:\n master:\n url: jdbc:mysql://jeecg-boot-mysql:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai\n username: root\n password: root\n driver-class-name: com.mysql.cj.jdbc.Driver\n redis:\n database: 0\n host: jeecg-boot-redis\n password:\n port: 6379\n rabbitmq:\n host: jeecg-boot-rabbitmq\n username: guest\n password: guest\n port: 5672\n publisher-confirms: true\n publisher-returns: true\n virtual-host: /\n listener:\n simple:\n acknowledge-mode: manual\n concurrency: 1\n max-concurrency: 1\n retry:\n enabled: true\nminidao:\n base-package: org.jeecg.modules.jmreport.*,org.jeecg.modules.drag.*\njeecg:\n signatureSecret: dd05f1c54d63749eda95f9fa6d49v442a\n signUrls: /sys/dict/getDictItems/*,/sys/dict/loadDict/*,/sys/dict/loadDictOrderByValue/*,/sys/dict/loadDictItem/*,/sys/dict/loadTreeData,/sys/api/queryTableDictItemsByCode,/sys/api/queryFilterTableDictInfo,/sys/api/queryTableDictByKeys,/sys/api/translateDictFromTable,/sys/api/translateDictFromTableByKeys\n uploadType: local\n domainUrl:\n pc: http://localhost:3100\n app: http://localhost:8051\n path:\n upload: /opt/upFiles\n webapp: /opt/webapp\n shiro:\n excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**\n oss:\n endpoint: oss-cn-beijing.aliyuncs.com\n accessKey: ??\n secretKey: ??\n bucketName: jeecgdev\n staticDomain: ??\n elasticsearch:\n cluster-name: jeecg-ES\n cluster-nodes: jeecg-boot-es:9200\n check-enabled: false\n file-view-domain: 127.0.0.1:8012\n minio:\n minio_url: http://minio.jeecg.com\n minio_name: ??\n minio_pass: ??\n bucketName: otatest\n jmreport:\n mode: dev\n is_verify_token: false\n verify_methods: remove,delete,save,add,update\n wps:\n domain: https://wwo.wps.cn/office/\n appid: ??\n appsecret: ??\n xxljob:\n enabled: true\n adminAddresses: http://jeecg-boot-xxljob:9080/xxl-job-admin\n appname: ${spring.application.name}\n accessToken: \'\'\n logPath: logs/jeecg/job/jobhandler/\n logRetentionDays: 30\n redisson:\n address: jeecg-boot-redis:6379\n password:\n type: STANDALONE\n enabled: true\nlogging:\n level:\n org.jeecg.modules.system.mapper : info\ncas:\n prefixUrl: http://localhost:8888/cas\nknife4j:\n production: false\n basic:\n enable: false\n username: jeecg\n password: jeecg1314\njustauth:\n enabled: true\n type:\n GITHUB:\n client-id: ??\n client-secret: ??\n redirect-uri: http://sso.test.com:8080/jeecg-boot/thirdLogin/github/callback\n WECHAT_ENTERPRISE:\n client-id: ??\n client-secret: ??\n redirect-uri: http://sso.test.com:8080/jeecg-boot/thirdLogin/wechat_enterprise/callback\n agent-id: ??\n DINGTALK:\n client-id: ??\n client-secret: ??\n redirect-uri: http://sso.test.com:8080/jeecg-boot/thirdLogin/dingtalk/callback\n cache:\n type: default\n prefix: \'demo::\'\n timeout: 1h\nthird-app:\n enabled: false\n type:\n WECHAT_ENTERPRISE:\n enabled: false\n client-id: ??\n client-secret: ??\n agent-id: ??\n DINGTALK:\n enabled: false\n client-id: ??\n client-secret: ??\n agent-id: ??', '6c0ec1ace75d0341a1f83978c864c0b3', '2010-05-05 00:00:00', '2023-07-14 10:42:27', NULL, '192.168.1.129', 'U', '', '');
|
||||||
INSERT INTO `his_config_info` VALUES (1, 71, 'jeecg-dev.yaml', 'DEFAULT_GROUP', '', 'spring:\n datasource:\n druid:\n stat-view-servlet:\n enabled: true\n loginUsername: admin\n loginPassword: 123456\n allow:\n web-stat-filter:\n enabled: true\n dynamic:\n druid:\n initial-size: 5\n min-idle: 5\n maxActive: 20\n maxWait: 60000\n timeBetweenEvictionRunsMillis: 60000\n minEvictableIdleTimeMillis: 300000\n validationQuery: SELECT 1 FROM DUAL\n testWhileIdle: true\n testOnBorrow: false\n testOnReturn: false\n poolPreparedStatements: true\n maxPoolPreparedStatementPerConnectionSize: 20\n filters: stat,wall,slf4j\n connectionProperties: druid.stat.mergeSql\\=true;druid.stat.slowSqlMillis\\=5000\n\n datasource:\n master:\n url: jdbc:mysql://jeecg-boot-mysql:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai\n username: root\n password: root\n driver-class-name: com.mysql.cj.jdbc.Driver\n redis:\n database: 0\n host: jeecg-boot-redis\n password:\n port: 6379\n rabbitmq:\n host: jeecg-boot-rabbitmq\n username: guest\n password: guest\n port: 5672\n publisher-confirms: true\n publisher-returns: true\n virtual-host: /\n listener:\n simple:\n acknowledge-mode: manual\n concurrency: 1\n max-concurrency: 1\n retry:\n enabled: true\nminidao :\n base-package: org.jeecg.modules.jmreport.*,org.jeecg.modules.drag.*\njeecg :\n signatureSecret: dd05f1c54d63749eda95f9fa6d49v442a\n signUrls: /sys/dict/getDictItems/*,/sys/dict/loadDict/*,/sys/dict/loadDictOrderByValue/*,/sys/dict/loadDictItem/*,/sys/dict/loadTreeData,/sys/api/queryTableDictItemsByCode,/sys/api/queryFilterTableDictInfo,/sys/api/queryTableDictByKeys,/sys/api/translateDictFromTable,/sys/api/translateDictFromTableByKeys\n uploadType: local\n domainUrl:\n pc: http://localhost:3100\n app: http://localhost:8051\n path :\n upload: /opt/upFiles\n webapp: /opt/webapp\n shiro:\n excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**\n oss:\n endpoint: oss-cn-beijing.aliyuncs.com\n accessKey: ??\n secretKey: ??\n bucketName: jeecgdev\n staticDomain: ??\n elasticsearch:\n cluster-name: jeecg-ES\n cluster-nodes: 127.0.0.1:9200\n check-enabled: false\n desform:\n theme-color: \"#1890ff\"\n upload-type: system\n map:\n baidu: ??\n file-view-domain: 127.0.0.1:8012\n minio:\n minio_url: http://minio.jeecg.com\n minio_name: ??\n minio_pass: ??\n bucketName: otatest\n jmreport:\n mode: dev\n is_verify_token: false\n verify_methods: remove,delete,save,add,update\n wps:\n domain: https://wwo.wps.cn/office/\n appid: ??\n appsecret: ??\n xxljob:\n enabled: false\n adminAddresses: http://jeecg-boot-xxljob:9080/xxl-job-admin\n appname: ${spring.application.name}\n accessToken: \'\'\n logPath: logs/jeecg/job/jobhandler/\n logRetentionDays: 30\n redisson:\n address: jeecg-boot-redis:6379\n password:\n type: STANDALONE\n enabled: true\nlogging:\n level:\n org.jeecg.modules.system.mapper : info\ncas:\n prefixUrl: http://localhost:8888/cas\nknife4j:\n production: false\n basic:\n enable: false\n username: jeecg\n password: jeecg1314\n\njustauth:\n enabled: true\n type:\n GITHUB:\n client-id: ??\n client-secret: ??\n redirect-uri: http://sso.test.com:8080/jeecg-boot/thirdLogin/github/callback\n WECHAT_ENTERPRISE:\n client-id: ??\n client-secret: ??\n redirect-uri: http://sso.test.com:8080/jeecg-boot/thirdLogin/wechat_enterprise/callback\n agent-id: ??\n DINGTALK:\n client-id: ??\n client-secret: ??\n redirect-uri: http://sso.test.com:8080/jeecg-boot/thirdLogin/dingtalk/callback\n cache:\n type: default\n prefix: \'demo::\'\n timeout: 1h\nthird-app:\n enabled: false\n type:\n WECHAT_ENTERPRISE:\n enabled: false\n client-id: ??\n client-secret: ??\n agent-id: ??\n # agent-app-secret: ??\n DINGTALK:\n enabled: false\n client-id: ??\n client-secret: ??\n agent-id: ??', '17b0553ae2ade6474301e3d4eca6f05e', '2010-05-05 00:00:00', '2022-08-05 10:54:54', 'nacos', '0:0:0:0:0:0:0:1', 'U', '');
|
INSERT INTO `his_config_info` VALUES (1, 7, 'jeecg-dev.yaml', 'DEFAULT_GROUP', '', 'spring:\n datasource:\n druid:\n stat-view-servlet:\n enabled: true\n loginUsername: admin\n loginPassword: 123456\n allow:\n web-stat-filter:\n enabled: true\n dynamic:\n druid:\n initial-size: 5\n min-idle: 5\n maxActive: 20\n maxWait: 60000\n timeBetweenEvictionRunsMillis: 60000\n minEvictableIdleTimeMillis: 300000\n validationQuery: SELECT 1 FROM DUAL\n testWhileIdle: true\n testOnBorrow: false\n testOnReturn: false\n poolPreparedStatements: true\n maxPoolPreparedStatementPerConnectionSize: 20\n filters: stat,wall,slf4j\n connectionProperties: druid.stat.mergeSql\\=true;druid.stat.slowSqlMillis\\=5000\n datasource:\n master:\n url: jdbc:mysql://jeecg-boot-mysql:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai\n username: root\n password: root\n driver-class-name: com.mysql.cj.jdbc.Driver\n redis:\n database: 0\n host: jeecg-boot-redis\n password:\n port: 6379\n rabbitmq:\n host: jeecg-boot-rabbitmq\n username: guest\n password: guest\n port: 5672\n publisher-confirms: true\n publisher-returns: true\n virtual-host: /\n listener:\n simple:\n acknowledge-mode: manual\n concurrency: 1\n max-concurrency: 1\n retry:\n enabled: true\nminidao:\n base-package: org.jeecg.modules.jmreport.*,org.jeecg.modules.drag.*\njeecg:\n signatureSecret: dd05f1c54d63749eda95f9fa6d49v442a\n signUrls: /sys/dict/getDictItems/*,/sys/dict/loadDict/*,/sys/dict/loadDictOrderByValue/*,/sys/dict/loadDictItem/*,/sys/dict/loadTreeData,/sys/api/queryTableDictItemsByCode,/sys/api/queryFilterTableDictInfo,/sys/api/queryTableDictByKeys,/sys/api/translateDictFromTable,/sys/api/translateDictFromTableByKeys\n uploadType: local\n domainUrl:\n pc: http://localhost:3100\n app: http://localhost:8051\n path:\n upload: /opt/upFiles\n webapp: /opt/webapp\n shiro:\n excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**\n oss:\n endpoint: oss-cn-beijing.aliyuncs.com\n accessKey: ??\n secretKey: ??\n bucketName: jeecgdev\n staticDomain: ??\n elasticsearch:\n cluster-name: jeecg-ES\n cluster-nodes: jeecg-boot-es:9200\n check-enabled: false\n file-view-domain: 127.0.0.1:8012\n minio:\n minio_url: http://minio.jeecg.com\n minio_name: ??\n minio_pass: ??\n bucketName: otatest\n jmreport:\n mode: dev\n is_verify_token: false\n verify_methods: remove,delete,save,add,update\n wps:\n domain: https://wwo.wps.cn/office/\n appid: ??\n appsecret: ??\n xxljob:\n enabled: true\n adminAddresses: http://jeecg-boot-xxljob:9080/xxl-job-admin\n appname: ${spring.application.name}\n accessToken: \'\'\n logPath: logs/jeecg/job/jobhandler/\n logRetentionDays: 30\n redisson:\n address: jeecg-boot-redis:6379\n password:\n type: STANDALONE\n enabled: true\nlogging:\n level:\n org.jeecg.modules.system.mapper : info\ncas:\n prefixUrl: http://localhost:8888/cas\nknife4j:\n production: false\n basic:\n enable: false\n username: jeecg\n password: jeecg1314\njustauth:\n enabled: true\n type:\n GITHUB:\n client-id: ??\n client-secret: ??\n redirect-uri: http://sso.test.com:8080/jeecg-boot/thirdLogin/github/callback\n WECHAT_ENTERPRISE:\n client-id: ??\n client-secret: ??\n redirect-uri: http://sso.test.com:8080/jeecg-boot/thirdLogin/wechat_enterprise/callback\n agent-id: ??\n DINGTALK:\n client-id: ??\n client-secret: ??\n redirect-uri: http://sso.test.com:8080/jeecg-boot/thirdLogin/dingtalk/callback\n cache:\n type: default\n prefix: \'demo::\'\n timeout: 1h\nthird-app:\n enabled: false\n type:\n WECHAT_ENTERPRISE:\n enabled: false\n client-id: ??\n client-secret: ??\n agent-id: ??\n DINGTALK:\n enabled: false\n client-id: ??\n client-secret: ??\n agent-id: ??', '6c0ec1ace75d0341a1f83978c864c0b3', '2010-05-05 00:00:00', '2023-07-14 10:42:39', NULL, '192.168.1.129', 'U', '', '');
|
||||||
INSERT INTO `his_config_info` VALUES (1, 72, 'jeecg-dev.yaml', 'DEFAULT_GROUP', '', 'spring:\n datasource:\n druid:\n stat-view-servlet:\n enabled: true\n loginUsername: admin\n loginPassword: 123456\n allow:\n web-stat-filter:\n enabled: true\n dynamic:\n druid:\n initial-size: 5\n min-idle: 5\n maxActive: 20\n maxWait: 60000\n timeBetweenEvictionRunsMillis: 60000\n minEvictableIdleTimeMillis: 300000\n validationQuery: SELECT 1 FROM DUAL\n testWhileIdle: true\n testOnBorrow: false\n testOnReturn: false\n poolPreparedStatements: true\n maxPoolPreparedStatementPerConnectionSize: 20\n filters: stat,wall,slf4j\n connectionProperties: druid.stat.mergeSql\\=true;druid.stat.slowSqlMillis\\=5000\n datasource:\n master:\n url: jdbc:mysql://jeecg-boot-mysql:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai\n username: root\n password: root\n driver-class-name: com.mysql.cj.jdbc.Driver\n redis:\n database: 0\n host: jeecg-boot-redis\n password:\n port: 6379\n rabbitmq:\n host: jeecg-boot-rabbitmq\n username: guest\n password: guest\n port: 5672\n publisher-confirms: true\n publisher-returns: true\n virtual-host: /\n listener:\n simple:\n acknowledge-mode: manual\n concurrency: 1\n max-concurrency: 1\n retry:\n enabled: true\nminidao:\n base-package: org.jeecg.modules.jmreport.*,org.jeecg.modules.drag.*\njeecg:\n signatureSecret: dd05f1c54d63749eda95f9fa6d49v442a\n signUrls: /sys/dict/getDictItems/*,/sys/dict/loadDict/*,/sys/dict/loadDictOrderByValue/*,/sys/dict/loadDictItem/*,/sys/dict/loadTreeData,/sys/api/queryTableDictItemsByCode,/sys/api/queryFilterTableDictInfo,/sys/api/queryTableDictByKeys,/sys/api/translateDictFromTable,/sys/api/translateDictFromTableByKeys\n uploadType: local\n domainUrl:\n pc: http://localhost:3100\n app: http://localhost:8051\n path:\n upload: /opt/upFiles\n webapp: /opt/webapp\n shiro:\n excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**\n oss:\n endpoint: oss-cn-beijing.aliyuncs.com\n accessKey: ??\n secretKey: ??\n bucketName: jeecgdev\n staticDomain: ??\n elasticsearch:\n cluster-name: jeecg-ES\n cluster-nodes: 127.0.0.1:9200\n check-enabled: false\n desform:\n theme-color: \'#1890ff\'\n upload-type: system\n map:\n baidu: ??\n file-view-domain: 127.0.0.1:8012\n minio:\n minio_url: http://minio.jeecg.com\n minio_name: ??\n minio_pass: ??\n bucketName: otatest\n jmreport:\n mode: dev\n is_verify_token: false\n verify_methods: remove,delete,save,add,update\n wps:\n domain: https://wwo.wps.cn/office/\n appid: ??\n appsecret: ??\n xxljob:\n enabled: false\n adminAddresses: http://jeecg-boot-xxljob:9080/xxl-job-admin\n appname: ${spring.application.name}\n accessToken: \'\'\n logPath: logs/jeecg/job/jobhandler/\n logRetentionDays: 30\n redisson:\n address: jeecg-boot-redis:6379\n password:\n type: STANDALONE\n enabled: true\nlogging:\n level:\n org.jeecg.modules.system.mapper : info\ncas:\n prefixUrl: http://localhost:8888/cas\nknife4j:\n production: false\n basic:\n enable: false\n username: jeecg\n password: jeecg1314\njustauth:\n enabled: true\n type:\n GITHUB:\n client-id: ??\n client-secret: ??\n redirect-uri: http://sso.test.com:8080/jeecg-boot/thirdLogin/github/callback\n WECHAT_ENTERPRISE:\n client-id: ??\n client-secret: ??\n redirect-uri: http://sso.test.com:8080/jeecg-boot/thirdLogin/wechat_enterprise/callback\n agent-id: ??\n DINGTALK:\n client-id: ??\n client-secret: ??\n redirect-uri: http://sso.test.com:8080/jeecg-boot/thirdLogin/dingtalk/callback\n cache:\n type: default\n prefix: \'demo::\'\n timeout: 1h\nthird-app:\n enabled: false\n type:\n WECHAT_ENTERPRISE:\n enabled: false\n client-id: ??\n client-secret: ??\n agent-id: ??\n DINGTALK:\n enabled: false\n client-id: ??\n client-secret: ??\n agent-id: ??', '70922f6374bf2e4ccf0de8c089445811', '2010-05-05 00:00:00', '2022-08-05 10:57:40', 'nacos', '0:0:0:0:0:0:0:1', 'U', '');
|
INSERT INTO `his_config_info` VALUES (1, 8, 'jeecg-dev.yaml', 'DEFAULT_GROUP', '', 'spring:\n datasource:\n druid:\n stat-view-servlet:\n enabled: true\n loginUsername: admin\n loginPassword: 123456\n allow:\n web-stat-filter:\n enabled: true\n dynamic:\n druid:\n initial-size: 5\n min-idle: 5\n maxActive: 20\n maxWait: 60000\n timeBetweenEvictionRunsMillis: 60000\n minEvictableIdleTimeMillis: 300000\n validationQuery: SELECT 1 FROM DUAL\n testWhileIdle: true\n testOnBorrow: false\n testOnReturn: false\n poolPreparedStatements: true\n maxPoolPreparedStatementPerConnectionSize: 20\n filters: stat,wall,slf4j\n connectionProperties: druid.stat.mergeSql\\=true;druid.stat.slowSqlMillis\\=5000\n datasource:\n master:\n url: jdbc:mysql://jeecg-boot-mysql:3306/jeecg-boot1?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai\n username: root\n password: root\n driver-class-name: com.mysql.cj.jdbc.Driver\n redis:\n database: 0\n host: jeecg-boot-redis\n password:\n port: 6379\n rabbitmq:\n host: jeecg-boot-rabbitmq\n username: guest\n password: guest\n port: 5672\n publisher-confirms: true\n publisher-returns: true\n virtual-host: /\n listener:\n simple:\n acknowledge-mode: manual\n concurrency: 1\n max-concurrency: 1\n retry:\n enabled: true\nminidao:\n base-package: org.jeecg.modules.jmreport.*,org.jeecg.modules.drag.*\njeecg:\n signatureSecret: dd05f1c54d63749eda95f9fa6d49v442a\n signUrls: /sys/dict/getDictItems/*,/sys/dict/loadDict/*,/sys/dict/loadDictOrderByValue/*,/sys/dict/loadDictItem/*,/sys/dict/loadTreeData,/sys/api/queryTableDictItemsByCode,/sys/api/queryFilterTableDictInfo,/sys/api/queryTableDictByKeys,/sys/api/translateDictFromTable,/sys/api/translateDictFromTableByKeys\n uploadType: local\n domainUrl:\n pc: http://localhost:3100\n app: http://localhost:8051\n path:\n upload: /opt/upFiles\n webapp: /opt/webapp\n shiro:\n excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**\n oss:\n endpoint: oss-cn-beijing.aliyuncs.com\n accessKey: ??\n secretKey: ??\n bucketName: jeecgdev\n staticDomain: ??\n elasticsearch:\n cluster-name: jeecg-ES\n cluster-nodes: jeecg-boot-es:9200\n check-enabled: false\n file-view-domain: 127.0.0.1:8012\n minio:\n minio_url: http://minio.jeecg.com\n minio_name: ??\n minio_pass: ??\n bucketName: otatest\n jmreport:\n mode: dev\n is_verify_token: false\n verify_methods: remove,delete,save,add,update\n wps:\n domain: https://wwo.wps.cn/office/\n appid: ??\n appsecret: ??\n xxljob:\n enabled: true\n adminAddresses: http://jeecg-boot-xxljob:9080/xxl-job-admin\n appname: ${spring.application.name}\n accessToken: \'\'\n logPath: logs/jeecg/job/jobhandler/\n logRetentionDays: 30\n redisson:\n address: jeecg-boot-redis:6379\n password:\n type: STANDALONE\n enabled: true\nlogging:\n level:\n org.jeecg.modules.system.mapper : info\ncas:\n prefixUrl: http://localhost:8888/cas\nknife4j:\n production: false\n basic:\n enable: false\n username: jeecg\n password: jeecg1314\njustauth:\n enabled: true\n type:\n GITHUB:\n client-id: ??\n client-secret: ??\n redirect-uri: http://sso.test.com:8080/jeecg-boot/thirdLogin/github/callback\n WECHAT_ENTERPRISE:\n client-id: ??\n client-secret: ??\n redirect-uri: http://sso.test.com:8080/jeecg-boot/thirdLogin/wechat_enterprise/callback\n agent-id: ??\n DINGTALK:\n client-id: ??\n client-secret: ??\n redirect-uri: http://sso.test.com:8080/jeecg-boot/thirdLogin/dingtalk/callback\n cache:\n type: default\n prefix: \'demo::\'\n timeout: 1h\nthird-app:\n enabled: false\n type:\n WECHAT_ENTERPRISE:\n enabled: false\n client-id: ??\n client-secret: ??\n agent-id: ??\n DINGTALK:\n enabled: false\n client-id: ??\n client-secret: ??\n agent-id: ??', 'fea50747d3417741908a32f02f10e304', '2010-05-05 00:00:00', '2023-07-14 10:43:33', NULL, '192.168.1.129', 'U', '', '');
|
||||||
INSERT INTO `his_config_info` VALUES (1, 73, 'jeecg-dev.yaml', 'DEFAULT_GROUP', '', 'spring:\n datasource:\n druid:\n stat-view-servlet:\n enabled: true\n loginUsername: admin\n loginPassword: 123456\n allow:\n web-stat-filter:\n enabled: true\n dynamic:\n druid:\n initial-size: 5\n min-idle: 5\n maxActive: 20\n maxWait: 60000\n timeBetweenEvictionRunsMillis: 60000\n minEvictableIdleTimeMillis: 300000\n validationQuery: SELECT 1 FROM DUAL\n testWhileIdle: true\n testOnBorrow: false\n testOnReturn: false\n poolPreparedStatements: true\n maxPoolPreparedStatementPerConnectionSize: 20\n filters: stat,wall,slf4j\n connectionProperties: druid.stat.mergeSql\\=true;druid.stat.slowSqlMillis\\=5000\n datasource:\n master:\n url: jdbc:mysql://jeecg-boot-mysql:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai\n username: root\n password: root\n driver-class-name: com.mysql.cj.jdbc.Driver\n redis:\n database: 0\n host: jeecg-boot-redis\n password:\n port: 6379\n rabbitmq:\n host: jeecg-boot-rabbitmq\n username: guest\n password: guest\n port: 5672\n publisher-confirms: true\n publisher-returns: true\n virtual-host: /\n listener:\n simple:\n acknowledge-mode: manual\n concurrency: 1\n max-concurrency: 1\n retry:\n enabled: true\nminidao:\n base-package: org.jeecg.modules.jmreport.*,org.jeecg.modules.drag.*\njeecg:\n signatureSecret: dd05f1c54d63749eda95f9fa6d49v442a\n signUrls: /sys/dict/getDictItems/*,/sys/dict/loadDict/*,/sys/dict/loadDictOrderByValue/*,/sys/dict/loadDictItem/*,/sys/dict/loadTreeData,/sys/api/queryTableDictItemsByCode,/sys/api/queryFilterTableDictInfo,/sys/api/queryTableDictByKeys,/sys/api/translateDictFromTable,/sys/api/translateDictFromTableByKeys\n uploadType: local\n domainUrl:\n pc: http://localhost:3100\n app: http://localhost:8051\n path:\n upload: /opt/upFiles\n webapp: /opt/webapp\n shiro:\n excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**\n oss:\n endpoint: oss-cn-beijing.aliyuncs.com\n accessKey: ??\n secretKey: ??\n bucketName: jeecgdev\n staticDomain: ??\n elasticsearch:\n cluster-name: jeecg-ES\n cluster-nodes: jeecg-boot-es:9200\n check-enabled: false\n desform:\n theme-color: \'#1890ff\'\n upload-type: system\n map:\n baidu: ??\n file-view-domain: 127.0.0.1:8012\n minio:\n minio_url: http://minio.jeecg.com\n minio_name: ??\n minio_pass: ??\n bucketName: otatest\n jmreport:\n mode: dev\n is_verify_token: false\n verify_methods: remove,delete,save,add,update\n wps:\n domain: https://wwo.wps.cn/office/\n appid: ??\n appsecret: ??\n xxljob:\n enabled: false\n adminAddresses: http://jeecg-boot-xxljob:9080/xxl-job-admin\n appname: ${spring.application.name}\n accessToken: \'\'\n logPath: logs/jeecg/job/jobhandler/\n logRetentionDays: 30\n redisson:\n address: jeecg-boot-redis:6379\n password:\n type: STANDALONE\n enabled: true\nlogging:\n level:\n org.jeecg.modules.system.mapper : info\ncas:\n prefixUrl: http://localhost:8888/cas\nknife4j:\n production: false\n basic:\n enable: false\n username: jeecg\n password: jeecg1314\njustauth:\n enabled: true\n type:\n GITHUB:\n client-id: ??\n client-secret: ??\n redirect-uri: http://sso.test.com:8080/jeecg-boot/thirdLogin/github/callback\n WECHAT_ENTERPRISE:\n client-id: ??\n client-secret: ??\n redirect-uri: http://sso.test.com:8080/jeecg-boot/thirdLogin/wechat_enterprise/callback\n agent-id: ??\n DINGTALK:\n client-id: ??\n client-secret: ??\n redirect-uri: http://sso.test.com:8080/jeecg-boot/thirdLogin/dingtalk/callback\n cache:\n type: default\n prefix: \'demo::\'\n timeout: 1h\nthird-app:\n enabled: false\n type:\n WECHAT_ENTERPRISE:\n enabled: false\n client-id: ??\n client-secret: ??\n agent-id: ??\n DINGTALK:\n enabled: false\n client-id: ??\n client-secret: ??\n agent-id: ??', '035fff10fc0e5a38abf3c357afff7c67', '2010-05-05 00:00:00', '2022-08-05 10:59:02', 'nacos', '0:0:0:0:0:0:0:1', 'U', '');
|
INSERT INTO `his_config_info` VALUES (0, 9, 'jeecg-dev.yaml', 'JEECGDEV_GROUP', '', 'spring:\n datasource:\n druid:\n stat-view-servlet:\n enabled: true\n loginUsername: admin\n loginPassword: 123456\n allow:\n web-stat-filter:\n enabled: true\n dynamic:\n druid:\n initial-size: 5\n min-idle: 5\n maxActive: 20\n maxWait: 60000\n timeBetweenEvictionRunsMillis: 60000\n minEvictableIdleTimeMillis: 300000\n validationQuery: SELECT 1 FROM DUAL\n testWhileIdle: true\n testOnBorrow: false\n testOnReturn: false\n poolPreparedStatements: true\n maxPoolPreparedStatementPerConnectionSize: 20\n filters: stat,wall,slf4j\n connectionProperties: druid.stat.mergeSql\\=true;druid.stat.slowSqlMillis\\=5000\n datasource:\n master:\n url: jdbc:mysql://jeecg-boot-mysql:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai\n username: root\n password: root\n driver-class-name: com.mysql.cj.jdbc.Driver\n redis:\n database: 0\n host: jeecg-boot-redis\n password:\n port: 6379\n rabbitmq:\n host: jeecg-boot-rabbitmq\n username: guest\n password: guest\n port: 5672\n publisher-confirms: true\n publisher-returns: true\n virtual-host: /\n listener:\n simple:\n acknowledge-mode: manual\n concurrency: 1\n max-concurrency: 1\n retry:\n enabled: true\nminidao:\n base-package: org.jeecg.modules.jmreport.*,org.jeecg.modules.drag.*\njeecg:\n signatureSecret: dd05f1c54d63749eda95f9fa6d49v442a\n signUrls: /sys/dict/getDictItems/*,/sys/dict/loadDict/*,/sys/dict/loadDictOrderByValue/*,/sys/dict/loadDictItem/*,/sys/dict/loadTreeData,/sys/api/queryTableDictItemsByCode,/sys/api/queryFilterTableDictInfo,/sys/api/queryTableDictByKeys,/sys/api/translateDictFromTable,/sys/api/translateDictFromTableByKeys\n uploadType: local\n domainUrl:\n pc: http://localhost:3100\n app: http://localhost:8051\n path:\n upload: /opt/upFiles\n webapp: /opt/webapp\n shiro:\n excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**\n oss:\n endpoint: oss-cn-beijing.aliyuncs.com\n accessKey: ??\n secretKey: ??\n bucketName: jeecgdev\n staticDomain: ??\n elasticsearch:\n cluster-name: jeecg-ES\n cluster-nodes: jeecg-boot-es:9200\n check-enabled: false\n file-view-domain: 127.0.0.1:8012\n minio:\n minio_url: http://minio.jeecg.com\n minio_name: ??\n minio_pass: ??\n bucketName: otatest\n jmreport:\n mode: dev\n is_verify_token: false\n verify_methods: remove,delete,save,add,update\n wps:\n domain: https://wwo.wps.cn/office/\n appid: ??\n appsecret: ??\n xxljob:\n enabled: true\n adminAddresses: http://jeecg-boot-xxljob:9080/xxl-job-admin\n appname: ${spring.application.name}\n accessToken: \'\'\n logPath: logs/jeecg/job/jobhandler/\n logRetentionDays: 30\n redisson:\n address: jeecg-boot-redis:6379\n password:\n type: STANDALONE\n enabled: true\nlogging:\n level:\n org.jeecg.modules.system.mapper : info\ncas:\n prefixUrl: http://localhost:8888/cas\nknife4j:\n production: false\n basic:\n enable: false\n username: jeecg\n password: jeecg1314\njustauth:\n enabled: true\n type:\n GITHUB:\n client-id: ??\n client-secret: ??\n redirect-uri: http://sso.test.com:8080/jeecg-boot/thirdLogin/github/callback\n WECHAT_ENTERPRISE:\n client-id: ??\n client-secret: ??\n redirect-uri: http://sso.test.com:8080/jeecg-boot/thirdLogin/wechat_enterprise/callback\n agent-id: ??\n DINGTALK:\n client-id: ??\n client-secret: ??\n redirect-uri: http://sso.test.com:8080/jeecg-boot/thirdLogin/dingtalk/callback\n cache:\n type: default\n prefix: \'demo::\'\n timeout: 1h\nthird-app:\n enabled: false\n type:\n WECHAT_ENTERPRISE:\n enabled: false\n client-id: ??\n client-secret: ??\n agent-id: ??\n DINGTALK:\n enabled: false\n client-id: ??\n client-secret: ??\n agent-id: ??', '6c0ec1ace75d0341a1f83978c864c0b3', '2010-05-05 00:00:00', '2023-07-17 09:50:49', NULL, '0:0:0:0:0:0:0:1', 'I', '', '');
|
||||||
INSERT INTO `his_config_info` VALUES (1, 74, 'jeecg-dev.yaml', 'DEFAULT_GROUP', '', 'spring:\n datasource:\n druid:\n stat-view-servlet:\n enabled: true\n loginUsername: admin\n loginPassword: 123456\n allow:\n web-stat-filter:\n enabled: true\n dynamic:\n druid:\n initial-size: 5\n min-idle: 5\n maxActive: 20\n maxWait: 60000\n timeBetweenEvictionRunsMillis: 60000\n minEvictableIdleTimeMillis: 300000\n validationQuery: SELECT 1 FROM DUAL\n testWhileIdle: true\n testOnBorrow: false\n testOnReturn: false\n poolPreparedStatements: true\n maxPoolPreparedStatementPerConnectionSize: 20\n filters: stat,wall,slf4j\n connectionProperties: druid.stat.mergeSql\\=true;druid.stat.slowSqlMillis\\=5000\n datasource:\n master:\n url: jdbc:mysql://jeecg-boot-mysql:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai\n username: root\n password: root\n driver-class-name: com.mysql.cj.jdbc.Driver\n redis:\n database: 0\n host: jeecg-boot-redis\n password:\n port: 6379\n rabbitmq:\n host: jeecg-boot-rabbitmq\n username: guest\n password: guest\n port: 5672\n publisher-confirms: true\n publisher-returns: true\n virtual-host: /\n listener:\n simple:\n acknowledge-mode: manual\n concurrency: 1\n max-concurrency: 1\n retry:\n enabled: true\nminidao:\n base-package: org.jeecg.modules.jmreport.*,org.jeecg.modules.drag.*\njeecg:\n signatureSecret: dd05f1c54d63749eda95f9fa6d49v442a\n signUrls: /sys/dict/getDictItems/*,/sys/dict/loadDict/*,/sys/dict/loadDictOrderByValue/*,/sys/dict/loadDictItem/*,/sys/dict/loadTreeData,/sys/api/queryTableDictItemsByCode,/sys/api/queryFilterTableDictInfo,/sys/api/queryTableDictByKeys,/sys/api/translateDictFromTable,/sys/api/translateDictFromTableByKeys\n uploadType: local\n domainUrl:\n pc: http://localhost:3100\n app: http://localhost:8051\n path:\n upload: /opt/upFiles\n webapp: /opt/webapp\n shiro:\n excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**\n oss:\n endpoint: oss-cn-beijing.aliyuncs.com\n accessKey: ??\n secretKey: ??\n bucketName: jeecgdev\n staticDomain: ??\n elasticsearch:\n cluster-name: jeecg-ES\n cluster-nodes: jeecg-boot-es:9200\n check-enabled: false\n desform:\n theme-color: \"#1890ff\"\n upload-type: system\n map:\n baidu: ??\n file-view-domain: 127.0.0.1:8012\n minio:\n minio_url: http://minio.jeecg.com\n minio_name: ??\n minio_pass: ??\n bucketName: otatest\n jmreport:\n mode: dev\n is_verify_token: false\n verify_methods: remove,delete,save,add,update\n wps:\n domain: https://wwo.wps.cn/office/\n appid: ??\n appsecret: ??\n xxljob:\n enabled: false\n adminAddresses: http://jeecg-boot-xxljob:9080/xxl-job-admin\n appname: ${spring.application.name}\n accessToken: \'\'\n logPath: logs/jeecg/job/jobhandler/\n logRetentionDays: 30\n redisson:\n address: jeecg-boot-redis:6379\n password:\n type: STANDALONE\n enabled: true\nlogging:\n level:\n org.jeecg.modules.system.mapper : info\ncas:\n prefixUrl: http://localhost:8888/cas\nknife4j:\n production: false\n basic:\n enable: false\n username: jeecg\n password: jeecg1314\njustauth:\n enabled: true\n type:\n GITHUB:\n client-id: ??\n client-secret: ??\n redirect-uri: http://sso.test.com:8080/jeecg-boot/thirdLogin/github/callback\n WECHAT_ENTERPRISE:\n client-id: ??\n client-secret: ??\n redirect-uri: http://sso.test.com:8080/jeecg-boot/thirdLogin/wechat_enterprise/callback\n agent-id: ??\n DINGTALK:\n client-id: ??\n client-secret: ??\n redirect-uri: http://sso.test.com:8080/jeecg-boot/thirdLogin/dingtalk/callback\n cache:\n type: default\n prefix: \'demo::\'\n timeout: 1h\nthird-app:\n enabled: false\n type:\n WECHAT_ENTERPRISE:\n enabled: false\n client-id: ??\n client-secret: ??\n agent-id: ??\n DINGTALK:\n enabled: false\n client-id: ??\n client-secret: ??\n agent-id: ??', '87ec968621f8ac532e2fc50f98dd4f57', '2010-05-05 00:00:00', '2022-08-05 11:00:08', 'nacos', '0:0:0:0:0:0:0:1', 'U', '');
|
INSERT INTO `his_config_info` VALUES (0, 10, 'jeecg.yaml', 'JEECGDEV_GROUP', '', 'server:\n tomcat:\n max-swallow-size: -1\n error:\n include-exception: true\n include-stacktrace: ALWAYS\n include-message: ALWAYS\n compression:\n enabled: true\n min-response-size: 1024\n mime-types: application/javascript,application/json,application/xml,text/html,text/xml,text/plain,text/css,image/*\nmanagement:\n health:\n mail:\n enabled: false\n endpoints:\n web:\n exposure:\n include: \"*\"\n health:\n sensitive: true\n endpoint:\n health:\n show-details: ALWAYS\nspring:\n servlet:\n multipart:\n max-file-size: 10MB\n max-request-size: 10MB\n mail:\n host: smtp.163.com\n username: jeecgos@163.com\n password: ??\n properties:\n mail:\n smtp:\n auth: true\n starttls:\n enable: true\n required: true\n quartz:\n job-store-type: jdbc\n initialize-schema: embedded\n auto-startup: false\n startup-delay: 1s\n overwrite-existing-jobs: true\n properties:\n org:\n quartz:\n scheduler:\n instanceName: MyScheduler\n instanceId: AUTO\n jobStore:\n class: org.springframework.scheduling.quartz.LocalDataSourceJobStore\n driverDelegateClass: org.quartz.impl.jdbcjobstore.StdJDBCDelegate\n tablePrefix: QRTZ_\n isClustered: true\n misfireThreshold: 12000\n clusterCheckinInterval: 15000\n threadPool:\n class: org.quartz.simpl.SimpleThreadPool\n threadCount: 10\n threadPriority: 5\n threadsInheritContextClassLoaderOfInitializingThread: true\n jackson:\n date-format: yyyy-MM-dd HH:mm:ss\n time-zone: GMT+8\n aop:\n proxy-target-class: true\n activiti:\n check-process-definitions: false\n async-executor-activate: false\n job-executor-activate: false\n jpa:\n open-in-view: false\n freemarker:\n suffix: .ftl\n content-type: text/html\n charset: UTF-8\n cache: false\n prefer-file-system-access: false\n template-loader-path:\n - classpath:/templates\n mvc:\n static-path-pattern: /**\n pathmatch:\n matching-strategy: ant_path_matcher\n resource:\n static-locations: classpath:/static/,classpath:/public/\n autoconfigure:\n exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure\nmybatis-plus:\n mapper-locations: classpath*:org/jeecg/modules/**/xml/*Mapper.xml\n global-config:\n banner: false\n db-config:\n id-type: ASSIGN_ID\n table-underline: true\n configuration:\n call-setters-on-nulls: true', '2117a96ba08e8fd0f66825e87416af27', '2010-05-05 00:00:00', '2023-07-17 09:50:49', NULL, '0:0:0:0:0:0:0:1', 'I', '', '');
|
||||||
INSERT INTO `his_config_info` VALUES (1, 75, 'jeecg-dev.yaml', 'DEFAULT_GROUP', '', 'spring:\n datasource:\n druid:\n stat-view-servlet:\n enabled: true\n loginUsername: admin\n loginPassword: 123456\n allow:\n web-stat-filter:\n enabled: true\n dynamic:\n druid:\n initial-size: 5\n min-idle: 5\n maxActive: 20\n maxWait: 60000\n timeBetweenEvictionRunsMillis: 60000\n minEvictableIdleTimeMillis: 300000\n validationQuery: SELECT 1 FROM DUAL\n testWhileIdle: true\n testOnBorrow: false\n testOnReturn: false\n poolPreparedStatements: true\n maxPoolPreparedStatementPerConnectionSize: 20\n filters: stat,wall,slf4j\n connectionProperties: druid.stat.mergeSql\\=true;druid.stat.slowSqlMillis\\=5000\n datasource:\n master:\n url: jdbc:mysql://jeecg-boot-mysql:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai\n username: root\n password: root\n driver-class-name: com.mysql.cj.jdbc.Driver\n redis:\n database: 0\n host: jeecg-boot-redis\n password:\n port: 6379\n rabbitmq:\n host: jeecg-boot-rabbitmq\n username: guest\n password: guest\n port: 5672\n publisher-confirms: true\n publisher-returns: true\n virtual-host: /\n listener:\n simple:\n acknowledge-mode: manual\n concurrency: 1\n max-concurrency: 1\n retry:\n enabled: true\nminidao:\n base-package: org.jeecg.modules.jmreport.*,org.jeecg.modules.drag.*\njeecg:\n signatureSecret: dd05f1c54d63749eda95f9fa6d49v442a\n signUrls: /sys/dict/getDictItems/*,/sys/dict/loadDict/*,/sys/dict/loadDictOrderByValue/*,/sys/dict/loadDictItem/*,/sys/dict/loadTreeData,/sys/api/queryTableDictItemsByCode,/sys/api/queryFilterTableDictInfo,/sys/api/queryTableDictByKeys,/sys/api/translateDictFromTable,/sys/api/translateDictFromTableByKeys\n uploadType: local\n domainUrl:\n pc: http://localhost:3100\n app: http://localhost:8051\n path:\n upload: /opt/upFiles\n webapp: /opt/webapp\n shiro:\n excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**\n oss:\n endpoint: oss-cn-beijing.aliyuncs.com\n accessKey: ??\n secretKey: ??\n bucketName: jeecgdev\n staticDomain: ??\n elasticsearch:\n cluster-name: jeecg-ES\n cluster-nodes: jeecg-boot-es:9200\n check-enabled: false\n file-view-domain: 127.0.0.1:8012\n minio:\n minio_url: http://minio.jeecg.com\n minio_name: ??\n minio_pass: ??\n bucketName: otatest\n jmreport:\n mode: dev\n is_verify_token: false\n verify_methods: remove,delete,save,add,update\n wps:\n domain: https://wwo.wps.cn/office/\n appid: ??\n appsecret: ??\n xxljob:\n enabled: false\n adminAddresses: http://jeecg-boot-xxljob:9080/xxl-job-admin\n appname: ${spring.application.name}\n accessToken: \'\'\n logPath: logs/jeecg/job/jobhandler/\n logRetentionDays: 30\n redisson:\n address: jeecg-boot-redis:6379\n password:\n type: STANDALONE\n enabled: true\nlogging:\n level:\n org.jeecg.modules.system.mapper : info\ncas:\n prefixUrl: http://localhost:8888/cas\nknife4j:\n production: false\n basic:\n enable: false\n username: jeecg\n password: jeecg1314\njustauth:\n enabled: true\n type:\n GITHUB:\n client-id: ??\n client-secret: ??\n redirect-uri: http://sso.test.com:8080/jeecg-boot/thirdLogin/github/callback\n WECHAT_ENTERPRISE:\n client-id: ??\n client-secret: ??\n redirect-uri: http://sso.test.com:8080/jeecg-boot/thirdLogin/wechat_enterprise/callback\n agent-id: ??\n DINGTALK:\n client-id: ??\n client-secret: ??\n redirect-uri: http://sso.test.com:8080/jeecg-boot/thirdLogin/dingtalk/callback\n cache:\n type: default\n prefix: \'demo::\'\n timeout: 1h\nthird-app:\n enabled: false\n type:\n WECHAT_ENTERPRISE:\n enabled: false\n client-id: ??\n client-secret: ??\n agent-id: ??\n DINGTALK:\n enabled: false\n client-id: ??\n client-secret: ??\n agent-id: ??', 'edb0e79d570edf341755caf3853f11e4', '2010-05-05 00:00:00', '2022-08-05 11:01:10', 'nacos', '0:0:0:0:0:0:0:1', 'U', '');
|
INSERT INTO `his_config_info` VALUES (0, 11, 'jeecg-gateway-router.json', 'JEECGDEV_GROUP', '', '[{\n \"id\": \"jeecg-system\",\n \"order\": 0,\n \"predicates\": [{\n \"name\": \"Path\",\n \"args\": {\n \"_genkey_0\": \"/sys/**\",\n \"_genkey_1\": \"/jmreport/**\",\n \"_genkey_3\": \"/online/**\",\n \"_genkey_4\": \"/generic/**\"\n }\n }],\n \"filters\": [],\n \"uri\": \"lb://jeecg-system\"\n}, {\n \"id\": \"jeecg-demo\",\n \"order\": 1,\n \"predicates\": [{\n \"name\": \"Path\",\n \"args\": {\n \"_genkey_0\": \"/mock/**\",\n \"_genkey_1\": \"/test/**\",\n \"_genkey_2\": \"/bigscreen/template1/**\",\n \"_genkey_3\": \"/bigscreen/template2/**\"\n }\n }],\n \"filters\": [],\n \"uri\": \"lb://jeecg-demo\"\n}, {\n \"id\": \"jeecg-system-websocket\",\n \"order\": 2,\n \"predicates\": [{\n \"name\": \"Path\",\n \"args\": {\n \"_genkey_0\": \"/websocket/**\",\n \"_genkey_1\": \"/newsWebsocket/**\"\n }\n }],\n \"filters\": [],\n \"uri\": \"lb:ws://jeecg-system\"\n}, {\n \"id\": \"jeecg-demo-websocket\",\n \"order\": 3,\n \"predicates\": [{\n \"name\": \"Path\",\n \"args\": {\n \"_genkey_0\": \"/vxeSocket/**\"\n }\n }],\n \"filters\": [],\n \"uri\": \"lb:ws://jeecg-demo\"\n}]', 'be6548051d99309d7fa5ac4398404201', '2010-05-05 00:00:00', '2023-07-17 09:50:49', NULL, '0:0:0:0:0:0:0:1', 'I', '', '');
|
||||||
INSERT INTO `his_config_info` VALUES (1, 76, 'jeecg-dev.yaml', 'DEFAULT_GROUP', '', 'spring:\n datasource:\n druid:\n stat-view-servlet:\n enabled: true\n loginUsername: admin\n loginPassword: 123456\n allow:\n web-stat-filter:\n enabled: true\n dynamic:\n druid:\n initial-size: 5\n min-idle: 5\n maxActive: 20\n maxWait: 60000\n timeBetweenEvictionRunsMillis: 60000\n minEvictableIdleTimeMillis: 300000\n validationQuery: SELECT 1 FROM DUAL\n testWhileIdle: true\n testOnBorrow: false\n testOnReturn: false\n poolPreparedStatements: true\n maxPoolPreparedStatementPerConnectionSize: 20\n filters: stat,wall,slf4j\n connectionProperties: druid.stat.mergeSql\\=true;druid.stat.slowSqlMillis\\=5000\n datasource:\n master:\n url: jdbc:mysql://jeecg-boot-mysql:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai\n username: root\n password: root\n driver-class-name: com.mysql.cj.jdbc.Driver\n redis:\n database: 0\n host: jeecg-boot-redis\n password:\n port: 6379\n rabbitmq:\n host: jeecg-boot-rabbitmq\n username: guest\n password: guest\n port: 5672\n publisher-confirms: true\n publisher-returns: true\n virtual-host: /\n listener:\n simple:\n acknowledge-mode: manual\n concurrency: 1\n max-concurrency: 1\n retry:\n enabled: true\nminidao:\n base-package: org.jeecg.modules.jmreport.*,org.jeecg.modules.drag.*\njeecg:\n signatureSecret: dd05f1c54d63749eda95f9fa6d49v442a\n signUrls: /sys/dict/getDictItems/*,/sys/dict/loadDict/*,/sys/dict/loadDictOrderByValue/*,/sys/dict/loadDictItem/*,/sys/dict/loadTreeData,/sys/api/queryTableDictItemsByCode,/sys/api/queryFilterTableDictInfo,/sys/api/queryTableDictByKeys,/sys/api/translateDictFromTable,/sys/api/translateDictFromTableByKeys\n uploadType: local\n domainUrl:\n pc: http://localhost:3100\n app: http://localhost:8051\n path:\n upload: /opt/upFiles\n webapp: /opt/webapp\n shiro:\n excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**\n desform:\n theme-color: \"#1890ff\"\n upload-type: system\n map:\n baidu: ??\n oss:\n endpoint: oss-cn-beijing.aliyuncs.com\n accessKey: ??\n secretKey: ??\n bucketName: jeecgdev\n staticDomain: ??\n elasticsearch:\n cluster-name: jeecg-ES\n cluster-nodes: jeecg-boot-es:9200\n check-enabled: false\n file-view-domain: 127.0.0.1:8012\n minio:\n minio_url: http://minio.jeecg.com\n minio_name: ??\n minio_pass: ??\n bucketName: otatest\n jmreport:\n mode: dev\n is_verify_token: false\n verify_methods: remove,delete,save,add,update\n wps:\n domain: https://wwo.wps.cn/office/\n appid: ??\n appsecret: ??\n xxljob:\n enabled: false\n adminAddresses: http://jeecg-boot-xxljob:9080/xxl-job-admin\n appname: ${spring.application.name}\n accessToken: \'\'\n logPath: logs/jeecg/job/jobhandler/\n logRetentionDays: 30\n redisson:\n address: jeecg-boot-redis:6379\n password:\n type: STANDALONE\n enabled: true\nlogging:\n level:\n org.jeecg.modules.system.mapper : info\ncas:\n prefixUrl: http://localhost:8888/cas\nknife4j:\n production: false\n basic:\n enable: false\n username: jeecg\n password: jeecg1314\njustauth:\n enabled: true\n type:\n GITHUB:\n client-id: ??\n client-secret: ??\n redirect-uri: http://sso.test.com:8080/jeecg-boot/thirdLogin/github/callback\n WECHAT_ENTERPRISE:\n client-id: ??\n client-secret: ??\n redirect-uri: http://sso.test.com:8080/jeecg-boot/thirdLogin/wechat_enterprise/callback\n agent-id: ??\n DINGTALK:\n client-id: ??\n client-secret: ??\n redirect-uri: http://sso.test.com:8080/jeecg-boot/thirdLogin/dingtalk/callback\n cache:\n type: default\n prefix: \'demo::\'\n timeout: 1h\nthird-app:\n enabled: false\n type:\n WECHAT_ENTERPRISE:\n enabled: false\n client-id: ??\n client-secret: ??\n agent-id: ??\n DINGTALK:\n enabled: false\n client-id: ??\n client-secret: ??\n agent-id: ??', '53b1c1130dff673311ad863b4ce67c8e', '2010-05-05 00:00:00', '2022-08-05 11:02:49', 'nacos', '0:0:0:0:0:0:0:1', 'U', '');
|
INSERT INTO `his_config_info` VALUES (0, 12, 'jeecg-sharding.yaml', 'JEECGDEV_GROUP', '', 'spring:\n shardingsphere:\n datasource:\n names: ds0\n ds0:\n driverClassName: com.mysql.cj.jdbc.Driver\n url: jdbc:mysql://jeecg-boot-mysql:3306/jeecg-boot?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai\n username: root\n password: root\n type: com.alibaba.druid.pool.DruidDataSource\n props:\n sql-show: true\n rules:\n sharding:\n binding-tables: sys_log\n key-generators:\n snowflake:\n type: SNOWFLAKE\n props:\n worker-id: 123\n sharding-algorithms:\n table-classbased:\n props:\n strategy: standard\n algorithmClassName: org.jeecg.modules.test.sharding.algorithm.StandardModTableShardAlgorithm\n type: CLASS_BASED\n tables:\n sys_log:\n actual-data-nodes: ds0.sys_log$->{0..1}\n table-strategy:\n standard:\n sharding-algorithm-name: table-classbased\n sharding-column: log_type', 'a93fa455c32cd37ca84631d2bbe13005', '2010-05-05 00:00:00', '2023-07-17 09:50:49', NULL, '0:0:0:0:0:0:0:1', 'I', '', '');
|
||||||
INSERT INTO `his_config_info` VALUES (1, 77, 'jeecg-dev.yaml', 'DEFAULT_GROUP', '', 'spring:\n datasource:\n druid:\n stat-view-servlet:\n enabled: true\n loginUsername: admin\n loginPassword: 123456\n allow:\n web-stat-filter:\n enabled: true\n dynamic:\n druid:\n initial-size: 5\n min-idle: 5\n maxActive: 20\n maxWait: 60000\n timeBetweenEvictionRunsMillis: 60000\n minEvictableIdleTimeMillis: 300000\n validationQuery: SELECT 1 FROM DUAL\n testWhileIdle: true\n testOnBorrow: false\n testOnReturn: false\n poolPreparedStatements: true\n maxPoolPreparedStatementPerConnectionSize: 20\n filters: stat,wall,slf4j\n connectionProperties: druid.stat.mergeSql\\=true;druid.stat.slowSqlMillis\\=5000\n datasource:\n master:\n url: jdbc:mysql://jeecg-boot-mysql:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai\n username: root\n password: root\n driver-class-name: com.mysql.cj.jdbc.Driver\n redis:\n database: 0\n host: jeecg-boot-redis\n password:\n port: 6379\n rabbitmq:\n host: jeecg-boot-rabbitmq\n username: guest\n password: guest\n port: 5672\n publisher-confirms: true\n publisher-returns: true\n virtual-host: /\n listener:\n simple:\n acknowledge-mode: manual\n concurrency: 1\n max-concurrency: 1\n retry:\n enabled: true\nminidao:\n base-package: org.jeecg.modules.jmreport.*,org.jeecg.modules.drag.*\njeecg:\n signatureSecret: dd05f1c54d63749eda95f9fa6d49v442a\n uploadType: local\n domainUrl:\n pc: http://localhost:3100\n app: http://localhost:8051\n path:\n upload: /opt/upFiles\n webapp: /opt/webapp\n shiro:\n excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**\n desform:\n theme-color: \"#1890ff\"\n upload-type: system\n map:\n baidu: ??\n oss:\n endpoint: oss-cn-beijing.aliyuncs.com\n accessKey: ??\n secretKey: ??\n bucketName: jeecgdev\n staticDomain: ??\n elasticsearch:\n cluster-name: jeecg-ES\n cluster-nodes: jeecg-boot-es:9200\n check-enabled: false\n file-view-domain: 127.0.0.1:8012\n minio:\n minio_url: http://minio.jeecg.com\n minio_name: ??\n minio_pass: ??\n bucketName: otatest\n jmreport:\n mode: dev\n is_verify_token: false\n verify_methods: remove,delete,save,add,update\n wps:\n domain: https://wwo.wps.cn/office/\n appid: ??\n appsecret: ??\n xxljob:\n enabled: false\n adminAddresses: http://jeecg-boot-xxljob:9080/xxl-job-admin\n appname: ${spring.application.name}\n accessToken: \'\'\n logPath: logs/jeecg/job/jobhandler/\n logRetentionDays: 30\n redisson:\n address: jeecg-boot-redis:6379\n password:\n type: STANDALONE\n enabled: true\nlogging:\n level:\n org.jeecg.modules.system.mapper : info\ncas:\n prefixUrl: http://localhost:8888/cas\nknife4j:\n production: false\n basic:\n enable: false\n username: jeecg\n password: jeecg1314\njustauth:\n enabled: true\n type:\n GITHUB:\n client-id: ??\n client-secret: ??\n redirect-uri: http://sso.test.com:8080/jeecg-boot/thirdLogin/github/callback\n WECHAT_ENTERPRISE:\n client-id: ??\n client-secret: ??\n redirect-uri: http://sso.test.com:8080/jeecg-boot/thirdLogin/wechat_enterprise/callback\n agent-id: ??\n DINGTALK:\n client-id: ??\n client-secret: ??\n redirect-uri: http://sso.test.com:8080/jeecg-boot/thirdLogin/dingtalk/callback\n cache:\n type: default\n prefix: \'demo::\'\n timeout: 1h\nthird-app:\n enabled: false\n type:\n WECHAT_ENTERPRISE:\n enabled: false\n client-id: ??\n client-secret: ??\n agent-id: ??\n DINGTALK:\n enabled: false\n client-id: ??\n client-secret: ??\n agent-id: ??', '32d655df70c77beb8e39c5d3d8c69c9c', '2010-05-05 00:00:00', '2022-08-05 11:03:31', 'nacos', '0:0:0:0:0:0:0:1', 'U', '');
|
INSERT INTO `his_config_info` VALUES (0, 13, 'jeecg-gateway-dev.yaml', 'JEECGDEV_GROUP', '', 'jeecg:\n route:\n config:\n #type:database nacos yml\n data-type: database\n data-id: jeecg-gateway-router\nspring:\n redis:\n database: 0\n host: jeecg-boot-redis\n port: 6379\n password:', 'd65267ddfda1b0c0f4462606195d1a5a', '2010-05-05 00:00:00', '2023-07-17 09:50:49', NULL, '0:0:0:0:0:0:0:1', 'I', '', '');
|
||||||
INSERT INTO `his_config_info` VALUES (1, 78, 'jeecg-dev.yaml', 'DEFAULT_GROUP', '', 'spring:\n datasource:\n druid:\n stat-view-servlet:\n enabled: true\n loginUsername: admin\n loginPassword: 123456\n allow:\n web-stat-filter:\n enabled: true\n dynamic:\n druid:\n initial-size: 5\n min-idle: 5\n maxActive: 20\n maxWait: 60000\n timeBetweenEvictionRunsMillis: 60000\n minEvictableIdleTimeMillis: 300000\n validationQuery: SELECT 1 FROM DUAL\n testWhileIdle: true\n testOnBorrow: false\n testOnReturn: false\n poolPreparedStatements: true\n maxPoolPreparedStatementPerConnectionSize: 20\n filters: stat,wall,slf4j\n connectionProperties: druid.stat.mergeSql\\=true;druid.stat.slowSqlMillis\\=5000\n datasource:\n master:\n url: jdbc:mysql://jeecg-boot-mysql:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai\n username: root\n password: root\n driver-class-name: com.mysql.cj.jdbc.Driver\n redis:\n database: 0\n host: jeecg-boot-redis\n password:\n port: 6379\n rabbitmq:\n host: jeecg-boot-rabbitmq\n username: guest\n password: guest\n port: 5672\n publisher-confirms: true\n publisher-returns: true\n virtual-host: /\n listener:\n simple:\n acknowledge-mode: manual\n concurrency: 1\n max-concurrency: 1\n retry:\n enabled: true\nminidao:\n base-package: org.jeecg.modules.jmreport.*,org.jeecg.modules.drag.*\njeecg:\n signatureSecret: dd05f1c54d63749eda95f9fa6d49v442a\nsignUrls: /sys/dict/getDictItems/*,/sys/dict/loadDict/*,/sys/dict/loadDictOrderByValue/*,/sys/dict/loadDictItem/*,/sys/dict/loadTreeData,/sys/api/queryTableDictItemsByCode,/sys/api/queryFilterTableDictInfo,/sys/api/queryTableDictByKeys,/sys/api/translateDictFromTable,/sys/api/translateDictFromTableByKeys\n uploadType: local\n domainUrl:\n pc: http://localhost:3100\n app: http://localhost:8051\n path:\n upload: /opt/upFiles\n webapp: /opt/webapp\n shiro:\n excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**\n desform:\n theme-color: \"#1890ff\"\n upload-type: system\n map:\n baidu: ??\n oss:\n endpoint: oss-cn-beijing.aliyuncs.com\n accessKey: ??\n secretKey: ??\n bucketName: jeecgdev\n staticDomain: ??\n elasticsearch:\n cluster-name: jeecg-ES\n cluster-nodes: jeecg-boot-es:9200\n check-enabled: false\n file-view-domain: 127.0.0.1:8012\n minio:\n minio_url: http://minio.jeecg.com\n minio_name: ??\n minio_pass: ??\n bucketName: otatest\n jmreport:\n mode: dev\n is_verify_token: false\n verify_methods: remove,delete,save,add,update\n wps:\n domain: https://wwo.wps.cn/office/\n appid: ??\n appsecret: ??\n xxljob:\n enabled: false\n adminAddresses: http://jeecg-boot-xxljob:9080/xxl-job-admin\n appname: ${spring.application.name}\n accessToken: \'\'\n logPath: logs/jeecg/job/jobhandler/\n logRetentionDays: 30\n redisson:\n address: jeecg-boot-redis:6379\n password:\n type: STANDALONE\n enabled: true\nlogging:\n level:\n org.jeecg.modules.system.mapper : info\ncas:\n prefixUrl: http://localhost:8888/cas\nknife4j:\n production: false\n basic:\n enable: false\n username: jeecg\n password: jeecg1314\njustauth:\n enabled: true\n type:\n GITHUB:\n client-id: ??\n client-secret: ??\n redirect-uri: http://sso.test.com:8080/jeecg-boot/thirdLogin/github/callback\n WECHAT_ENTERPRISE:\n client-id: ??\n client-secret: ??\n redirect-uri: http://sso.test.com:8080/jeecg-boot/thirdLogin/wechat_enterprise/callback\n agent-id: ??\n DINGTALK:\n client-id: ??\n client-secret: ??\n redirect-uri: http://sso.test.com:8080/jeecg-boot/thirdLogin/dingtalk/callback\n cache:\n type: default\n prefix: \'demo::\'\n timeout: 1h\nthird-app:\n enabled: false\n type:\n WECHAT_ENTERPRISE:\n enabled: false\n client-id: ??\n client-secret: ??\n agent-id: ??\n DINGTALK:\n enabled: false\n client-id: ??\n client-secret: ??\n agent-id: ??', 'd3b15d3bb35c4baed32f75eabb2bf864', '2010-05-05 00:00:00', '2022-08-05 11:04:54', 'nacos', '0:0:0:0:0:0:0:1', 'U', '');
|
INSERT INTO `his_config_info` VALUES (0, 14, 'jeecg-sharding-multi.yaml', 'JEECGDEV_GROUP', '', 'spring:\n shardingsphere:\n datasource:\n names: ds0,ds1\n ds0:\n driverClassName: com.mysql.cj.jdbc.Driver\n url: jdbc:mysql://jeecg-boot-mysql:3306/jeecg-boot?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai\n type: com.alibaba.druid.pool.DruidDataSource\n username: root\n password: root\n ds1:\n driverClassName: com.mysql.cj.jdbc.Driver\n url: jdbc:mysql://jeecg-boot-mysql:3306/jeecg-boot2?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai\n type: com.alibaba.druid.pool.DruidDataSource\n username: root\n password: root\n props:\n sql-show: true\n rules:\n replica-query:\n load-balancers:\n round-robin:\n type: ROUND_ROBIN\n props:\n default: 0\n data-sources:\n prds:\n primary-data-source-name: ds0\n replica-data-source-names: ds1\n load-balancer-name: round_robin\n sharding:\n binding-tables:\n - sys_log\n key-generators:\n snowflake:\n type: SNOWFLAKE\n props:\n worker-id: 123\n sharding-algorithms:\n table-classbased:\n props:\n strategy: standard\n algorithmClassName: org.jeecg.modules.test.sharding.algorithm.StandardModTableShardAlgorithm\n type: CLASS_BASED\n database-inline:\n type: INLINE\n props:\n algorithm-expression: ds$->{operate_type % 2}\n tables:\n sys_log:\n actual-data-nodes: ds$->{0..1}.sys_log$->{0..1}\n database-strategy:\n standard:\n sharding-column: operate_type\n sharding-algorithm-name: database-inline\n table-strategy:\n standard:\n sharding-algorithm-name: table-classbased\n sharding-column: log_type', '0fc2b030ca8c0008f148c84ecbd2a8c7', '2010-05-05 00:00:00', '2023-07-17 09:50:49', NULL, '0:0:0:0:0:0:0:1', 'I', '', '');
|
||||||
INSERT INTO `his_config_info` VALUES (1, 79, 'jeecg-dev.yaml', 'DEFAULT_GROUP', '', 'spring:\n datasource:\n druid:\n stat-view-servlet:\n enabled: true\n loginUsername: admin\n loginPassword: 123456\n allow:\n web-stat-filter:\n enabled: true\n dynamic:\n druid:\n initial-size: 5\n min-idle: 5\n maxActive: 20\n maxWait: 60000\n timeBetweenEvictionRunsMillis: 60000\n minEvictableIdleTimeMillis: 300000\n validationQuery: SELECT 1 FROM DUAL\n testWhileIdle: true\n testOnBorrow: false\n testOnReturn: false\n poolPreparedStatements: true\n maxPoolPreparedStatementPerConnectionSize: 20\n filters: stat,wall,slf4j\n connectionProperties: druid.stat.mergeSql\\=true;druid.stat.slowSqlMillis\\=5000\n datasource:\n master:\n url: jdbc:mysql://jeecg-boot-mysql:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai\n username: root\n password: root\n driver-class-name: com.mysql.cj.jdbc.Driver\n redis:\n database: 0\n host: jeecg-boot-redis\n password:\n port: 6379\n rabbitmq:\n host: jeecg-boot-rabbitmq\n username: guest\n password: guest\n port: 5672\n publisher-confirms: true\n publisher-returns: true\n virtual-host: /\n listener:\n simple:\n acknowledge-mode: manual\n concurrency: 1\n max-concurrency: 1\n retry:\n enabled: true\nminidao:\n base-package: org.jeecg.modules.jmreport.*,org.jeecg.modules.drag.*\njeecg:\n signatureSecret: dd05f1c54d63749eda95f9fa6d49v442a\n signUrls: /sys/dict/getDictItems/*,/sys/dict/loadDict/*,/sys/dict/loadDictOrderByValue/*,/sys/dict/loadDictItem/*,/sys/dict/loadTreeData,/sys/api/queryTableDictItemsByCode,/sys/api/queryFilterTableDictInfo,/sys/api/queryTableDictByKeys,/sys/api/translateDictFromTable,/sys/api/translateDictFromTableByKeys\n uploadType: local\n domainUrl:\n pc: http://localhost:3100\n app: http://localhost:8051\n path:\n upload: /opt/upFiles\n webapp: /opt/webapp\n shiro:\n excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**\n desform:\n theme-color: \"#1890ff\"\n upload-type: system\n map:\n baidu: ??\n oss:\n endpoint: oss-cn-beijing.aliyuncs.com\n accessKey: ??\n secretKey: ??\n bucketName: jeecgdev\n staticDomain: ??\n elasticsearch:\n cluster-name: jeecg-ES\n cluster-nodes: jeecg-boot-es:9200\n check-enabled: false\n file-view-domain: 127.0.0.1:8012\n minio:\n minio_url: http://minio.jeecg.com\n minio_name: ??\n minio_pass: ??\n bucketName: otatest\n jmreport:\n mode: dev\n is_verify_token: false\n verify_methods: remove,delete,save,add,update\n wps:\n domain: https://wwo.wps.cn/office/\n appid: ??\n appsecret: ??\n xxljob:\n enabled: false\n adminAddresses: http://jeecg-boot-xxljob:9080/xxl-job-admin\n appname: ${spring.application.name}\n accessToken: \'\'\n logPath: logs/jeecg/job/jobhandler/\n logRetentionDays: 30\n redisson:\n address: jeecg-boot-redis:6379\n password:\n type: STANDALONE\n enabled: true\nlogging:\n level:\n org.jeecg.modules.system.mapper : info\ncas:\n prefixUrl: http://localhost:8888/cas\nknife4j:\n production: false\n basic:\n enable: false\n username: jeecg\n password: jeecg1314\njustauth:\n enabled: true\n type:\n GITHUB:\n client-id: ??\n client-secret: ??\n redirect-uri: http://sso.test.com:8080/jeecg-boot/thirdLogin/github/callback\n WECHAT_ENTERPRISE:\n client-id: ??\n client-secret: ??\n redirect-uri: http://sso.test.com:8080/jeecg-boot/thirdLogin/wechat_enterprise/callback\n agent-id: ??\n DINGTALK:\n client-id: ??\n client-secret: ??\n redirect-uri: http://sso.test.com:8080/jeecg-boot/thirdLogin/dingtalk/callback\n cache:\n type: default\n prefix: \'demo::\'\n timeout: 1h\nthird-app:\n enabled: false\n type:\n WECHAT_ENTERPRISE:\n enabled: false\n client-id: ??\n client-secret: ??\n agent-id: ??\n DINGTALK:\n enabled: false\n client-id: ??\n client-secret: ??\n agent-id: ??', '53b1c1130dff673311ad863b4ce67c8e', '2010-05-05 00:00:00', '2022-08-05 13:02:54', 'nacos', '0:0:0:0:0:0:0:1', 'U', '');
|
INSERT INTO `his_config_info` VALUES (0, 15, 'jeecg-dev.yaml', 'JEECGDEV_GROUP', '', 'spring:\n datasource:\n druid:\n stat-view-servlet:\n enabled: true\n loginUsername: admin\n loginPassword: 123456\n allow:\n web-stat-filter:\n enabled: true\n dynamic:\n druid:\n initial-size: 5\n min-idle: 5\n maxActive: 20\n maxWait: 60000\n timeBetweenEvictionRunsMillis: 60000\n minEvictableIdleTimeMillis: 300000\n validationQuery: SELECT 1 FROM DUAL\n testWhileIdle: true\n testOnBorrow: false\n testOnReturn: false\n poolPreparedStatements: true\n maxPoolPreparedStatementPerConnectionSize: 20\n filters: stat,wall,slf4j\n connectionProperties: druid.stat.mergeSql\\=true;druid.stat.slowSqlMillis\\=5000\n datasource:\n master:\n url: jdbc:mysql://jeecg-boot-mysql:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai\n username: root\n password: root\n driver-class-name: com.mysql.cj.jdbc.Driver\n redis:\n database: 0\n host: jeecg-boot-redis\n password:\n port: 6379\n rabbitmq:\n host: jeecg-boot-rabbitmq\n username: guest\n password: guest\n port: 5672\n publisher-confirms: true\n publisher-returns: true\n virtual-host: /\n listener:\n simple:\n acknowledge-mode: manual\n concurrency: 1\n max-concurrency: 1\n retry:\n enabled: true\nminidao:\n base-package: org.jeecg.modules.jmreport.*,org.jeecg.modules.drag.*\njeecg:\n signatureSecret: dd05f1c54d63749eda95f9fa6d49v442a\n signUrls: /sys/dict/getDictItems/*,/sys/dict/loadDict/*,/sys/dict/loadDictOrderByValue/*,/sys/dict/loadDictItem/*,/sys/dict/loadTreeData,/sys/api/queryTableDictItemsByCode,/sys/api/queryFilterTableDictInfo,/sys/api/queryTableDictByKeys,/sys/api/translateDictFromTable,/sys/api/translateDictFromTableByKeys\n uploadType: local\n domainUrl:\n pc: http://localhost:3100\n app: http://localhost:8051\n path:\n upload: /opt/upFiles\n webapp: /opt/webapp\n shiro:\n excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**\n oss:\n endpoint: oss-cn-beijing.aliyuncs.com\n accessKey: ??\n secretKey: ??\n bucketName: jeecgdev\n staticDomain: ??\n elasticsearch:\n cluster-name: jeecg-ES\n cluster-nodes: jeecg-boot-es:9200\n check-enabled: false\n file-view-domain: 127.0.0.1:8012\n minio:\n minio_url: http://minio.jeecg.com\n minio_name: ??\n minio_pass: ??\n bucketName: otatest\n jmreport:\n mode: dev\n is_verify_token: false\n verify_methods: remove,delete,save,add,update\n wps:\n domain: https://wwo.wps.cn/office/\n appid: ??\n appsecret: ??\n xxljob:\n enabled: true\n adminAddresses: http://jeecg-boot-xxljob:9080/xxl-job-admin\n appname: ${spring.application.name}\n accessToken: \'\'\n logPath: logs/jeecg/job/jobhandler/\n logRetentionDays: 30\n redisson:\n address: jeecg-boot-redis:6379\n password:\n type: STANDALONE\n enabled: true\nlogging:\n level:\n org.jeecg.modules.system.mapper : info\ncas:\n prefixUrl: http://localhost:8888/cas\nknife4j:\n production: false\n basic:\n enable: false\n username: jeecg\n password: jeecg1314\njustauth:\n enabled: true\n type:\n GITHUB:\n client-id: ??\n client-secret: ??\n redirect-uri: http://sso.test.com:8080/jeecg-boot/thirdLogin/github/callback\n WECHAT_ENTERPRISE:\n client-id: ??\n client-secret: ??\n redirect-uri: http://sso.test.com:8080/jeecg-boot/thirdLogin/wechat_enterprise/callback\n agent-id: ??\n DINGTALK:\n client-id: ??\n client-secret: ??\n redirect-uri: http://sso.test.com:8080/jeecg-boot/thirdLogin/dingtalk/callback\n cache:\n type: default\n prefix: \'demo::\'\n timeout: 1h\nthird-app:\n enabled: false\n type:\n WECHAT_ENTERPRISE:\n enabled: false\n client-id: ??\n client-secret: ??\n agent-id: ??\n DINGTALK:\n enabled: false\n client-id: ??\n client-secret: ??\n agent-id: ??', '6c0ec1ace75d0341a1f83978c864c0b3', '2010-05-05 00:00:00', '2023-07-17 10:05:06', NULL, '0:0:0:0:0:0:0:1', 'I', 'ac14ab82-51f8-4f0c-aa5b-25fb8384bfb6', '');
|
||||||
INSERT INTO `his_config_info` VALUES (1, 80, 'jeecg-dev.yaml', 'DEFAULT_GROUP', '', 'spring:\n datasource:\n druid:\n stat-view-servlet:\n enabled: true\n loginUsername: admin\n loginPassword: 123456\n allow:\n web-stat-filter:\n enabled: true\n dynamic:\n druid:\n initial-size: 5\n min-idle: 5\n maxActive: 20\n maxWait: 60000\n timeBetweenEvictionRunsMillis: 60000\n minEvictableIdleTimeMillis: 300000\n validationQuery: SELECT 1 FROM DUAL\n testWhileIdle: true\n testOnBorrow: false\n testOnReturn: false\n poolPreparedStatements: true\n maxPoolPreparedStatementPerConnectionSize: 20\n filters: stat,wall,slf4j\n connectionProperties: druid.stat.mergeSql\\=true;druid.stat.slowSqlMillis\\=5000\n datasource:\n master:\n url: jdbc:mysql://jeecg-boot-mysql:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai\n username: root\n password: root\n driver-class-name: com.mysql.cj.jdbc.Driver\n redis:\n database: 0\n host: jeecg-boot-redis\n password:\n port: 6379\n rabbitmq:\n host: jeecg-boot-rabbitmq\n username: guest\n password: guest\n port: 5672\n publisher-confirms: true\n publisher-returns: true\n virtual-host: /\n listener:\n simple:\n acknowledge-mode: manual\n concurrency: 1\n max-concurrency: 1\n retry:\n enabled: true\nminidao:\n base-package: org.jeecg.modules.jmreport.*,org.jeecg.modules.drag.*\njeecg:\n signatureSecret: dd05f1c54d63749eda95f9fa6d49v442a\n signUrls: /sys/dict/getDictItems/*,/sys/dict/loadDict/*,/sys/dict/loadDictOrderByValue/*,/sys/dict/loadDictItem/*,/sys/dict/loadTreeData,/sys/api/queryTableDictItemsByCode,/sys/api/queryFilterTableDictInfo,/sys/api/queryTableDictByKeys,/sys/api/translateDictFromTable,/sys/api/translateDictFromTableByKeys\n uploadType: local\n domainUrl:\n pc: http://localhost:3100\n app: http://localhost:8051\n path:\n upload: /opt/upFiles\n webapp: /opt/webapp\n shiro:\n excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**\n desform:\n theme-color: \"#1890ff\"\n upload-type: system\n map:\n baidu: ??\n oss:\n endpoint: oss-cn-beijing.aliyuncs.com\n accessKey: ??\n secretKey: ??\n bucketName: jeecgdev\n staticDomain: ??\n elasticsearch:\n cluster-name: jeecg-ES\n cluster-nodes: jeecg-boot-es:9200\n check-enabled: false\n file-view-domain: 127.0.0.1:8012\n minio:\n minio_url: http://minio.jeecg.com\n minio_name: ??\n minio_pass: ??\n bucketName: otatest\n jmreport:\n mode: dev\n is_verify_token: false\n verify_methods: remove,delete,save,add,update\n wps:\n domain: https://wwo.wps.cn/office/\n appid: ??\n appsecret: ??\n xxljob:\n enabled: false\n adminAddresses: http://jeecg-boot-xxljob:9080/xxl-job-admin\n appname: ${spring.application.name}\n accessToken: \'\'\n logPath: logs/jeecg/job/jobhandler/\n logRetentionDays: 30\n redisson:\n address: jeecg-boot-redis:6379\n password:\n type: STANDALONE\n enabled: true', '92ced3a81dece861666606c44cd4f630', '2010-05-05 00:00:00', '2022-08-05 13:03:28', 'nacos', '0:0:0:0:0:0:0:1', 'U', '');
|
INSERT INTO `his_config_info` VALUES (0, 16, 'jeecg.yaml', 'JEECGDEV_GROUP', '', 'server:\n tomcat:\n max-swallow-size: -1\n error:\n include-exception: true\n include-stacktrace: ALWAYS\n include-message: ALWAYS\n compression:\n enabled: true\n min-response-size: 1024\n mime-types: application/javascript,application/json,application/xml,text/html,text/xml,text/plain,text/css,image/*\nmanagement:\n health:\n mail:\n enabled: false\n endpoints:\n web:\n exposure:\n include: \"*\"\n health:\n sensitive: true\n endpoint:\n health:\n show-details: ALWAYS\nspring:\n servlet:\n multipart:\n max-file-size: 10MB\n max-request-size: 10MB\n mail:\n host: smtp.163.com\n username: jeecgos@163.com\n password: ??\n properties:\n mail:\n smtp:\n auth: true\n starttls:\n enable: true\n required: true\n quartz:\n job-store-type: jdbc\n initialize-schema: embedded\n auto-startup: false\n startup-delay: 1s\n overwrite-existing-jobs: true\n properties:\n org:\n quartz:\n scheduler:\n instanceName: MyScheduler\n instanceId: AUTO\n jobStore:\n class: org.springframework.scheduling.quartz.LocalDataSourceJobStore\n driverDelegateClass: org.quartz.impl.jdbcjobstore.StdJDBCDelegate\n tablePrefix: QRTZ_\n isClustered: true\n misfireThreshold: 12000\n clusterCheckinInterval: 15000\n threadPool:\n class: org.quartz.simpl.SimpleThreadPool\n threadCount: 10\n threadPriority: 5\n threadsInheritContextClassLoaderOfInitializingThread: true\n jackson:\n date-format: yyyy-MM-dd HH:mm:ss\n time-zone: GMT+8\n aop:\n proxy-target-class: true\n activiti:\n check-process-definitions: false\n async-executor-activate: false\n job-executor-activate: false\n jpa:\n open-in-view: false\n freemarker:\n suffix: .ftl\n content-type: text/html\n charset: UTF-8\n cache: false\n prefer-file-system-access: false\n template-loader-path:\n - classpath:/templates\n mvc:\n static-path-pattern: /**\n pathmatch:\n matching-strategy: ant_path_matcher\n resource:\n static-locations: classpath:/static/,classpath:/public/\n autoconfigure:\n exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure\nmybatis-plus:\n mapper-locations: classpath*:org/jeecg/modules/**/xml/*Mapper.xml\n global-config:\n banner: false\n db-config:\n id-type: ASSIGN_ID\n table-underline: true\n configuration:\n call-setters-on-nulls: true', '2117a96ba08e8fd0f66825e87416af27', '2010-05-05 00:00:00', '2023-07-17 10:05:06', NULL, '0:0:0:0:0:0:0:1', 'I', 'ac14ab82-51f8-4f0c-aa5b-25fb8384bfb6', '');
|
||||||
INSERT INTO `his_config_info` VALUES (1, 81, 'jeecg-dev.yaml', 'DEFAULT_GROUP', '', 'spring:\n datasource:\n druid:\n stat-view-servlet:\n enabled: true\n loginUsername: admin\n loginPassword: 123456\n allow:\n web-stat-filter:\n enabled: true\n dynamic:\n druid:\n initial-size: 5\n min-idle: 5\n maxActive: 20\n maxWait: 60000\n timeBetweenEvictionRunsMillis: 60000\n minEvictableIdleTimeMillis: 300000\n validationQuery: SELECT 1 FROM DUAL\n testWhileIdle: true\n testOnBorrow: false\n testOnReturn: false\n poolPreparedStatements: true\n maxPoolPreparedStatementPerConnectionSize: 20\n filters: stat,wall,slf4j\n connectionProperties: druid.stat.mergeSql\\=true;druid.stat.slowSqlMillis\\=5000\n datasource:\n master:\n url: jdbc:mysql://jeecg-boot-mysql:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai\n username: root\n password: root\n driver-class-name: com.mysql.cj.jdbc.Driver\n redis:\n database: 0\n host: jeecg-boot-redis\n password:\n port: 6379\n rabbitmq:\n host: jeecg-boot-rabbitmq\n username: guest\n password: guest\n port: 5672\n publisher-confirms: true\n publisher-returns: true\n virtual-host: /\n listener:\n simple:\n acknowledge-mode: manual\n concurrency: 1\n max-concurrency: 1\n retry:\n enabled: true\nminidao:\n base-package: org.jeecg.modules.jmreport.*,org.jeecg.modules.drag.*\njeecg:\n signatureSecret: dd05f1c54d63749eda95f9fa6d49v442a\n signUrls: /sys/dict/getDictItems/*,/sys/dict/loadDict/*,/sys/dict/loadDictOrderByValue/*,/sys/dict/loadDictItem/*,/sys/dict/loadTreeData,/sys/api/queryTableDictItemsByCode,/sys/api/queryFilterTableDictInfo,/sys/api/queryTableDictByKeys,/sys/api/translateDictFromTable,/sys/api/translateDictFromTableByKeys\n uploadType: local\n domainUrl:\n pc: http://localhost:3100\n app: http://localhost:8051\n path:\n upload: /opt/upFiles\n webapp: /opt/webapp', '364814ff81fb2a38c869f7bb5aa92f45', '2010-05-05 00:00:00', '2022-08-05 13:03:55', 'nacos', '0:0:0:0:0:0:0:1', 'U', '');
|
INSERT INTO `his_config_info` VALUES (0, 17, 'jeecg-gateway-router.json', 'JEECGDEV_GROUP', '', '[{\n \"id\": \"jeecg-system\",\n \"order\": 0,\n \"predicates\": [{\n \"name\": \"Path\",\n \"args\": {\n \"_genkey_0\": \"/sys/**\",\n \"_genkey_1\": \"/jmreport/**\",\n \"_genkey_3\": \"/online/**\",\n \"_genkey_4\": \"/generic/**\"\n }\n }],\n \"filters\": [],\n \"uri\": \"lb://jeecg-system\"\n}, {\n \"id\": \"jeecg-demo\",\n \"order\": 1,\n \"predicates\": [{\n \"name\": \"Path\",\n \"args\": {\n \"_genkey_0\": \"/mock/**\",\n \"_genkey_1\": \"/test/**\",\n \"_genkey_2\": \"/bigscreen/template1/**\",\n \"_genkey_3\": \"/bigscreen/template2/**\"\n }\n }],\n \"filters\": [],\n \"uri\": \"lb://jeecg-demo\"\n}, {\n \"id\": \"jeecg-system-websocket\",\n \"order\": 2,\n \"predicates\": [{\n \"name\": \"Path\",\n \"args\": {\n \"_genkey_0\": \"/websocket/**\",\n \"_genkey_1\": \"/newsWebsocket/**\"\n }\n }],\n \"filters\": [],\n \"uri\": \"lb:ws://jeecg-system\"\n}, {\n \"id\": \"jeecg-demo-websocket\",\n \"order\": 3,\n \"predicates\": [{\n \"name\": \"Path\",\n \"args\": {\n \"_genkey_0\": \"/vxeSocket/**\"\n }\n }],\n \"filters\": [],\n \"uri\": \"lb:ws://jeecg-demo\"\n}]', 'be6548051d99309d7fa5ac4398404201', '2010-05-05 00:00:00', '2023-07-17 10:05:06', NULL, '0:0:0:0:0:0:0:1', 'I', 'ac14ab82-51f8-4f0c-aa5b-25fb8384bfb6', '');
|
||||||
INSERT INTO `his_config_info` VALUES (1, 82, 'jeecg-dev.yaml', 'DEFAULT_GROUP', '', 'spring:\n datasource:\n druid:\n stat-view-servlet:\n enabled: true\n loginUsername: admin\n loginPassword: 123456\n allow:\n web-stat-filter:\n enabled: true\n dynamic:\n druid:\n initial-size: 5\n min-idle: 5\n maxActive: 20\n maxWait: 60000\n timeBetweenEvictionRunsMillis: 60000\n minEvictableIdleTimeMillis: 300000\n validationQuery: SELECT 1 FROM DUAL\n testWhileIdle: true\n testOnBorrow: false\n testOnReturn: false\n poolPreparedStatements: true\n maxPoolPreparedStatementPerConnectionSize: 20\n filters: stat,wall,slf4j\n connectionProperties: druid.stat.mergeSql\\=true;druid.stat.slowSqlMillis\\=5000\n datasource:\n master:\n url: jdbc:mysql://jeecg-boot-mysql:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai\n username: root\n password: root\n driver-class-name: com.mysql.cj.jdbc.Driver\n redis:\n database: 0\n host: jeecg-boot-redis\n password:\n port: 6379', '064d0471e33d707a5b70e0807f8f0d93', '2010-05-05 00:00:00', '2022-08-05 13:04:39', 'nacos', '0:0:0:0:0:0:0:1', 'U', '');
|
INSERT INTO `his_config_info` VALUES (0, 18, 'jeecg-sharding.yaml', 'JEECGDEV_GROUP', '', 'spring:\n shardingsphere:\n datasource:\n names: ds0\n ds0:\n driverClassName: com.mysql.cj.jdbc.Driver\n url: jdbc:mysql://jeecg-boot-mysql:3306/jeecg-boot?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai\n username: root\n password: root\n type: com.alibaba.druid.pool.DruidDataSource\n props:\n sql-show: true\n rules:\n sharding:\n binding-tables: sys_log\n key-generators:\n snowflake:\n type: SNOWFLAKE\n props:\n worker-id: 123\n sharding-algorithms:\n table-classbased:\n props:\n strategy: standard\n algorithmClassName: org.jeecg.modules.test.sharding.algorithm.StandardModTableShardAlgorithm\n type: CLASS_BASED\n tables:\n sys_log:\n actual-data-nodes: ds0.sys_log$->{0..1}\n table-strategy:\n standard:\n sharding-algorithm-name: table-classbased\n sharding-column: log_type', 'a93fa455c32cd37ca84631d2bbe13005', '2010-05-05 00:00:00', '2023-07-17 10:05:06', NULL, '0:0:0:0:0:0:0:1', 'I', 'ac14ab82-51f8-4f0c-aa5b-25fb8384bfb6', '');
|
||||||
INSERT INTO `his_config_info` VALUES (2, 83, 'jeecg.yaml', 'DEFAULT_GROUP', '', 'server:\n tomcat:\n max-swallow-size: -1\n error:\n include-exception: true\n include-stacktrace: ALWAYS\n include-message: ALWAYS\n compression:\n enabled: true\n min-response-size: 1024\n mime-types: application/javascript,application/json,application/xml,text/html,text/xml,text/plain,text/css,image/*\nmanagement:\n health:\n mail:\n enabled: false\n endpoints:\n web:\n exposure:\n include: \"*\"\n health:\n sensitive: true\n endpoint:\n health:\n show-details: ALWAYS\nspring:\n servlet:\n multipart:\n max-file-size: 10MB\n max-request-size: 10MB\n mail:\n host: smtp.163.com\n username: jeecgos@163.com\n password: ??\n properties:\n mail:\n smtp:\n auth: true\n starttls:\n enable: true\n required: true\n quartz:\n job-store-type: jdbc\n initialize-schema: embedded\n auto-startup: false\n startup-delay: 1s\n overwrite-existing-jobs: true\n properties:\n org:\n quartz:\n scheduler:\n instanceName: MyScheduler\n instanceId: AUTO\n jobStore:\n class: org.springframework.scheduling.quartz.LocalDataSourceJobStore\n driverDelegateClass: org.quartz.impl.jdbcjobstore.StdJDBCDelegate\n tablePrefix: QRTZ_\n isClustered: true\n misfireThreshold: 12000\n clusterCheckinInterval: 15000\n threadPool:\n class: org.quartz.simpl.SimpleThreadPool\n threadCount: 10\n threadPriority: 5\n threadsInheritContextClassLoaderOfInitializingThread: true\n jackson:\n date-format: yyyy-MM-dd HH:mm:ss\n time-zone: GMT+8\n aop:\n proxy-target-class: true\n activiti:\n check-process-definitions: false\n async-executor-activate: false\n job-executor-activate: false\n jpa:\n open-in-view: false\n freemarker:\n suffix: .ftl\n content-type: text/html\n charset: UTF-8\n cache: false\n prefer-file-system-access: false\n template-loader-path:\n - classpath:/templates\n mvc:\n static-path-pattern: /**\n pathmatch:\n matching-strategy: ant_path_matcher\n resource:\n static-locations: classpath:/static/,classpath:/public/\n autoconfigure:\n exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure\nmybatis-plus:\n mapper-locations: classpath*:org/jeecg/modules/**/xml/*Mapper.xml\n global-config:\n banner: false\n db-config:\n id-type: ASSIGN_ID\n table-underline: true\n configuration:\n call-setters-on-nulls: true', '2117a96ba08e8fd0f66825e87416af27', '2010-05-05 00:00:00', '2022-08-05 13:05:34', 'nacos', '0:0:0:0:0:0:0:1', 'U', '');
|
INSERT INTO `his_config_info` VALUES (0, 19, 'jeecg-gateway-dev.yaml', 'JEECGDEV_GROUP', '', 'jeecg:\n route:\n config:\n #type:database nacos yml\n data-type: database\n data-id: jeecg-gateway-router\nspring:\n redis:\n database: 0\n host: jeecg-boot-redis\n port: 6379\n password:', 'd65267ddfda1b0c0f4462606195d1a5a', '2010-05-05 00:00:00', '2023-07-17 10:05:06', NULL, '0:0:0:0:0:0:0:1', 'I', 'ac14ab82-51f8-4f0c-aa5b-25fb8384bfb6', '');
|
||||||
INSERT INTO `his_config_info` VALUES (1, 84, 'jeecg-dev.yaml', 'DEFAULT_GROUP', '', 'spring:\n datasource:\n dynamic:\n datasource:\n master:\n url: jdbc:mysql://jeecg-boot-mysql:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai\n username: root\n password: root\n driver-class-name: com.mysql.cj.jdbc.Driver\n redis:\n database: 0\n host: jeecg-boot-redis\n password:\n port: 6379', 'a12eaf6e6c090b303590f1e83c22ac3f', '2010-05-05 00:00:00', '2022-08-05 13:07:33', 'nacos', '0:0:0:0:0:0:0:1', 'U', '');
|
INSERT INTO `his_config_info` VALUES (0, 20, 'jeecg-sharding-multi.yaml', 'JEECGDEV_GROUP', '', 'spring:\n shardingsphere:\n datasource:\n names: ds0,ds1\n ds0:\n driverClassName: com.mysql.cj.jdbc.Driver\n url: jdbc:mysql://jeecg-boot-mysql:3306/jeecg-boot?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai\n type: com.alibaba.druid.pool.DruidDataSource\n username: root\n password: root\n ds1:\n driverClassName: com.mysql.cj.jdbc.Driver\n url: jdbc:mysql://jeecg-boot-mysql:3306/jeecg-boot2?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai\n type: com.alibaba.druid.pool.DruidDataSource\n username: root\n password: root\n props:\n sql-show: true\n rules:\n replica-query:\n load-balancers:\n round-robin:\n type: ROUND_ROBIN\n props:\n default: 0\n data-sources:\n prds:\n primary-data-source-name: ds0\n replica-data-source-names: ds1\n load-balancer-name: round_robin\n sharding:\n binding-tables:\n - sys_log\n key-generators:\n snowflake:\n type: SNOWFLAKE\n props:\n worker-id: 123\n sharding-algorithms:\n table-classbased:\n props:\n strategy: standard\n algorithmClassName: org.jeecg.modules.test.sharding.algorithm.StandardModTableShardAlgorithm\n type: CLASS_BASED\n database-inline:\n type: INLINE\n props:\n algorithm-expression: ds$->{operate_type % 2}\n tables:\n sys_log:\n actual-data-nodes: ds$->{0..1}.sys_log$->{0..1}\n database-strategy:\n standard:\n sharding-column: operate_type\n sharding-algorithm-name: database-inline\n table-strategy:\n standard:\n sharding-algorithm-name: table-classbased\n sharding-column: log_type', '0fc2b030ca8c0008f148c84ecbd2a8c7', '2010-05-05 00:00:00', '2023-07-17 10:05:06', NULL, '0:0:0:0:0:0:0:1', 'I', 'ac14ab82-51f8-4f0c-aa5b-25fb8384bfb6', '');
|
||||||
INSERT INTO `his_config_info` VALUES (1, 85, 'jeecg-dev.yaml', 'DEFAULT_GROUP', '', 'spring:\n datasource:\n dynamic:\n datasource:\n master:\n url: jdbc:mysql://jeecg-boot-mysql:3306/jeecg-boot\n username: root\n password: root\n driver-class-name: com.mysql.cj.jdbc.Driver\n redis:\n database: 0\n host: jeecg-boot-redis\n password:\n port: 6379', '5e33b9dc9022eee8a1652e473dadbc42', '2010-05-05 00:00:00', '2022-08-05 13:09:30', 'nacos', '0:0:0:0:0:0:0:1', 'U', '');
|
INSERT INTO `his_config_info` VALUES (23, 21, 'jeecg-dev.yaml', 'JEECGDEV_GROUP', '', 'spring:\n datasource:\n druid:\n stat-view-servlet:\n enabled: true\n loginUsername: admin\n loginPassword: 123456\n allow:\n web-stat-filter:\n enabled: true\n dynamic:\n druid:\n initial-size: 5\n min-idle: 5\n maxActive: 20\n maxWait: 60000\n timeBetweenEvictionRunsMillis: 60000\n minEvictableIdleTimeMillis: 300000\n validationQuery: SELECT 1 FROM DUAL\n testWhileIdle: true\n testOnBorrow: false\n testOnReturn: false\n poolPreparedStatements: true\n maxPoolPreparedStatementPerConnectionSize: 20\n filters: stat,wall,slf4j\n connectionProperties: druid.stat.mergeSql\\=true;druid.stat.slowSqlMillis\\=5000\n datasource:\n master:\n url: jdbc:mysql://jeecg-boot-mysql:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai\n username: root\n password: root\n driver-class-name: com.mysql.cj.jdbc.Driver\n redis:\n database: 0\n host: jeecg-boot-redis\n password:\n port: 6379\n rabbitmq:\n host: jeecg-boot-rabbitmq\n username: guest\n password: guest\n port: 5672\n publisher-confirms: true\n publisher-returns: true\n virtual-host: /\n listener:\n simple:\n acknowledge-mode: manual\n concurrency: 1\n max-concurrency: 1\n retry:\n enabled: true\nminidao:\n base-package: org.jeecg.modules.jmreport.*,org.jeecg.modules.drag.*\njeecg:\n signatureSecret: dd05f1c54d63749eda95f9fa6d49v442a\n signUrls: /sys/dict/getDictItems/*,/sys/dict/loadDict/*,/sys/dict/loadDictOrderByValue/*,/sys/dict/loadDictItem/*,/sys/dict/loadTreeData,/sys/api/queryTableDictItemsByCode,/sys/api/queryFilterTableDictInfo,/sys/api/queryTableDictByKeys,/sys/api/translateDictFromTable,/sys/api/translateDictFromTableByKeys\n uploadType: local\n domainUrl:\n pc: http://localhost:3100\n app: http://localhost:8051\n path:\n upload: /opt/upFiles\n webapp: /opt/webapp\n shiro:\n excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**\n oss:\n endpoint: oss-cn-beijing.aliyuncs.com\n accessKey: ??\n secretKey: ??\n bucketName: jeecgdev\n staticDomain: ??\n elasticsearch:\n cluster-name: jeecg-ES\n cluster-nodes: jeecg-boot-es:9200\n check-enabled: false\n file-view-domain: 127.0.0.1:8012\n minio:\n minio_url: http://minio.jeecg.com\n minio_name: ??\n minio_pass: ??\n bucketName: otatest\n jmreport:\n mode: dev\n is_verify_token: false\n verify_methods: remove,delete,save,add,update\n wps:\n domain: https://wwo.wps.cn/office/\n appid: ??\n appsecret: ??\n xxljob:\n enabled: true\n adminAddresses: http://jeecg-boot-xxljob:9080/xxl-job-admin\n appname: ${spring.application.name}\n accessToken: \'\'\n logPath: logs/jeecg/job/jobhandler/\n logRetentionDays: 30\n redisson:\n address: jeecg-boot-redis:6379\n password:\n type: STANDALONE\n enabled: true\nlogging:\n level:\n org.jeecg.modules.system.mapper : info\ncas:\n prefixUrl: http://localhost:8888/cas\nknife4j:\n production: false\n basic:\n enable: false\n username: jeecg\n password: jeecg1314\njustauth:\n enabled: true\n type:\n GITHUB:\n client-id: ??\n client-secret: ??\n redirect-uri: http://sso.test.com:8080/jeecg-boot/thirdLogin/github/callback\n WECHAT_ENTERPRISE:\n client-id: ??\n client-secret: ??\n redirect-uri: http://sso.test.com:8080/jeecg-boot/thirdLogin/wechat_enterprise/callback\n agent-id: ??\n DINGTALK:\n client-id: ??\n client-secret: ??\n redirect-uri: http://sso.test.com:8080/jeecg-boot/thirdLogin/dingtalk/callback\n cache:\n type: default\n prefix: \'demo::\'\n timeout: 1h\nthird-app:\n enabled: false\n type:\n WECHAT_ENTERPRISE:\n enabled: false\n client-id: ??\n client-secret: ??\n agent-id: ??\n DINGTALK:\n enabled: false\n client-id: ??\n client-secret: ??\n agent-id: ??', '6c0ec1ace75d0341a1f83978c864c0b3', '2010-05-05 00:00:00', '2023-07-17 10:05:38', NULL, '0:0:0:0:0:0:0:1', 'D', '', '');
|
||||||
INSERT INTO `his_config_info` VALUES (2, 86, 'jeecg.yaml', 'DEFAULT_GROUP', '', 'server:\n tomcat:\n max-swallow-size: -1', '4525d8351d9498a8e5f43373ee6367a1', '2010-05-05 00:00:00', '2022-08-05 13:09:55', 'nacos', '0:0:0:0:0:0:0:1', 'U', '');
|
INSERT INTO `his_config_info` VALUES (24, 22, 'jeecg.yaml', 'JEECGDEV_GROUP', '', 'server:\n tomcat:\n max-swallow-size: -1\n error:\n include-exception: true\n include-stacktrace: ALWAYS\n include-message: ALWAYS\n compression:\n enabled: true\n min-response-size: 1024\n mime-types: application/javascript,application/json,application/xml,text/html,text/xml,text/plain,text/css,image/*\nmanagement:\n health:\n mail:\n enabled: false\n endpoints:\n web:\n exposure:\n include: \"*\"\n health:\n sensitive: true\n endpoint:\n health:\n show-details: ALWAYS\nspring:\n servlet:\n multipart:\n max-file-size: 10MB\n max-request-size: 10MB\n mail:\n host: smtp.163.com\n username: jeecgos@163.com\n password: ??\n properties:\n mail:\n smtp:\n auth: true\n starttls:\n enable: true\n required: true\n quartz:\n job-store-type: jdbc\n initialize-schema: embedded\n auto-startup: false\n startup-delay: 1s\n overwrite-existing-jobs: true\n properties:\n org:\n quartz:\n scheduler:\n instanceName: MyScheduler\n instanceId: AUTO\n jobStore:\n class: org.springframework.scheduling.quartz.LocalDataSourceJobStore\n driverDelegateClass: org.quartz.impl.jdbcjobstore.StdJDBCDelegate\n tablePrefix: QRTZ_\n isClustered: true\n misfireThreshold: 12000\n clusterCheckinInterval: 15000\n threadPool:\n class: org.quartz.simpl.SimpleThreadPool\n threadCount: 10\n threadPriority: 5\n threadsInheritContextClassLoaderOfInitializingThread: true\n jackson:\n date-format: yyyy-MM-dd HH:mm:ss\n time-zone: GMT+8\n aop:\n proxy-target-class: true\n activiti:\n check-process-definitions: false\n async-executor-activate: false\n job-executor-activate: false\n jpa:\n open-in-view: false\n freemarker:\n suffix: .ftl\n content-type: text/html\n charset: UTF-8\n cache: false\n prefer-file-system-access: false\n template-loader-path:\n - classpath:/templates\n mvc:\n static-path-pattern: /**\n pathmatch:\n matching-strategy: ant_path_matcher\n resource:\n static-locations: classpath:/static/,classpath:/public/\n autoconfigure:\n exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure\nmybatis-plus:\n mapper-locations: classpath*:org/jeecg/modules/**/xml/*Mapper.xml\n global-config:\n banner: false\n db-config:\n id-type: ASSIGN_ID\n table-underline: true\n configuration:\n call-setters-on-nulls: true', '2117a96ba08e8fd0f66825e87416af27', '2010-05-05 00:00:00', '2023-07-17 10:05:38', NULL, '0:0:0:0:0:0:0:1', 'D', '', '');
|
||||||
INSERT INTO `his_config_info` VALUES (2, 87, 'jeecg.yaml', 'DEFAULT_GROUP', '', 'server:\n tomcat:\n max-swallow-size: -1\n error:\n include-exception: true\n include-stacktrace: ALWAYS\n include-message: ALWAYS\n compression:\n enabled: true\n min-response-size: 1024\n mime-types: application/javascript,application/json,application/xml,text/html,text/xml,text/plain,text/css,image/*\nmanagement:\n health:\n mail:\n enabled: false\n endpoints:\n web:\n exposure:\n include: \"*\"\n health:\n sensitive: true\n endpoint:\n health:\n show-details: ALWAYS\nspring:\n servlet:\n multipart:\n max-file-size: 10MB\n max-request-size: 10MB\n mail:\n host: smtp.163.com\n username: jeecgos@163.com\n password: ??\n properties:\n mail:\n smtp:\n auth: true\n starttls:\n enable: true\n required: true\n quartz:\n job-store-type: jdbc\n initialize-schema: embedded\n auto-startup: false\n startup-delay: 1s\n overwrite-existing-jobs: true\n properties:\n org:\n quartz:\n scheduler:\n instanceName: MyScheduler\n instanceId: AUTO\n jobStore:\n class: org.springframework.scheduling.quartz.LocalDataSourceJobStore\n driverDelegateClass: org.quartz.impl.jdbcjobstore.StdJDBCDelegate\n tablePrefix: QRTZ_\n isClustered: true\n misfireThreshold: 12000\n clusterCheckinInterval: 15000\n threadPool:\n class: org.quartz.simpl.SimpleThreadPool\n threadCount: 10\n threadPriority: 5\n threadsInheritContextClassLoaderOfInitializingThread: true\n jackson:\n date-format: yyyy-MM-dd HH:mm:ss\n time-zone: GMT+8\n aop:\n proxy-target-class: true\n activiti:\n check-process-definitions: false\n async-executor-activate: false\n job-executor-activate: false\n jpa:\n open-in-view: false\n freemarker:\n suffix: .ftl\n content-type: text/html\n charset: UTF-8\n cache: false\n prefer-file-system-access: false\n template-loader-path:\n - classpath:/templates\n mvc:\n static-path-pattern: /**\n pathmatch:\n matching-strategy: ant_path_matcher\n resource:\n static-locations: classpath:/static/,classpath:/public/\n autoconfigure:\n exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure\nmybatis-plus:\n mapper-locations: classpath*:org/jeecg/modules/**/xml/*Mapper.xml\n global-config:\n banner: false\n db-config:\n id-type: ASSIGN_ID\n table-underline: true\n configuration:\n call-setters-on-nulls: true', '2117a96ba08e8fd0f66825e87416af27', '2010-05-05 00:00:00', '2022-08-05 13:10:58', 'nacos', '0:0:0:0:0:0:0:1', 'U', '');
|
INSERT INTO `his_config_info` VALUES (25, 23, 'jeecg-gateway-router.json', 'JEECGDEV_GROUP', '', '[{\n \"id\": \"jeecg-system\",\n \"order\": 0,\n \"predicates\": [{\n \"name\": \"Path\",\n \"args\": {\n \"_genkey_0\": \"/sys/**\",\n \"_genkey_1\": \"/jmreport/**\",\n \"_genkey_3\": \"/online/**\",\n \"_genkey_4\": \"/generic/**\"\n }\n }],\n \"filters\": [],\n \"uri\": \"lb://jeecg-system\"\n}, {\n \"id\": \"jeecg-demo\",\n \"order\": 1,\n \"predicates\": [{\n \"name\": \"Path\",\n \"args\": {\n \"_genkey_0\": \"/mock/**\",\n \"_genkey_1\": \"/test/**\",\n \"_genkey_2\": \"/bigscreen/template1/**\",\n \"_genkey_3\": \"/bigscreen/template2/**\"\n }\n }],\n \"filters\": [],\n \"uri\": \"lb://jeecg-demo\"\n}, {\n \"id\": \"jeecg-system-websocket\",\n \"order\": 2,\n \"predicates\": [{\n \"name\": \"Path\",\n \"args\": {\n \"_genkey_0\": \"/websocket/**\",\n \"_genkey_1\": \"/newsWebsocket/**\"\n }\n }],\n \"filters\": [],\n \"uri\": \"lb:ws://jeecg-system\"\n}, {\n \"id\": \"jeecg-demo-websocket\",\n \"order\": 3,\n \"predicates\": [{\n \"name\": \"Path\",\n \"args\": {\n \"_genkey_0\": \"/vxeSocket/**\"\n }\n }],\n \"filters\": [],\n \"uri\": \"lb:ws://jeecg-demo\"\n}]', 'be6548051d99309d7fa5ac4398404201', '2010-05-05 00:00:00', '2023-07-17 10:05:38', NULL, '0:0:0:0:0:0:0:1', 'D', '', '');
|
||||||
INSERT INTO `his_config_info` VALUES (2, 88, 'jeecg.yaml', 'DEFAULT_GROUP', '', 'server:\n tomcat:\n max-swallow-size: -1\n error:\n include-exception: true\n include-stacktrace: ALWAYS\n include-message: ALWAYS\n compression:\n enabled: true\n min-response-size: 1024\n mime-types: application/javascript,application/json,application/xml,text/html,text/xml,text/plain,text/css,image/*\nmanagement:\n health:\n mail:\n enabled: false\n endpoints:\n web:\n exposure:\n include: \"*\"\n health:\n sensitive: true\n endpoint:\n health:\n show-details: ALWAYS\nspring:\n servlet:\n multipart:\n max-file-size: 10MB\n max-request-size: 10MB\n mail:\n host: smtp.163.com\n username: jeecgos@163.com\n password: ??\n properties:\n mail:\n smtp:\n auth: true\n starttls:\n enable: true\n required: true\n quartz:\n job-store-type: jdbc\n initialize-schema: embedded\n auto-startup: false\n jackson:\n date-format: yyyy-MM-dd HH:mm:ss\n time-zone: GMT+8\n aop:\n proxy-target-class: true\n activiti:\n check-process-definitions: false\n async-executor-activate: false\n job-executor-activate: false\n jpa:\n open-in-view: false\n freemarker:\n suffix: .ftl\n content-type: text/html\n charset: UTF-8\n cache: false\n prefer-file-system-access: false\n template-loader-path:\n - classpath:/templates\n mvc:\n static-path-pattern: /**\n pathmatch:\n matching-strategy: ant_path_matcher\n resource:\n static-locations: classpath:/static/,classpath:/public/\n autoconfigure:\n exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure\nmybatis-plus:\n mapper-locations: classpath*:org/jeecg/modules/**/xml/*Mapper.xml\n global-config:\n banner: false\n db-config:\n id-type: ASSIGN_ID\n table-underline: true\n configuration:\n call-setters-on-nulls: true', 'a1effef2c22a7d2846f84728aa29ecd4', '2010-05-05 00:00:00', '2022-08-05 13:12:21', 'nacos', '0:0:0:0:0:0:0:1', 'U', '');
|
INSERT INTO `his_config_info` VALUES (26, 24, 'jeecg-sharding.yaml', 'JEECGDEV_GROUP', '', 'spring:\n shardingsphere:\n datasource:\n names: ds0\n ds0:\n driverClassName: com.mysql.cj.jdbc.Driver\n url: jdbc:mysql://jeecg-boot-mysql:3306/jeecg-boot?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai\n username: root\n password: root\n type: com.alibaba.druid.pool.DruidDataSource\n props:\n sql-show: true\n rules:\n sharding:\n binding-tables: sys_log\n key-generators:\n snowflake:\n type: SNOWFLAKE\n props:\n worker-id: 123\n sharding-algorithms:\n table-classbased:\n props:\n strategy: standard\n algorithmClassName: org.jeecg.modules.test.sharding.algorithm.StandardModTableShardAlgorithm\n type: CLASS_BASED\n tables:\n sys_log:\n actual-data-nodes: ds0.sys_log$->{0..1}\n table-strategy:\n standard:\n sharding-algorithm-name: table-classbased\n sharding-column: log_type', 'a93fa455c32cd37ca84631d2bbe13005', '2010-05-05 00:00:00', '2023-07-17 10:05:38', NULL, '0:0:0:0:0:0:0:1', 'D', '', '');
|
||||||
INSERT INTO `his_config_info` VALUES (1, 89, 'jeecg-dev.yaml', 'DEFAULT_GROUP', '', 'spring:\n datasource:\n druid:\n stat-view-servlet:\n enabled: true\n loginUsername: admin\n loginPassword: 123456\n allow:\n web-stat-filter:\n enabled: true\n dynamic:\n druid:\n initial-size: 5\n min-idle: 5\n maxActive: 20\n maxWait: 60000\n timeBetweenEvictionRunsMillis: 60000\n minEvictableIdleTimeMillis: 300000\n validationQuery: SELECT 1 FROM DUAL\n testWhileIdle: true\n testOnBorrow: false\n testOnReturn: false\n poolPreparedStatements: true\n maxPoolPreparedStatementPerConnectionSize: 20\n filters: stat,wall,slf4j\n connectionProperties: druid.stat.mergeSql\\=true;druid.stat.slowSqlMillis\\=5000\n datasource:\n master:\n url: jdbc:mysql://jeecg-boot-mysql:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai\n username: root\n password: root\n driver-class-name: com.mysql.cj.jdbc.Driver\n redis:\n database: 0\n host: jeecg-boot-redis\n password:\n port: 6379\n rabbitmq:\n host: jeecg-boot-rabbitmq\n username: guest\n password: guest\n port: 5672\n publisher-confirms: true\n publisher-returns: true\n virtual-host: /\n listener:\n simple:\n acknowledge-mode: manual\n concurrency: 1\n max-concurrency: 1\n retry:\n enabled: true\nminidao:\n base-package: org.jeecg.modules.jmreport.*,org.jeecg.modules.drag.*\njeecg:\n signatureSecret: dd05f1c54d63749eda95f9fa6d49v442a\n signUrls: /sys/dict/getDictItems/*,/sys/dict/loadDict/*,/sys/dict/loadDictOrderByValue/*,/sys/dict/loadDictItem/*,/sys/dict/loadTreeData,/sys/api/queryTableDictItemsByCode,/sys/api/queryFilterTableDictInfo,/sys/api/queryTableDictByKeys,/sys/api/translateDictFromTable,/sys/api/translateDictFromTableByKeys\n uploadType: local\n domainUrl:\n pc: http://localhost:3100\n app: http://localhost:8051\n path:\n upload: /opt/upFiles\n webapp: /opt/webapp\n shiro:\n excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**\n desform:\n theme-color: \"#1890ff\"\n upload-type: system\n map:\n baidu: ??\n oss:\n endpoint: oss-cn-beijing.aliyuncs.com\n accessKey: ??\n secretKey: ??\n bucketName: jeecgdev\n staticDomain: ??\n elasticsearch:\n cluster-name: jeecg-ES\n cluster-nodes: jeecg-boot-es:9200\n check-enabled: false\n file-view-domain: 127.0.0.1:8012\n minio:\n minio_url: http://minio.jeecg.com\n minio_name: ??\n minio_pass: ??\n bucketName: otatest\n jmreport:\n mode: dev\n is_verify_token: false\n verify_methods: remove,delete,save,add,update\n wps:\n domain: https://wwo.wps.cn/office/\n appid: ??\n appsecret: ??\n xxljob:\n enabled: false\n adminAddresses: http://jeecg-boot-xxljob:9080/xxl-job-admin\n appname: ${spring.application.name}\n accessToken: \'\'\n logPath: logs/jeecg/job/jobhandler/\n logRetentionDays: 30\n redisson:\n address: jeecg-boot-redis:6379\n password:\n type: STANDALONE\n enabled: true\nlogging:\n level:\n org.jeecg.modules.system.mapper : info\ncas:\n prefixUrl: http://localhost:8888/cas\nknife4j:\n production: false\n basic:\n enable: false\n username: jeecg\n password: jeecg1314\njustauth:\n enabled: true\n type:\n GITHUB:\n client-id: ??\n client-secret: ??\n redirect-uri: http://sso.test.com:8080/jeecg-boot/thirdLogin/github/callback\n WECHAT_ENTERPRISE:\n client-id: ??\n client-secret: ??\n redirect-uri: http://sso.test.com:8080/jeecg-boot/thirdLogin/wechat_enterprise/callback\n agent-id: ??\n DINGTALK:\n client-id: ??\n client-secret: ??\n redirect-uri: http://sso.test.com:8080/jeecg-boot/thirdLogin/dingtalk/callback\n cache:\n type: default\n prefix: \'demo::\'\n timeout: 1h\nthird-app:\n enabled: false\n type:\n WECHAT_ENTERPRISE:\n enabled: false\n client-id: ??\n client-secret: ??\n agent-id: ??\n DINGTALK:\n enabled: false\n client-id: ??\n client-secret: ??\n agent-id: ??', '53b1c1130dff673311ad863b4ce67c8e', '2010-05-05 00:00:00', '2022-08-06 07:10:17', 'nacos', '0:0:0:0:0:0:0:1', 'U', '');
|
INSERT INTO `his_config_info` VALUES (27, 25, 'jeecg-gateway-dev.yaml', 'JEECGDEV_GROUP', '', 'jeecg:\n route:\n config:\n #type:database nacos yml\n data-type: database\n data-id: jeecg-gateway-router\nspring:\n redis:\n database: 0\n host: jeecg-boot-redis\n port: 6379\n password:', 'd65267ddfda1b0c0f4462606195d1a5a', '2010-05-05 00:00:00', '2023-07-17 10:05:38', NULL, '0:0:0:0:0:0:0:1', 'D', '', '');
|
||||||
INSERT INTO `his_config_info` VALUES (20, 90, 'jeecg-gateway-dev.yaml', 'DEFAULT_GROUP', '', 'jeecg:\n route:\n config:\n #mode:database nacos yml\n data-type: database\n group: DEFAULT_GROUP\n data-id: jeecg-gateway-router\nspring:\n redis:\n database: 0\n host: jeecg-boot-redis\n port: 6379\n password:', 'b08a4c456f508fdd0fc347305da39a9e', '2010-05-05 00:00:00', '2022-08-06 07:11:34', 'nacos', '0:0:0:0:0:0:0:1', 'U', '');
|
INSERT INTO `his_config_info` VALUES (28, 26, 'jeecg-sharding-multi.yaml', 'JEECGDEV_GROUP', '', 'spring:\n shardingsphere:\n datasource:\n names: ds0,ds1\n ds0:\n driverClassName: com.mysql.cj.jdbc.Driver\n url: jdbc:mysql://jeecg-boot-mysql:3306/jeecg-boot?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai\n type: com.alibaba.druid.pool.DruidDataSource\n username: root\n password: root\n ds1:\n driverClassName: com.mysql.cj.jdbc.Driver\n url: jdbc:mysql://jeecg-boot-mysql:3306/jeecg-boot2?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai\n type: com.alibaba.druid.pool.DruidDataSource\n username: root\n password: root\n props:\n sql-show: true\n rules:\n replica-query:\n load-balancers:\n round-robin:\n type: ROUND_ROBIN\n props:\n default: 0\n data-sources:\n prds:\n primary-data-source-name: ds0\n replica-data-source-names: ds1\n load-balancer-name: round_robin\n sharding:\n binding-tables:\n - sys_log\n key-generators:\n snowflake:\n type: SNOWFLAKE\n props:\n worker-id: 123\n sharding-algorithms:\n table-classbased:\n props:\n strategy: standard\n algorithmClassName: org.jeecg.modules.test.sharding.algorithm.StandardModTableShardAlgorithm\n type: CLASS_BASED\n database-inline:\n type: INLINE\n props:\n algorithm-expression: ds$->{operate_type % 2}\n tables:\n sys_log:\n actual-data-nodes: ds$->{0..1}.sys_log$->{0..1}\n database-strategy:\n standard:\n sharding-column: operate_type\n sharding-algorithm-name: database-inline\n table-strategy:\n standard:\n sharding-algorithm-name: table-classbased\n sharding-column: log_type', '0fc2b030ca8c0008f148c84ecbd2a8c7', '2010-05-05 00:00:00', '2023-07-17 10:05:38', NULL, '0:0:0:0:0:0:0:1', 'D', '', '');
|
||||||
|
INSERT INTO `his_config_info` VALUES (33, 27, 'jeecg-gateway-dev.yaml', 'JEECGDEV_GROUP', '', 'jeecg:\n route:\n config:\n #type:database nacos yml\n data-type: database\n data-id: jeecg-gateway-router\nspring:\n redis:\n database: 0\n host: jeecg-boot-redis\n port: 6379\n password:', 'd65267ddfda1b0c0f4462606195d1a5a', '2010-05-05 00:00:00', '2023-07-17 10:30:23', 'nacos', '192.168.1.129', 'U', 'ac14ab82-51f8-4f0c-aa5b-25fb8384bfb6', '');
|
||||||
|
INSERT INTO `his_config_info` VALUES (1, 28, 'jeecg-dev.yaml', 'DEFAULT_GROUP', '', 'spring:\n datasource:\n druid:\n stat-view-servlet:\n enabled: true\n loginUsername: admin\n loginPassword: 123456\n allow:\n web-stat-filter:\n enabled: true\n dynamic:\n druid:\n initial-size: 5\n min-idle: 5\n maxActive: 20\n maxWait: 60000\n timeBetweenEvictionRunsMillis: 60000\n minEvictableIdleTimeMillis: 300000\n validationQuery: SELECT 1 FROM DUAL\n testWhileIdle: true\n testOnBorrow: false\n testOnReturn: false\n poolPreparedStatements: true\n maxPoolPreparedStatementPerConnectionSize: 20\n filters: stat,wall,slf4j\n connectionProperties: druid.stat.mergeSql\\=true;druid.stat.slowSqlMillis\\=5000\n datasource:\n master:\n url: jdbc:mysql://jeecg-boot-mysql:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai\n username: root\n password: root\n driver-class-name: com.mysql.cj.jdbc.Driver\n redis:\n database: 0\n host: jeecg-boot-redis\n password:\n port: 6379\n rabbitmq:\n host: jeecg-boot-rabbitmq\n username: guest\n password: guest\n port: 5672\n publisher-confirms: true\n publisher-returns: true\n virtual-host: /\n listener:\n simple:\n acknowledge-mode: manual\n concurrency: 1\n max-concurrency: 1\n retry:\n enabled: true\nminidao:\n base-package: org.jeecg.modules.jmreport.*,org.jeecg.modules.drag.*\njeecg:\n signatureSecret: dd05f1c54d63749eda95f9fa6d49v442a\n signUrls: /sys/dict/getDictItems/*,/sys/dict/loadDict/*,/sys/dict/loadDictOrderByValue/*,/sys/dict/loadDictItem/*,/sys/dict/loadTreeData,/sys/api/queryTableDictItemsByCode,/sys/api/queryFilterTableDictInfo,/sys/api/queryTableDictByKeys,/sys/api/translateDictFromTable,/sys/api/translateDictFromTableByKeys\n uploadType: local\n domainUrl:\n pc: http://localhost:3100\n app: http://localhost:8051\n path:\n upload: /opt/upFiles\n webapp: /opt/webapp\n shiro:\n excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**\n oss:\n endpoint: oss-cn-beijing.aliyuncs.com\n accessKey: ??\n secretKey: ??\n bucketName: jeecgdev\n staticDomain: ??\n elasticsearch:\n cluster-name: jeecg-ES\n cluster-nodes: jeecg-boot-es:9200\n check-enabled: false\n file-view-domain: 127.0.0.1:8012\n minio:\n minio_url: http://minio.jeecg.com\n minio_name: ??\n minio_pass: ??\n bucketName: otatest\n jmreport:\n mode: dev\n is_verify_token: false\n verify_methods: remove,delete,save,add,update\n wps:\n domain: https://wwo.wps.cn/office/\n appid: ??\n appsecret: ??\n xxljob:\n enabled: true\n adminAddresses: http://jeecg-boot-xxljob:9080/xxl-job-admin\n appname: ${spring.application.name}\n accessToken: \'\'\n logPath: logs/jeecg/job/jobhandler/\n logRetentionDays: 30\n redisson:\n address: jeecg-boot-redis:6379\n password:\n type: STANDALONE\n enabled: true\nlogging:\n level:\n org.jeecg.modules.system.mapper : info\ncas:\n prefixUrl: http://localhost:8888/cas\nknife4j:\n production: false\n basic:\n enable: false\n username: jeecg\n password: jeecg1314\njustauth:\n enabled: true\n type:\n GITHUB:\n client-id: ??\n client-secret: ??\n redirect-uri: http://sso.test.com:8080/jeecg-boot/thirdLogin/github/callback\n WECHAT_ENTERPRISE:\n client-id: ??\n client-secret: ??\n redirect-uri: http://sso.test.com:8080/jeecg-boot/thirdLogin/wechat_enterprise/callback\n agent-id: ??\n DINGTALK:\n client-id: ??\n client-secret: ??\n redirect-uri: http://sso.test.com:8080/jeecg-boot/thirdLogin/dingtalk/callback\n cache:\n type: default\n prefix: \'demo::\'\n timeout: 1h\nthird-app:\n enabled: false\n type:\n WECHAT_ENTERPRISE:\n enabled: false\n client-id: ??\n client-secret: ??\n agent-id: ??\n DINGTALK:\n enabled: false\n client-id: ??\n client-secret: ??\n agent-id: ??', '6c0ec1ace75d0341a1f83978c864c0b3', '2010-05-05 00:00:00', '2023-07-17 10:34:30', 'nacos', '192.168.1.129', 'U', '', '');
|
||||||
|
INSERT INTO `his_config_info` VALUES (1, 29, 'jeecg-dev.yaml', 'DEFAULT_GROUP', '', 'spring:\n datasource:\n druid:\n stat-view-servlet:\n enabled: true\n loginUsername: admin\n loginPassword: 123456\n allow:\n web-stat-filter:\n enabled: true\n dynamic:\n druid:\n initial-size: 5\n min-idle: 5\n maxActive: 20\n maxWait: 60000\n timeBetweenEvictionRunsMillis: 60000\n minEvictableIdleTimeMillis: 300000\n validationQuery: SELECT 1 FROM DUAL\n testWhileIdle: true\n testOnBorrow: false\n testOnReturn: false\n poolPreparedStatements: true\n maxPoolPreparedStatementPerConnectionSize: 20\n filters: stat,wall,slf4j\n connectionProperties: druid.stat.mergeSql\\=true;druid.stat.slowSqlMillis\\=5000\n datasource:\n master:\n url: jdbc:mysql://jeecg-boot-mysql:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai\n username: root\n password: root\n driver-class-name: com.mysql.cj.jdbc.Driver\n redis:\n database: 0\n host: jeecg-boot-redis\n password:\n port: 6379\n rabbitmq:\n host: jeecg-boot-rabbitmq\n username: guest\n password: guest\n port: 5672\n publisher-confirms: true\n publisher-returns: true\n virtual-host: /\n listener:\n simple:\n acknowledge-mode: manual\n concurrency: 1\n max-concurrency: 1\n retry:\n enabled: true\nminidao:\n base-package: org.jeecg.modules.jmreport.*,org.jeecg.modules.drag.*\njeecg:\n signatureSecret: dd05f1c54d63749eda95f9fa6d49v442a\n signUrls: /sys/dict/getDictItems/*,/sys/dict/loadDict/*,/sys/dict/loadDictOrderByValue/*,/sys/dict/loadDictItem/*,/sys/dict/loadTreeData,/sys/api/queryTableDictItemsByCode,/sys/api/queryFilterTableDictInfo,/sys/api/queryTableDictByKeys,/sys/api/translateDictFromTable,/sys/api/translateDictFromTableByKeys\n uploadType: local\n domainUrl:\n pc: http://localhost:3100\n app: http://localhost:8051\n path:\n upload: /opt/upFiles\n webapp: /opt/webapp\n shiro:\n excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**\n oss:\n endpoint: oss-cn-beijing.aliyuncs.com\n accessKey: ??\n secretKey: ??\n bucketName: jeecgdev\n staticDomain: ??\n elasticsearch:\n cluster-name: jeecg-ES\n cluster-nodes: jeecg-boot-es:9200\n check-enabled: false\n file-view-domain: 127.0.0.1:8012\n minio:\n minio_url: http://minio.jeecg.com\n minio_name: ??\n minio_pass: ??\n bucketName: otatest\n jmreport:\n mode: dev\n is_verify_token: false\n verify_methods: remove,delete,save,add,update\n wps:\n domain: https://wwo.wps.cn/office/\n appid: ??\n appsecret: ??\n xxljob:\n enabled: false\n adminAddresses: http://jeecg-boot-xxljob:9080/xxl-job-admin\n appname: ${spring.application.name}\n accessToken: \'\'\n logPath: logs/jeecg/job/jobhandler/\n logRetentionDays: 30\n redisson:\n address: jeecg-boot-redis:6379\n password:\n type: STANDALONE\n enabled: true\nlogging:\n level:\n org.jeecg.modules.system.mapper : info\ncas:\n prefixUrl: http://localhost:8888/cas\nknife4j:\n production: false\n basic:\n enable: false\n username: jeecg\n password: jeecg1314\njustauth:\n enabled: true\n type:\n GITHUB:\n client-id: ??\n client-secret: ??\n redirect-uri: http://sso.test.com:8080/jeecg-boot/thirdLogin/github/callback\n WECHAT_ENTERPRISE:\n client-id: ??\n client-secret: ??\n redirect-uri: http://sso.test.com:8080/jeecg-boot/thirdLogin/wechat_enterprise/callback\n agent-id: ??\n DINGTALK:\n client-id: ??\n client-secret: ??\n redirect-uri: http://sso.test.com:8080/jeecg-boot/thirdLogin/dingtalk/callback\n cache:\n type: default\n prefix: \'demo::\'\n timeout: 1h\nthird-app:\n enabled: false\n type:\n WECHAT_ENTERPRISE:\n enabled: false\n client-id: ??\n client-secret: ??\n agent-id: ??\n DINGTALK:\n enabled: false\n client-id: ??\n client-secret: ??\n agent-id: ??', 'edb0e79d570edf341755caf3853f11e4', '2010-05-05 00:00:00', '2023-07-17 10:34:57', 'nacos', '192.168.1.129', 'U', '', '');
|
||||||
|
INSERT INTO `his_config_info` VALUES (33, 30, 'jeecg-gateway-dev.yaml', 'JEECGDEV_GROUP', '', 'jeecg:\n route:\n config:\n #type:database nacos yml\n data-type: nacos\n data-id: jeecg-gateway-router\nspring:\n redis:\n database: 0\n host: jeecg-boot-redis\n port: 6379\n password:', 'eeb45ae799de89f4d789139de7a7d12d', '2010-05-05 00:00:00', '2023-07-17 11:21:25', 'nacos', '192.168.1.129', 'U', 'ac14ab82-51f8-4f0c-aa5b-25fb8384bfb6', '');
|
||||||
|
INSERT INTO `his_config_info` VALUES (29, 31, 'jeecg-dev.yaml', 'JEECGDEV_GROUP', '', 'spring:\n datasource:\n druid:\n stat-view-servlet:\n enabled: true\n loginUsername: admin\n loginPassword: 123456\n allow:\n web-stat-filter:\n enabled: true\n dynamic:\n druid:\n initial-size: 5\n min-idle: 5\n maxActive: 20\n maxWait: 60000\n timeBetweenEvictionRunsMillis: 60000\n minEvictableIdleTimeMillis: 300000\n validationQuery: SELECT 1 FROM DUAL\n testWhileIdle: true\n testOnBorrow: false\n testOnReturn: false\n poolPreparedStatements: true\n maxPoolPreparedStatementPerConnectionSize: 20\n filters: stat,wall,slf4j\n connectionProperties: druid.stat.mergeSql\\=true;druid.stat.slowSqlMillis\\=5000\n datasource:\n master:\n url: jdbc:mysql://jeecg-boot-mysql:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai\n username: root\n password: root\n driver-class-name: com.mysql.cj.jdbc.Driver\n redis:\n database: 0\n host: jeecg-boot-redis\n password:\n port: 6379\n rabbitmq:\n host: jeecg-boot-rabbitmq\n username: guest\n password: guest\n port: 5672\n publisher-confirms: true\n publisher-returns: true\n virtual-host: /\n listener:\n simple:\n acknowledge-mode: manual\n concurrency: 1\n max-concurrency: 1\n retry:\n enabled: true\nminidao:\n base-package: org.jeecg.modules.jmreport.*,org.jeecg.modules.drag.*\njeecg:\n signatureSecret: dd05f1c54d63749eda95f9fa6d49v442a\n signUrls: /sys/dict/getDictItems/*,/sys/dict/loadDict/*,/sys/dict/loadDictOrderByValue/*,/sys/dict/loadDictItem/*,/sys/dict/loadTreeData,/sys/api/queryTableDictItemsByCode,/sys/api/queryFilterTableDictInfo,/sys/api/queryTableDictByKeys,/sys/api/translateDictFromTable,/sys/api/translateDictFromTableByKeys\n uploadType: local\n domainUrl:\n pc: http://localhost:3100\n app: http://localhost:8051\n path:\n upload: /opt/upFiles\n webapp: /opt/webapp\n shiro:\n excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**\n oss:\n endpoint: oss-cn-beijing.aliyuncs.com\n accessKey: ??\n secretKey: ??\n bucketName: jeecgdev\n staticDomain: ??\n elasticsearch:\n cluster-name: jeecg-ES\n cluster-nodes: jeecg-boot-es:9200\n check-enabled: false\n file-view-domain: 127.0.0.1:8012\n minio:\n minio_url: http://minio.jeecg.com\n minio_name: ??\n minio_pass: ??\n bucketName: otatest\n jmreport:\n mode: dev\n is_verify_token: false\n verify_methods: remove,delete,save,add,update\n wps:\n domain: https://wwo.wps.cn/office/\n appid: ??\n appsecret: ??\n xxljob:\n enabled: true\n adminAddresses: http://jeecg-boot-xxljob:9080/xxl-job-admin\n appname: ${spring.application.name}\n accessToken: \'\'\n logPath: logs/jeecg/job/jobhandler/\n logRetentionDays: 30\n redisson:\n address: jeecg-boot-redis:6379\n password:\n type: STANDALONE\n enabled: true\nlogging:\n level:\n org.jeecg.modules.system.mapper : info\ncas:\n prefixUrl: http://localhost:8888/cas\nknife4j:\n production: false\n basic:\n enable: false\n username: jeecg\n password: jeecg1314\njustauth:\n enabled: true\n type:\n GITHUB:\n client-id: ??\n client-secret: ??\n redirect-uri: http://sso.test.com:8080/jeecg-boot/thirdLogin/github/callback\n WECHAT_ENTERPRISE:\n client-id: ??\n client-secret: ??\n redirect-uri: http://sso.test.com:8080/jeecg-boot/thirdLogin/wechat_enterprise/callback\n agent-id: ??\n DINGTALK:\n client-id: ??\n client-secret: ??\n redirect-uri: http://sso.test.com:8080/jeecg-boot/thirdLogin/dingtalk/callback\n cache:\n type: default\n prefix: \'demo::\'\n timeout: 1h\nthird-app:\n enabled: false\n type:\n WECHAT_ENTERPRISE:\n enabled: false\n client-id: ??\n client-secret: ??\n agent-id: ??\n DINGTALK:\n enabled: false\n client-id: ??\n client-secret: ??\n agent-id: ??', '6c0ec1ace75d0341a1f83978c864c0b3', '2010-05-05 00:00:00', '2023-07-17 11:21:54', 'nacos', '192.168.1.129', 'U', 'ac14ab82-51f8-4f0c-aa5b-25fb8384bfb6', '');
|
||||||
|
INSERT INTO `his_config_info` VALUES (33, 32, 'jeecg-gateway-dev.yaml', 'JEECGDEV_GROUP', '', 'jeecg:\n route:\n config:\n #type:database nacos yml\n data-type: database\n data-id: jeecg-gateway-router\nspring:\n redis:\n database: 0\n host: jeecg-boot-redis\n port: 6379\n password:', 'd65267ddfda1b0c0f4462606195d1a5a', '2010-05-05 00:00:00', '2023-07-17 11:49:21', NULL, '0:0:0:0:0:0:0:1', 'U', 'ac14ab82-51f8-4f0c-aa5b-25fb8384bfb6', '');
|
||||||
|
INSERT INTO `his_config_info` VALUES (29, 33, 'jeecg-dev.yaml', 'JEECGDEV_GROUP', '', 'spring:\n datasource:\n druid:\n stat-view-servlet:\n enabled: true\n loginUsername: admin\n loginPassword: 123456\n allow:\n web-stat-filter:\n enabled: true\n dynamic:\n druid:\n initial-size: 5\n min-idle: 5\n maxActive: 20\n maxWait: 60000\n timeBetweenEvictionRunsMillis: 60000\n minEvictableIdleTimeMillis: 300000\n validationQuery: SELECT 1 FROM DUAL\n testWhileIdle: true\n testOnBorrow: false\n testOnReturn: false\n poolPreparedStatements: true\n maxPoolPreparedStatementPerConnectionSize: 20\n filters: stat,wall,slf4j\n connectionProperties: druid.stat.mergeSql\\=true;druid.stat.slowSqlMillis\\=5000\n datasource:\n master:\n url: jdbc:mysql://jeecg-boot-mysql:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai\n username: root\n password: root\n driver-class-name: com.mysql.cj.jdbc.Driver\n redis:\n database: 0\n host: jeecg-boot-redis\n password:\n port: 6379\n rabbitmq:\n host: jeecg-boot-rabbitmq\n username: guest\n password: guest\n port: 5672\n publisher-confirms: true\n publisher-returns: true\n virtual-host: /\n listener:\n simple:\n acknowledge-mode: manual\n concurrency: 1\n max-concurrency: 1\n retry:\n enabled: true\nminidao:\n base-package: org.jeecg.modules.jmreport.*,org.jeecg.modules.drag.*\njeecg:\n signatureSecret: dd05f1c54d63749eda95f9fa6d49v442a\n signUrls: /sys/dict/getDictItems/*,/sys/dict/loadDict/*,/sys/dict/loadDictOrderByValue/*,/sys/dict/loadDictItem/*,/sys/dict/loadTreeData,/sys/api/queryTableDictItemsByCode,/sys/api/queryFilterTableDictInfo,/sys/api/queryTableDictByKeys,/sys/api/translateDictFromTable,/sys/api/translateDictFromTableByKeys\n uploadType: local\n domainUrl:\n pc: http://localhost:3100\n app: http://localhost:8051\n path:\n upload: /opt/upFiles\n webapp: /opt/webapp\n shiro:\n excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**\n oss:\n endpoint: oss-cn-beijing.aliyuncs.com\n accessKey: ??\n secretKey: ??\n bucketName: jeecgdev\n staticDomain: ??\n elasticsearch:\n cluster-name: jeecg-ES\n cluster-nodes: jeecg-boot-es:9200\n check-enabled: false\n file-view-domain: 127.0.0.1:8012\n minio:\n minio_url: http://minio.jeecg.com\n minio_name: ??\n minio_pass: ??\n bucketName: otatest\n jmreport:\n mode: dev\n is_verify_token: false\n verify_methods: remove,delete,save,add,update\n wps:\n domain: https://wwo.wps.cn/office/\n appid: ??\n appsecret: ??\n xxljob:\n enabled: false\n adminAddresses: http://jeecg-boot-xxljob:9080/xxl-job-admin\n appname: ${spring.application.name}\n accessToken: \'\'\n logPath: logs/jeecg/job/jobhandler/\n logRetentionDays: 30\n redisson:\n address: jeecg-boot-redis:6379\n password:\n type: STANDALONE\n enabled: true\nlogging:\n level:\n org.jeecg.modules.system.mapper : info\ncas:\n prefixUrl: http://localhost:8888/cas\nknife4j:\n production: false\n basic:\n enable: false\n username: jeecg\n password: jeecg1314\njustauth:\n enabled: true\n type:\n GITHUB:\n client-id: ??\n client-secret: ??\n redirect-uri: http://sso.test.com:8080/jeecg-boot/thirdLogin/github/callback\n WECHAT_ENTERPRISE:\n client-id: ??\n client-secret: ??\n redirect-uri: http://sso.test.com:8080/jeecg-boot/thirdLogin/wechat_enterprise/callback\n agent-id: ??\n DINGTALK:\n client-id: ??\n client-secret: ??\n redirect-uri: http://sso.test.com:8080/jeecg-boot/thirdLogin/dingtalk/callback\n cache:\n type: default\n prefix: \'demo::\'\n timeout: 1h\nthird-app:\n enabled: false\n type:\n WECHAT_ENTERPRISE:\n enabled: false\n client-id: ??\n client-secret: ??\n agent-id: ??\n DINGTALK:\n enabled: false\n client-id: ??\n client-secret: ??\n agent-id: ??', 'edb0e79d570edf341755caf3853f11e4', '2010-05-05 00:00:00', '2023-07-17 11:49:49', NULL, '0:0:0:0:0:0:0:1', 'U', 'ac14ab82-51f8-4f0c-aa5b-25fb8384bfb6', '');
|
||||||
|
|
||||||
-- ----------------------------
|
-- ----------------------------
|
||||||
-- Table structure for permissions
|
-- Table structure for permissions
|
||||||
|
|||||||
Binary file not shown.
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -1,6 +0,0 @@
|
|||||||
ALTER TABLE `onl_cgform_field`
|
|
||||||
MODIFY COLUMN `field_show_type` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '表单控件类型' AFTER `dict_text`;
|
|
||||||
|
|
||||||
ALTER TABLE `onl_cgform_field`
|
|
||||||
ADD COLUMN `db_is_persist` tinyint(1) NULL COMMENT '是否需要同步数据库字段， 1是0否' AFTER `db_is_null`;
|
|
||||||
update onl_cgform_field set db_is_persist = 1;
|
|
||||||
670
db/增量SQL/3.5.1升级到3.5.2仪表盘设计器专项脚本.sql
Normal file
670
db/增量SQL/3.5.1升级到3.5.2仪表盘设计器专项脚本.sql
Normal file
File diff suppressed because one or more lines are too long
@ -2,14 +2,43 @@
|
|||||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||||
<parent>
|
<parent>
|
||||||
<artifactId>jeecg-boot-parent</artifactId>
|
|
||||||
<groupId>org.jeecgframework.boot</groupId>
|
<groupId>org.jeecgframework.boot</groupId>
|
||||||
<version>3.4.4</version>
|
<artifactId>jeecg-boot-parent</artifactId>
|
||||||
|
<version>3.5.3</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
<artifactId>jeecg-boot-base-core</artifactId>
|
<artifactId>jeecg-boot-base-core</artifactId>
|
||||||
|
|
||||||
|
<repositories>
|
||||||
|
<repository>
|
||||||
|
<id>aliyun</id>
|
||||||
|
<name>aliyun Repository</name>
|
||||||
|
<url>https://maven.aliyun.com/repository/public</url>
|
||||||
|
<snapshots>
|
||||||
|
<enabled>false</enabled>
|
||||||
|
</snapshots>
|
||||||
|
</repository>
|
||||||
|
<repository>
|
||||||
|
<id>jeecg</id>
|
||||||
|
<name>jeecg Repository</name>
|
||||||
|
<url>https://maven.jeecg.org/nexus/content/repositories/jeecg</url>
|
||||||
|
<snapshots>
|
||||||
|
<enabled>false</enabled>
|
||||||
|
</snapshots>
|
||||||
|
</repository>
|
||||||
|
<repository>
|
||||||
|
<id>jeecg-snapshots</id>
|
||||||
|
<name>jeecg-snapshots Repository</name>
|
||||||
|
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
|
||||||
|
<releases>
|
||||||
|
<enabled>false</enabled>
|
||||||
|
</releases>
|
||||||
|
<snapshots>
|
||||||
|
<enabled>true</enabled>
|
||||||
|
</snapshots>
|
||||||
|
</repository>
|
||||||
|
</repositories>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<!--jeecg-tools-->
|
<!--jeecg-tools-->
|
||||||
<dependency>
|
<dependency>
|
||||||
@ -157,7 +186,7 @@
|
|||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- 代码生成器 -->
|
<!-- 代码生成器 -->
|
||||||
<!-- 如下载失败，请参考此文档 http://doc.jeecg.com/2043876 -->
|
<!-- 如下载失败，请参考此文档 https://help.jeecg.com/java/setup/maven.html -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.jeecgframework.boot</groupId>
|
<groupId>org.jeecgframework.boot</groupId>
|
||||||
<artifactId>codegenerate</artifactId>
|
<artifactId>codegenerate</artifactId>
|
||||||
@ -174,8 +203,18 @@
|
|||||||
<groupId>commons-codec</groupId>
|
<groupId>commons-codec</groupId>
|
||||||
<artifactId>commons-codec</artifactId>
|
<artifactId>commons-codec</artifactId>
|
||||||
</exclusion>
|
</exclusion>
|
||||||
|
<exclusion>
|
||||||
|
<artifactId>xercesImpl</artifactId>
|
||||||
|
<groupId>xerces</groupId>
|
||||||
|
</exclusion>
|
||||||
</exclusions>
|
</exclusions>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>xerces</groupId>
|
||||||
|
<artifactId>xercesImpl</artifactId>
|
||||||
|
<version>2.12.2</version>
|
||||||
|
<optional>true</optional>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
<!-- mini文件存储服务 -->
|
<!-- mini文件存储服务 -->
|
||||||
<dependency>
|
<dependency>
|
||||||
@ -209,6 +248,10 @@
|
|||||||
<groupId>com.fasterxml.jackson.module</groupId>
|
<groupId>com.fasterxml.jackson.module</groupId>
|
||||||
<artifactId>jackson-module-kotlin</artifactId>
|
<artifactId>jackson-module-kotlin</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>commons-fileupload</groupId>
|
||||||
|
<artifactId>commons-fileupload</artifactId>
|
||||||
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
</project>
|
</project>
|
||||||
@ -50,6 +50,11 @@ public class LogDTO implements Serializable {
|
|||||||
/**操作人用户账户*/
|
/**操作人用户账户*/
|
||||||
private String userid;
|
private String userid;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 租户ID
|
||||||
|
*/
|
||||||
|
private Integer tenantId;
|
||||||
|
|
||||||
public LogDTO(){
|
public LogDTO(){
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -71,7 +71,12 @@ public class MessageDTO implements Serializable {
|
|||||||
protected Map<String, Object> data;
|
protected Map<String, Object> data;
|
||||||
//update-end---author:taoyan ---date::20220705 for：支持自定义推送类型，邮件、钉钉、企业微信、系统消息-----------
|
//update-end---author:taoyan ---date::20220705 for：支持自定义推送类型，邮件、钉钉、企业微信、系统消息-----------
|
||||||
//-----------------------------------------------------------------------
|
//-----------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 抄送人
|
||||||
|
*/
|
||||||
|
private String copyToUser;
|
||||||
|
|
||||||
public MessageDTO(){
|
public MessageDTO(){
|
||||||
}
|
}
|
||||||
|
|||||||
@ -78,7 +78,7 @@ public interface CommonConstant {
|
|||||||
/** 登录用户Shiro权限缓存KEY前缀 */
|
/** 登录用户Shiro权限缓存KEY前缀 */
|
||||||
public static String PREFIX_USER_SHIRO_CACHE = "shiro:cache:org.jeecg.config.shiro.ShiroRealm.authorizationCache:";
|
public static String PREFIX_USER_SHIRO_CACHE = "shiro:cache:org.jeecg.config.shiro.ShiroRealm.authorizationCache:";
|
||||||
/** 登录用户Token令牌缓存KEY前缀 */
|
/** 登录用户Token令牌缓存KEY前缀 */
|
||||||
String PREFIX_USER_TOKEN = "prefix_user_token_";
|
String PREFIX_USER_TOKEN = "prefix_user_token:";
|
||||||
// /** Token缓存时间：3600秒即一小时 */
|
// /** Token缓存时间：3600秒即一小时 */
|
||||||
// int TOKEN_EXPIRE_TIME = 3600;
|
// int TOKEN_EXPIRE_TIME = 3600;
|
||||||
|
|
||||||
@ -152,10 +152,11 @@ public interface CommonConstant {
|
|||||||
Integer RULE_FLAG_1 = 1;
|
Integer RULE_FLAG_1 = 1;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 是否用户已被冻结 1正常(解冻) 2冻结
|
* 是否用户已被冻结 1正常(解冻) 2冻结 3离职
|
||||||
*/
|
*/
|
||||||
Integer USER_UNFREEZE = 1;
|
Integer USER_UNFREEZE = 1;
|
||||||
Integer USER_FREEZE = 2;
|
Integer USER_FREEZE = 2;
|
||||||
|
Integer USER_QUIT = 3;
|
||||||
|
|
||||||
/**字典翻译文本后缀*/
|
/**字典翻译文本后缀*/
|
||||||
String DICT_TEXT_SUFFIX = "_dictText";
|
String DICT_TEXT_SUFFIX = "_dictText";
|
||||||
@ -312,8 +313,8 @@ public interface CommonConstant {
|
|||||||
String X_ACCESS_TOKEN = "X-Access-Token";
|
String X_ACCESS_TOKEN = "X-Access-Token";
|
||||||
String X_SIGN = "X-Sign";
|
String X_SIGN = "X-Sign";
|
||||||
String X_TIMESTAMP = "X-TIMESTAMP";
|
String X_TIMESTAMP = "X-TIMESTAMP";
|
||||||
/** 租户 请求头*/
|
/** 租户请求头 更名为：X-Tenant-Id */
|
||||||
String TENANT_ID = "tenant-id";
|
String TENANT_ID = "X-Tenant-Id";
|
||||||
/**===============================================================================================*/
|
/**===============================================================================================*/
|
||||||
|
|
||||||
String TOKEN_IS_INVALID_MSG = "Token失效，请重新登录!";
|
String TOKEN_IS_INVALID_MSG = "Token失效，请重新登录!";
|
||||||
@ -425,4 +426,68 @@ public interface CommonConstant {
|
|||||||
*/
|
*/
|
||||||
String PHONE_REDIS_KEY_PRE = "phone_msg";
|
String PHONE_REDIS_KEY_PRE = "phone_msg";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 是文件夹
|
||||||
|
*/
|
||||||
|
String IT_IS_FOLDER = "1";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 文件拥有者
|
||||||
|
*/
|
||||||
|
String FILE_OWNER = "owner";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 文件管理员
|
||||||
|
*/
|
||||||
|
String FILE_ADMIN = "admin";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 只允许编辑
|
||||||
|
*/
|
||||||
|
String FILE_EDITABLE = "editable";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 登录失败，用于记录失败次数的key
|
||||||
|
*/
|
||||||
|
String LOGIN_FAIL = "LOGIN_FAIL_";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 入职事件
|
||||||
|
*/
|
||||||
|
Integer BPM_USER_EVENT_ADD = 1;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 离职事件
|
||||||
|
*/
|
||||||
|
Integer BPM_USER_EVENT_LEVEL = 2;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 用户租户状态(正常/已通过审核的)
|
||||||
|
*/
|
||||||
|
String USER_TENANT_NORMAL = "1";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 用户租户状态(离职)
|
||||||
|
*/
|
||||||
|
String USER_TENANT_QUIT = "2";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 用户租户状态(审核中)
|
||||||
|
*/
|
||||||
|
String USER_TENANT_UNDER_REVIEW = "3";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 用户租户状态(拒绝)
|
||||||
|
*/
|
||||||
|
String USER_TENANT_REFUSE = "4";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 不是叶子节点
|
||||||
|
*/
|
||||||
|
Integer NOT_LEAF = 0;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 是叶子节点
|
||||||
|
*/
|
||||||
|
Integer IS_LEAF = 1;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -139,16 +139,6 @@ public interface DataBaseConstant {
|
|||||||
public static final String BPM_STATUS_TABLE = "bpm_status";
|
public static final String BPM_STATUS_TABLE = "bpm_status";
|
||||||
//*********系统建表标准字段****************************************
|
//*********系统建表标准字段****************************************
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 租户ID 实体字段名
|
|
||||||
*/
|
|
||||||
String TENANT_ID = "tenantId";
|
|
||||||
/**
|
|
||||||
* 租户ID 数据库字段名
|
|
||||||
*/
|
|
||||||
String TENANT_ID_TABLE = "tenant_id";
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* sql语句 where
|
* sql语句 where
|
||||||
*/
|
*/
|
||||||
|
|||||||
@ -33,6 +33,18 @@ public interface ServiceNameConstants {
|
|||||||
* 微服务名： demo模块
|
* 微服务名： demo模块
|
||||||
*/
|
*/
|
||||||
String SERVICE_DEMO = "jeecg-demo";
|
String SERVICE_DEMO = "jeecg-demo";
|
||||||
|
/**
|
||||||
|
* 微服务名：online在线模块
|
||||||
|
*/
|
||||||
|
String SERVICE_ONLINE = "jeecg-online";
|
||||||
|
/**
|
||||||
|
* 微服务名：OA模块
|
||||||
|
*/
|
||||||
|
String SERVICE_EOA = "jeecg-eoa";
|
||||||
|
/**
|
||||||
|
* 微服务名：表单设计模块
|
||||||
|
*/
|
||||||
|
String SERVICE_FORM = "jeecg-desform";
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* gateway通过header传递根路径 basePath
|
* gateway通过header传递根路径 basePath
|
||||||
|
|||||||
@ -6,17 +6,45 @@ package org.jeecg.common.constant;
|
|||||||
* @date: 2022年08月29日 15:29
|
* @date: 2022年08月29日 15:29
|
||||||
*/
|
*/
|
||||||
public interface TenantConstant {
|
public interface TenantConstant {
|
||||||
|
/*------【低代码应用参数】----------------------------------------------*/
|
||||||
/**
|
/**
|
||||||
* 应用ID——表字段
|
* header的lowAppId标识
|
||||||
*/
|
*/
|
||||||
String DB_FIELD_LOW_APP_ID = "low_app_id";
|
String X_LOW_APP_ID = "X-Low-App-ID";
|
||||||
/**
|
/**
|
||||||
* 应用ID——实体字段
|
* 应用ID——实体字段
|
||||||
*/
|
*/
|
||||||
String FIELD_LOW_APP_ID = "lowAppId";
|
String FIELD_LOW_APP_ID = "lowAppId";
|
||||||
/**
|
/**
|
||||||
* 租户ID
|
* 应用ID——表字段
|
||||||
|
*/
|
||||||
|
String DB_FIELD_LOW_APP_ID = "low_app_id";
|
||||||
|
/*------【低代码应用参数】---------------------------------------------*/
|
||||||
|
|
||||||
|
/*--------【租户参数】-----------------------------------------------*/
|
||||||
|
/**
|
||||||
|
* 租户ID（实体字段名 和 url参数名）
|
||||||
*/
|
*/
|
||||||
String TENANT_ID = "tenantId";
|
String TENANT_ID = "tenantId";
|
||||||
|
/**
|
||||||
|
* 租户ID 数据库字段名
|
||||||
|
*/
|
||||||
|
String TENANT_ID_TABLE = "tenant_id";
|
||||||
|
/*-------【租户参数】-----------------------------------------------*/
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 超级管理员
|
||||||
|
*/
|
||||||
|
String SUPER_ADMIN = "superAdmin";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 组织账户管理员
|
||||||
|
*/
|
||||||
|
String ACCOUNT_ADMIN = "accountAdmin";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 组织应用管理员
|
||||||
|
*/
|
||||||
|
String APP_ADMIN = "appAdmin";
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -21,5 +21,10 @@ public enum LowAppAopEnum {
|
|||||||
/**
|
/**
|
||||||
* Online表单专用：数据库表转Online表单
|
* Online表单专用：数据库表转Online表单
|
||||||
*/
|
*/
|
||||||
CGFORM_DB_IMPORT
|
CGFORM_DB_IMPORT,
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 表单设计器专用：子表转工作表
|
||||||
|
*/
|
||||||
|
DESFORM_SUB2WORK
|
||||||
}
|
}
|
||||||
|
|||||||
@ -63,11 +63,12 @@ public class SensitiveInfoUtil {
|
|||||||
* @throws IllegalAccessException
|
* @throws IllegalAccessException
|
||||||
*/
|
*/
|
||||||
public static Object handlerObject(Object obj, boolean isEncode) throws IllegalAccessException {
|
public static Object handlerObject(Object obj, boolean isEncode) throws IllegalAccessException {
|
||||||
log.debug(" obj --> "+ obj.toString());
|
|
||||||
long startTime=System.currentTimeMillis();
|
|
||||||
if (oConvertUtils.isEmpty(obj)) {
|
if (oConvertUtils.isEmpty(obj)) {
|
||||||
return obj;
|
return obj;
|
||||||
}
|
}
|
||||||
|
long startTime=System.currentTimeMillis();
|
||||||
|
log.debug(" obj --> "+ obj.toString());
|
||||||
|
|
||||||
// 判断是不是一个对象
|
// 判断是不是一个对象
|
||||||
Field[] fields = obj.getClass().getDeclaredFields();
|
Field[] fields = obj.getClass().getDeclaredFields();
|
||||||
for (Field field : fields) {
|
for (Field field : fields) {
|
||||||
|
|||||||
@ -7,6 +7,7 @@ import org.apache.commons.lang3.StringUtils;
|
|||||||
import org.jeecg.common.util.RestUtil;
|
import org.jeecg.common.util.RestUtil;
|
||||||
import org.jeecg.common.util.oConvertUtils;
|
import org.jeecg.common.util.oConvertUtils;
|
||||||
import org.springframework.beans.factory.annotation.Value;
|
import org.springframework.beans.factory.annotation.Value;
|
||||||
|
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
|
||||||
import org.springframework.http.HttpHeaders;
|
import org.springframework.http.HttpHeaders;
|
||||||
import org.springframework.http.HttpMethod;
|
import org.springframework.http.HttpMethod;
|
||||||
import org.springframework.http.HttpStatus;
|
import org.springframework.http.HttpStatus;
|
||||||
@ -22,6 +23,7 @@ import java.util.*;
|
|||||||
*/
|
*/
|
||||||
@Slf4j
|
@Slf4j
|
||||||
@Component
|
@Component
|
||||||
|
@ConditionalOnProperty(prefix = "jeecg.elasticsearch", name = "cluster-nodes")
|
||||||
public class JeecgElasticsearchTemplate {
|
public class JeecgElasticsearchTemplate {
|
||||||
/** es服务地址 */
|
/** es服务地址 */
|
||||||
private String baseUrl;
|
private String baseUrl;
|
||||||
|
|||||||
@ -11,6 +11,7 @@ import org.jeecg.common.api.vo.Result;
|
|||||||
import org.jeecg.common.system.query.QueryGenerator;
|
import org.jeecg.common.system.query.QueryGenerator;
|
||||||
import org.jeecg.common.system.vo.LoginUser;
|
import org.jeecg.common.system.vo.LoginUser;
|
||||||
import org.jeecg.common.util.oConvertUtils;
|
import org.jeecg.common.util.oConvertUtils;
|
||||||
|
import org.jeecg.config.JeecgBaseConfig;
|
||||||
import org.jeecgframework.poi.excel.ExcelImportUtil;
|
import org.jeecgframework.poi.excel.ExcelImportUtil;
|
||||||
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
|
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
|
||||||
import org.jeecgframework.poi.excel.entity.ExportParams;
|
import org.jeecgframework.poi.excel.entity.ExportParams;
|
||||||
@ -23,6 +24,7 @@ import org.springframework.web.multipart.MultipartFile;
|
|||||||
import org.springframework.web.multipart.MultipartHttpServletRequest;
|
import org.springframework.web.multipart.MultipartHttpServletRequest;
|
||||||
import org.springframework.web.servlet.ModelAndView;
|
import org.springframework.web.servlet.ModelAndView;
|
||||||
|
|
||||||
|
import javax.annotation.Resource;
|
||||||
import javax.servlet.http.HttpServletRequest;
|
import javax.servlet.http.HttpServletRequest;
|
||||||
import javax.servlet.http.HttpServletResponse;
|
import javax.servlet.http.HttpServletResponse;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
@ -40,9 +42,9 @@ public class JeecgController<T, S extends IService<T>> {
|
|||||||
/**issues/2933 JeecgController注入service时改用protected修饰，能避免重复引用service*/
|
/**issues/2933 JeecgController注入service时改用protected修饰，能避免重复引用service*/
|
||||||
@Autowired
|
@Autowired
|
||||||
protected S service;
|
protected S service;
|
||||||
|
@Resource
|
||||||
@Value("${jeecg.path.upload}")
|
private JeecgBaseConfig jeecgBaseConfig;
|
||||||
private String upLoadPath;
|
|
||||||
/**
|
/**
|
||||||
* 导出excel
|
* 导出excel
|
||||||
*
|
*
|
||||||
@ -69,7 +71,7 @@ public class JeecgController<T, S extends IService<T>> {
|
|||||||
mv.addObject(NormalExcelConstants.CLASS, clazz);
|
mv.addObject(NormalExcelConstants.CLASS, clazz);
|
||||||
//update-begin--Author:liusq Date:20210126 for：图片导出报错，ImageBasePath未设置--------------------
|
//update-begin--Author:liusq Date:20210126 for：图片导出报错，ImageBasePath未设置--------------------
|
||||||
ExportParams exportParams=new ExportParams(title + "报表", "导出人:" + sysUser.getRealname(), title);
|
ExportParams exportParams=new ExportParams(title + "报表", "导出人:" + sysUser.getRealname(), title);
|
||||||
exportParams.setImageBasePath(upLoadPath);
|
exportParams.setImageBasePath(jeecgBaseConfig.getPath().getUpload());
|
||||||
//update-end--Author:liusq Date:20210126 for：图片导出报错，ImageBasePath未设置----------------------
|
//update-end--Author:liusq Date:20210126 for：图片导出报错，ImageBasePath未设置----------------------
|
||||||
mv.addObject(NormalExcelConstants.PARAMS,exportParams);
|
mv.addObject(NormalExcelConstants.PARAMS,exportParams);
|
||||||
mv.addObject(NormalExcelConstants.DATA_LIST, exportList);
|
mv.addObject(NormalExcelConstants.DATA_LIST, exportList);
|
||||||
@ -108,7 +110,7 @@ public class JeecgController<T, S extends IService<T>> {
|
|||||||
IPage<T> pageList = service.page(page, queryWrapper);
|
IPage<T> pageList = service.page(page, queryWrapper);
|
||||||
List<T> exportList = pageList.getRecords();
|
List<T> exportList = pageList.getRecords();
|
||||||
Map<String, Object> map = new HashMap<>(5);
|
Map<String, Object> map = new HashMap<>(5);
|
||||||
ExportParams exportParams=new ExportParams(title + "报表", "导出人:" + sysUser.getRealname(), title+i,upLoadPath);
|
ExportParams exportParams=new ExportParams(title + "报表", "导出人:" + sysUser.getRealname(), title+i,jeecgBaseConfig.getPath().getUpload());
|
||||||
exportParams.setType(ExcelType.XSSF);
|
exportParams.setType(ExcelType.XSSF);
|
||||||
//map.put("title",exportParams);
|
//map.put("title",exportParams);
|
||||||
//表格Title
|
//表格Title
|
||||||
|
|||||||
@ -238,7 +238,7 @@ public class QueryGenerator {
|
|||||||
if(parameterMap!=null&& parameterMap.containsKey(ORDER_TYPE)) {
|
if(parameterMap!=null&& parameterMap.containsKey(ORDER_TYPE)) {
|
||||||
order = parameterMap.get(ORDER_TYPE)[0];
|
order = parameterMap.get(ORDER_TYPE)[0];
|
||||||
}
|
}
|
||||||
log.info("排序规则>>列:" + column + ",排序方式:" + order);
|
log.debug("排序规则>>列:" + column + ",排序方式:" + order);
|
||||||
|
|
||||||
//update-begin-author:scott date:2022-11-07 for:避免用户自定义表无默认字段{创建时间}，导致排序报错
|
//update-begin-author:scott date:2022-11-07 for:避免用户自定义表无默认字段{创建时间}，导致排序报错
|
||||||
//TODO 避免用户自定义表无默认字段创建时间，导致排序报错
|
//TODO 避免用户自定义表无默认字段创建时间，导致排序报错
|
||||||
|
|||||||
@ -31,10 +31,22 @@ public enum QueryRuleEnum {
|
|||||||
RIGHT_LIKE("RIGHT_LIKE","right_like","右模糊"),
|
RIGHT_LIKE("RIGHT_LIKE","right_like","右模糊"),
|
||||||
/**查询规则 带加号等于*/
|
/**查询规则 带加号等于*/
|
||||||
EQ_WITH_ADD("EQWITHADD","eq_with_add","带加号等于"),
|
EQ_WITH_ADD("EQWITHADD","eq_with_add","带加号等于"),
|
||||||
|
// ------- 当前表单设计器内专用 -------
|
||||||
|
/** 值为空 */
|
||||||
|
EMPTY("EMPTY","empty","值为空"),
|
||||||
|
/** 值不为空 */
|
||||||
|
NOT_EMPTY("NOT_EMPTY","not_empty","值不为空"),
|
||||||
|
/**查询规则 不包含*/
|
||||||
|
NOT_IN("NOT_IN","not_in","不包含"),
|
||||||
|
// ------- 当前表单设计器内专用 -------
|
||||||
/**查询规则 多词模糊匹配*/
|
/**查询规则 多词模糊匹配*/
|
||||||
LIKE_WITH_AND("LIKEWITHAND","like_with_and","多词模糊匹配————暂时未用上"),
|
LIKE_WITH_AND("LIKEWITHAND","like_with_and","多词模糊匹配————暂时未用上"),
|
||||||
/**查询规则 自定义SQL片段*/
|
/**查询规则 自定义SQL片段*/
|
||||||
SQL_RULES("USE_SQL_RULES","ext","自定义SQL片段");
|
SQL_RULES("USE_SQL_RULES","ext","自定义SQL片段"),
|
||||||
|
/**查询规则 多词匹配*/
|
||||||
|
ELE_MATCH("ELE_MATCH","elemMatch","多词匹配"),
|
||||||
|
/**查询规则 范围查询*/
|
||||||
|
RANGE("RANGE","range","范围查询");
|
||||||
|
|
||||||
private String value;
|
private String value;
|
||||||
|
|
||||||
|
|||||||
@ -21,6 +21,7 @@ import org.jeecg.common.api.vo.Result;
|
|||||||
import org.jeecg.common.constant.CommonConstant;
|
import org.jeecg.common.constant.CommonConstant;
|
||||||
import org.jeecg.common.constant.DataBaseConstant;
|
import org.jeecg.common.constant.DataBaseConstant;
|
||||||
import org.jeecg.common.constant.SymbolConstant;
|
import org.jeecg.common.constant.SymbolConstant;
|
||||||
|
import org.jeecg.common.constant.TenantConstant;
|
||||||
import org.jeecg.common.exception.JeecgBootException;
|
import org.jeecg.common.exception.JeecgBootException;
|
||||||
import org.jeecg.common.system.vo.LoginUser;
|
import org.jeecg.common.system.vo.LoginUser;
|
||||||
import org.jeecg.common.system.vo.SysUserCacheInfo;
|
import org.jeecg.common.system.vo.SysUserCacheInfo;
|
||||||
@ -35,8 +36,8 @@ import org.jeecg.common.util.oConvertUtils;
|
|||||||
**/
|
**/
|
||||||
public class JwtUtil {
|
public class JwtUtil {
|
||||||
|
|
||||||
/**Token有效期为1小时（Token在reids中缓存时间为两倍）*/
|
/**Token有效期为7天（Token在reids中缓存时间为两倍）*/
|
||||||
public static final long EXPIRE_TIME = 60 * 60 * 1000;
|
public static final long EXPIRE_TIME = (7 * 12) * 60 * 60 * 1000;
|
||||||
static final String WELL_NUMBER = SymbolConstant.WELL_NUMBER + SymbolConstant.LEFT_CURLY_BRACKET;
|
static final String WELL_NUMBER = SymbolConstant.WELL_NUMBER + SymbolConstant.LEFT_CURLY_BRACKET;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -50,6 +51,7 @@ public class JwtUtil {
|
|||||||
// issues/I4YH95浏览器显示乱码问题
|
// issues/I4YH95浏览器显示乱码问题
|
||||||
httpServletResponse.setHeader("Content-type", "text/html;charset=UTF-8");
|
httpServletResponse.setHeader("Content-type", "text/html;charset=UTF-8");
|
||||||
Result jsonResult = new Result(code, errorMsg);
|
Result jsonResult = new Result(code, errorMsg);
|
||||||
|
jsonResult.setSuccess(false);
|
||||||
OutputStream os = null;
|
OutputStream os = null;
|
||||||
try {
|
try {
|
||||||
os = httpServletResponse.getOutputStream();
|
os = httpServletResponse.getOutputStream();
|
||||||
@ -233,12 +235,8 @@ public class JwtUtil {
|
|||||||
returnValue = "1";
|
returnValue = "1";
|
||||||
}
|
}
|
||||||
//update-begin-author:taoyan date:20210330 for:多租户ID作为系统变量
|
//update-begin-author:taoyan date:20210330 for:多租户ID作为系统变量
|
||||||
else if (key.equals(DataBaseConstant.TENANT_ID) || key.toLowerCase().equals(DataBaseConstant.TENANT_ID_TABLE)){
|
else if (key.equals(TenantConstant.TENANT_ID) || key.toLowerCase().equals(TenantConstant.TENANT_ID_TABLE)){
|
||||||
returnValue = sysUser.getRelTenantIds();
|
returnValue = SpringContextUtils.getHttpServletRequest().getHeader(CommonConstant.TENANT_ID);
|
||||||
boolean flag = returnValue != null && returnValue.indexOf(SymbolConstant.COMMA) > 0;
|
|
||||||
if(oConvertUtils.isEmpty(returnValue) || flag){
|
|
||||||
returnValue = SpringContextUtils.getHttpServletRequest().getHeader(CommonConstant.TENANT_ID);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
//update-end-author:taoyan date:20210330 for:多租户ID作为系统变量
|
//update-end-author:taoyan date:20210330 for:多租户ID作为系统变量
|
||||||
if(returnValue!=null){returnValue = returnValue + moshi;}
|
if(returnValue!=null){returnValue = returnValue + moshi;}
|
||||||
|
|||||||
@ -40,7 +40,7 @@ public class ResourceUtil {
|
|||||||
* 所有枚举java类
|
* 所有枚举java类
|
||||||
*/
|
*/
|
||||||
|
|
||||||
private final static String CLASS_ENMU_PATTERN="/**/*Enum.class";
|
private final static String CLASS_ENUM_PATTERN="/**/*Enum.class";
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 包路径 org.jeecg
|
* 包路径 org.jeecg
|
||||||
@ -61,7 +61,7 @@ public class ResourceUtil {
|
|||||||
return enumDictData;
|
return enumDictData;
|
||||||
}
|
}
|
||||||
ResourcePatternResolver resourcePatternResolver = new PathMatchingResourcePatternResolver();
|
ResourcePatternResolver resourcePatternResolver = new PathMatchingResourcePatternResolver();
|
||||||
String pattern = ResourcePatternResolver.CLASSPATH_ALL_URL_PREFIX + ClassUtils.convertClassNameToResourcePath(BASE_PACKAGE) + CLASS_ENMU_PATTERN;
|
String pattern = ResourcePatternResolver.CLASSPATH_ALL_URL_PREFIX + ClassUtils.convertClassNameToResourcePath(BASE_PACKAGE) + CLASS_ENUM_PATTERN;
|
||||||
try {
|
try {
|
||||||
Resource[] resources = resourcePatternResolver.getResources(pattern);
|
Resource[] resources = resourcePatternResolver.getResources(pattern);
|
||||||
MetadataReaderFactory readerFactory = new CachingMetadataReaderFactory(resourcePatternResolver);
|
MetadataReaderFactory readerFactory = new CachingMetadataReaderFactory(resourcePatternResolver);
|
||||||
|
|||||||
@ -121,7 +121,7 @@ public class LoginUser {
|
|||||||
@SensitiveField
|
@SensitiveField
|
||||||
private String telephone;
|
private String telephone;
|
||||||
|
|
||||||
/**多租户id配置，编辑用户的时候设置*/
|
/** 多租户ids临时用，不持久化数据库(数据库字段不存在) */
|
||||||
private String relTenantIds;
|
private String relTenantIds;
|
||||||
|
|
||||||
/**设备id uniapp推送用*/
|
/**设备id uniapp推送用*/
|
||||||
|
|||||||
@ -1,5 +1,6 @@
|
|||||||
package org.jeecg.common.util;
|
package org.jeecg.common.util;
|
||||||
|
|
||||||
|
import com.alibaba.fastjson.JSONObject;
|
||||||
import com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DataSourceProperty;
|
import com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DataSourceProperty;
|
||||||
import com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceProperties;
|
import com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceProperties;
|
||||||
import com.baomidou.mybatisplus.annotation.DbType;
|
import com.baomidou.mybatisplus.annotation.DbType;
|
||||||
@ -351,4 +352,44 @@ public class CommonUtils {
|
|||||||
log.debug("-----Common getBaseUrl----- : " + baseDomainPath);
|
log.debug("-----Common getBaseUrl----- : " + baseDomainPath);
|
||||||
return baseDomainPath;
|
return baseDomainPath;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 递归合并 fastJSON 对象
|
||||||
|
*
|
||||||
|
* @param target 目标对象
|
||||||
|
* @param sources 来源对象，允许多个，优先级从左到右，最右侧的优先级最高
|
||||||
|
*/
|
||||||
|
public static JSONObject mergeJSON(JSONObject target, JSONObject... sources) {
|
||||||
|
for (JSONObject source : sources) {
|
||||||
|
CommonUtils.mergeJSON(target, source);
|
||||||
|
}
|
||||||
|
return target;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 递归合并 fastJSON 对象
|
||||||
|
*
|
||||||
|
* @param target 目标对象
|
||||||
|
* @param source 来源对象
|
||||||
|
*/
|
||||||
|
public static JSONObject mergeJSON(JSONObject target, JSONObject source) {
|
||||||
|
for (String key : source.keySet()) {
|
||||||
|
Object sourceItem = source.get(key);
|
||||||
|
// 是否是 JSONObject
|
||||||
|
if (sourceItem instanceof Map) {
|
||||||
|
// target中存在此key
|
||||||
|
if (target.containsKey(key)) {
|
||||||
|
// 两个都是 JSONObject，继续合并
|
||||||
|
if (target.get(key) instanceof Map) {
|
||||||
|
CommonUtils.mergeJSON(target.getJSONObject(key), source.getJSONObject(key));
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// target不存在此key，或不是 JSONObject，则覆盖
|
||||||
|
target.put(key, sourceItem);
|
||||||
|
}
|
||||||
|
return target;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@ -1,5 +1,8 @@
|
|||||||
package org.jeecg.common.util;
|
package org.jeecg.common.util;
|
||||||
|
|
||||||
|
import org.jeecg.common.constant.SymbolConstant;
|
||||||
|
import org.springframework.util.StringUtils;
|
||||||
|
|
||||||
import java.beans.PropertyEditorSupport;
|
import java.beans.PropertyEditorSupport;
|
||||||
import java.sql.Timestamp;
|
import java.sql.Timestamp;
|
||||||
import java.text.DateFormat;
|
import java.text.DateFormat;
|
||||||
@ -9,9 +12,6 @@ import java.util.Calendar;
|
|||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
import java.util.GregorianCalendar;
|
import java.util.GregorianCalendar;
|
||||||
|
|
||||||
import org.jeecg.common.constant.SymbolConstant;
|
|
||||||
import org.springframework.util.StringUtils;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 类描述：时间操作定义类
|
* 类描述：时间操作定义类
|
||||||
*
|
*
|
||||||
@ -684,4 +684,80 @@ public class DateUtils extends PropertyEditorSupport {
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 判断两个时间是否是同一天
|
||||||
|
*
|
||||||
|
* @param date1
|
||||||
|
* @param date2
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
public static boolean isSameDay(Date date1, Date date2) {
|
||||||
|
if (date1 == null || date2 == null) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
Calendar calendar1 = Calendar.getInstance();
|
||||||
|
calendar1.setTime(date1);
|
||||||
|
Calendar calendar2 = Calendar.getInstance();
|
||||||
|
calendar2.setTime(date2);
|
||||||
|
boolean isSameYear = calendar1.get(Calendar.YEAR) == calendar2.get(Calendar.YEAR);
|
||||||
|
boolean isSameMonth = isSameYear && calendar1.get(Calendar.MONTH) == calendar2.get(Calendar.MONTH);
|
||||||
|
return isSameMonth && calendar1.get(Calendar.DAY_OF_MONTH) == calendar2.get(Calendar.DAY_OF_MONTH);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 判断两个时间是否是同一周
|
||||||
|
*
|
||||||
|
* @param date1
|
||||||
|
* @param date2
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
public static boolean isSameWeek(Date date1, Date date2) {
|
||||||
|
if (date1 == null || date2 == null) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
Calendar calendar1 = Calendar.getInstance();
|
||||||
|
calendar1.setTime(date1);
|
||||||
|
Calendar calendar2 = Calendar.getInstance();
|
||||||
|
calendar2.setTime(date2);
|
||||||
|
boolean isSameYear = calendar1.get(Calendar.YEAR) == calendar2.get(Calendar.YEAR);
|
||||||
|
return isSameYear && calendar1.get(Calendar.WEEK_OF_YEAR) == calendar2.get(Calendar.WEEK_OF_YEAR);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 判断两个时间是否是同一月
|
||||||
|
*
|
||||||
|
* @param date1
|
||||||
|
* @param date2
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
public static boolean isSameMonth(Date date1, Date date2) {
|
||||||
|
if (date1 == null || date2 == null) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
Calendar calendar1 = Calendar.getInstance();
|
||||||
|
calendar1.setTime(date1);
|
||||||
|
Calendar calendar2 = Calendar.getInstance();
|
||||||
|
calendar2.setTime(date2);
|
||||||
|
boolean isSameYear = calendar1.get(Calendar.YEAR) == calendar2.get(Calendar.YEAR);
|
||||||
|
return isSameYear && calendar1.get(Calendar.MONTH) == calendar2.get(Calendar.MONTH);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 判断两个时间是否是同一年
|
||||||
|
*
|
||||||
|
* @param date1
|
||||||
|
* @param date2
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
public static boolean isSameYear(Date date1, Date date2) {
|
||||||
|
if (date1 == null || date2 == null) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
Calendar calendar1 = Calendar.getInstance();
|
||||||
|
calendar1.setTime(date1);
|
||||||
|
Calendar calendar2 = Calendar.getInstance();
|
||||||
|
calendar2.setTime(date2);
|
||||||
|
return calendar1.get(Calendar.YEAR) == calendar2.get(Calendar.YEAR);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@ -9,15 +9,15 @@ import org.apache.commons.lang3.StringUtils;
|
|||||||
public enum DySmsEnum {
|
public enum DySmsEnum {
|
||||||
|
|
||||||
/**登录短信模板编码*/
|
/**登录短信模板编码*/
|
||||||
LOGIN_TEMPLATE_CODE("SMS_175435174","JEECG","code"),
|
LOGIN_TEMPLATE_CODE("SMS_175435174","敲敲云","code"),
|
||||||
/**忘记密码短信模板编码*/
|
/**忘记密码短信模板编码*/
|
||||||
FORGET_PASSWORD_TEMPLATE_CODE("SMS_175435174","JEECG","code"),
|
FORGET_PASSWORD_TEMPLATE_CODE("SMS_175435174","敲敲云","code"),
|
||||||
/**注册账号短信模板编码*/
|
/**注册账号短信模板编码*/
|
||||||
REGISTER_TEMPLATE_CODE("SMS_175430166","JEECG","code"),
|
REGISTER_TEMPLATE_CODE("SMS_175430166","敲敲云","code"),
|
||||||
/**会议通知*/
|
/**会议通知*/
|
||||||
MEET_NOTICE_TEMPLATE_CODE("SMS_201480469","H5活动之家","username,title,minute,time"),
|
MEET_NOTICE_TEMPLATE_CODE("SMS_201480469","JEECG","username,title,minute,time"),
|
||||||
/**我的计划通知*/
|
/**我的计划通知*/
|
||||||
PLAN_NOTICE_TEMPLATE_CODE("SMS_201470515","H5活动之家","username,title,time");
|
PLAN_NOTICE_TEMPLATE_CODE("SMS_201470515","JEECG","username,title,time");
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 短信模板编码
|
* 短信模板编码
|
||||||
|
|||||||
@ -62,6 +62,8 @@ public class DySmsHelper {
|
|||||||
|
|
||||||
//update-begin-author：taoyan date:20200811 for:配置类数据获取
|
//update-begin-author：taoyan date:20200811 for:配置类数据获取
|
||||||
StaticConfig staticConfig = SpringContextUtils.getBean(StaticConfig.class);
|
StaticConfig staticConfig = SpringContextUtils.getBean(StaticConfig.class);
|
||||||
|
logger.info("阿里大鱼短信秘钥 accessKeyId：" + staticConfig.getAccessKeyId());
|
||||||
|
logger.info("阿里大鱼短信秘钥 accessKeySecret："+ staticConfig.getAccessKeySecret());
|
||||||
setAccessKeyId(staticConfig.getAccessKeyId());
|
setAccessKeyId(staticConfig.getAccessKeyId());
|
||||||
setAccessKeySecret(staticConfig.getAccessKeySecret());
|
setAccessKeySecret(staticConfig.getAccessKeySecret());
|
||||||
//update-end-author：taoyan date:20200811 for:配置类数据获取
|
//update-end-author：taoyan date:20200811 for:配置类数据获取
|
||||||
|
|||||||
@ -21,7 +21,7 @@ public class PmsUtil {
|
|||||||
|
|
||||||
private static String uploadPath;
|
private static String uploadPath;
|
||||||
|
|
||||||
@Value("${jeecg.path.upload}")
|
@Value("${jeecg.path.upload:}")
|
||||||
public void setUploadPath(String uploadPath) {
|
public void setUploadPath(String uploadPath) {
|
||||||
PmsUtil.uploadPath = uploadPath;
|
PmsUtil.uploadPath = uploadPath;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -3,7 +3,6 @@ package org.jeecg.common.util;
|
|||||||
import com.alibaba.fastjson.JSONObject;
|
import com.alibaba.fastjson.JSONObject;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.apache.commons.lang3.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.jeecg.config.JeecgBaseConfig;
|
|
||||||
import org.springframework.http.*;
|
import org.springframework.http.*;
|
||||||
import org.springframework.http.client.SimpleClientHttpRequestFactory;
|
import org.springframework.http.client.SimpleClientHttpRequestFactory;
|
||||||
import org.springframework.http.converter.StringHttpMessageConverter;
|
import org.springframework.http.converter.StringHttpMessageConverter;
|
||||||
@ -22,8 +21,9 @@ import java.util.Map;
|
|||||||
public class RestUtil {
|
public class RestUtil {
|
||||||
|
|
||||||
private static String domain = null;
|
private static String domain = null;
|
||||||
|
private static String path = null;
|
||||||
public static String getDomain() {
|
|
||||||
|
private static String getDomain() {
|
||||||
if (domain == null) {
|
if (domain == null) {
|
||||||
domain = SpringContextUtils.getDomain();
|
domain = SpringContextUtils.getDomain();
|
||||||
// issues/2959
|
// issues/2959
|
||||||
@ -37,9 +37,7 @@ public class RestUtil {
|
|||||||
return domain;
|
return domain;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static String path = null;
|
private static String getPath() {
|
||||||
|
|
||||||
public static String getPath() {
|
|
||||||
if (path == null) {
|
if (path == null) {
|
||||||
path = SpringContextUtils.getApplicationContext().getEnvironment().getProperty("server.servlet.context-path");
|
path = SpringContextUtils.getApplicationContext().getEnvironment().getProperty("server.servlet.context-path");
|
||||||
}
|
}
|
||||||
@ -47,18 +45,7 @@ public class RestUtil {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static String getBaseUrl() {
|
public static String getBaseUrl() {
|
||||||
String basepath = null;
|
String basepath = getDomain() + getPath();
|
||||||
try {
|
|
||||||
basepath = getDomain() + getPath();
|
|
||||||
} catch (Exception e) {
|
|
||||||
log.warn(e.getMessage(),e);
|
|
||||||
}
|
|
||||||
|
|
||||||
//定时任务情况下，通过request是获取不到domain的，这种情况下通过配置获取pc后台域名
|
|
||||||
if(oConvertUtils.isEmpty(basepath)){
|
|
||||||
JeecgBaseConfig jeecgBaseConfig = SpringContextUtils.getBean(JeecgBaseConfig.class);
|
|
||||||
basepath = jeecgBaseConfig.getDomainUrl().getPc();
|
|
||||||
}
|
|
||||||
log.info(" RestUtil.getBaseUrl: " + basepath);
|
log.info(" RestUtil.getBaseUrl: " + basepath);
|
||||||
return basepath;
|
return basepath;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -3,6 +3,7 @@ package org.jeecg.common.util;
|
|||||||
import javax.servlet.http.HttpServletRequest;
|
import javax.servlet.http.HttpServletRequest;
|
||||||
import javax.servlet.http.HttpServletResponse;
|
import javax.servlet.http.HttpServletResponse;
|
||||||
|
|
||||||
|
import org.jeecg.common.constant.CommonConstant;
|
||||||
import org.jeecg.common.constant.ServiceNameConstants;
|
import org.jeecg.common.constant.ServiceNameConstants;
|
||||||
import org.springframework.beans.BeansException;
|
import org.springframework.beans.BeansException;
|
||||||
import org.springframework.context.ApplicationContext;
|
import org.springframework.context.ApplicationContext;
|
||||||
@ -56,12 +57,19 @@ public class SpringContextUtils implements ApplicationContextAware {
|
|||||||
public static String getDomain(){
|
public static String getDomain(){
|
||||||
HttpServletRequest request = getHttpServletRequest();
|
HttpServletRequest request = getHttpServletRequest();
|
||||||
StringBuffer url = request.getRequestURL();
|
StringBuffer url = request.getRequestURL();
|
||||||
//微服务情况下，获取gateway的basePath
|
//1.微服务情况下，获取gateway的basePath
|
||||||
String basePath = request.getHeader(ServiceNameConstants.X_GATEWAY_BASE_PATH);
|
String basePath = request.getHeader(ServiceNameConstants.X_GATEWAY_BASE_PATH);
|
||||||
if(oConvertUtils.isNotEmpty(basePath)){
|
if(oConvertUtils.isNotEmpty(basePath)){
|
||||||
return basePath;
|
return basePath;
|
||||||
}else{
|
}else{
|
||||||
return url.delete(url.length() - request.getRequestURI().length(), url.length()).toString();
|
String domain = url.delete(url.length() - request.getRequestURI().length(), url.length()).toString();
|
||||||
|
//2.【兼容】SSL认证之后，request.getScheme()获取不到https的问题
|
||||||
|
// https://blog.csdn.net/weixin_34376986/article/details/89767950
|
||||||
|
String scheme = request.getHeader(CommonConstant.X_FORWARDED_SCHEME);
|
||||||
|
if(scheme!=null && !request.getScheme().equals(scheme)){
|
||||||
|
domain = domain.replace(request.getScheme(),scheme);
|
||||||
|
}
|
||||||
|
return domain;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -21,7 +21,7 @@ public class SqlInjectionUtil {
|
|||||||
* （上线修改值 20200501，同步修改前端的盐值）
|
* （上线修改值 20200501，同步修改前端的盐值）
|
||||||
*/
|
*/
|
||||||
private final static String TABLE_DICT_SIGN_SALT = "20200501";
|
private final static String TABLE_DICT_SIGN_SALT = "20200501";
|
||||||
private final static String XSS_STR = "and |extractvalue|updatexml|exec |insert |select |delete |update |drop |count |chr |mid |master |truncate |char |declare |;|or |+|user()";
|
private final static String XSS_STR = "and |extractvalue|updatexml|geohash|gtid_subset|gtid_subtract|exec |insert |select |delete |update |drop |count |chr |mid |master |truncate |char |declare |;|or |+|user()";
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 正则 user() 匹配更严谨
|
* 正则 user() 匹配更严谨
|
||||||
@ -30,10 +30,15 @@ public class SqlInjectionUtil {
|
|||||||
/**正则 show tables*/
|
/**正则 show tables*/
|
||||||
private final static String SHOW_TABLES = "show\\s+tables";
|
private final static String SHOW_TABLES = "show\\s+tables";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* sleep函数
|
||||||
|
*/
|
||||||
|
private final static Pattern FUN_SLEEP = Pattern.compile("sleep\\([\\d\\.]*\\)");
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* sql注释的正则
|
* sql注释的正则
|
||||||
*/
|
*/
|
||||||
private final static Pattern SQL_ANNOTATION = Pattern.compile("/\\*.*\\*/");
|
private final static Pattern SQL_ANNOTATION = Pattern.compile("/\\*[\\s\\S]*\\*/");
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 针对表字典进行额外的sign签名校验（增加安全机制）
|
* 针对表字典进行额外的sign签名校验（增加安全机制）
|
||||||
@ -167,7 +172,7 @@ public class SqlInjectionUtil {
|
|||||||
*/
|
*/
|
||||||
//@Deprecated
|
//@Deprecated
|
||||||
public static void specialFilterContentForDictSql(String value) {
|
public static void specialFilterContentForDictSql(String value) {
|
||||||
String specialXssStr = " exec |extractvalue|updatexml| insert | select | delete | update | drop | count | chr | mid | master | truncate | char | declare |;|+|user()";
|
String specialXssStr = " exec |extractvalue|updatexml|geohash|gtid_subset|gtid_subtract| insert | select | delete | update | drop | count | chr | mid | master | truncate | char | declare |;|+|user()";
|
||||||
String[] xssArr = specialXssStr.split("\\|");
|
String[] xssArr = specialXssStr.split("\\|");
|
||||||
if (value == null || "".equals(value)) {
|
if (value == null || "".equals(value)) {
|
||||||
return;
|
return;
|
||||||
@ -201,7 +206,7 @@ public class SqlInjectionUtil {
|
|||||||
*/
|
*/
|
||||||
//@Deprecated
|
//@Deprecated
|
||||||
public static void specialFilterContentForOnlineReport(String value) {
|
public static void specialFilterContentForOnlineReport(String value) {
|
||||||
String specialXssStr = " exec |extractvalue|updatexml| insert | delete | update | drop | chr | mid | master | truncate | char | declare |user()";
|
String specialXssStr = " exec |extractvalue|updatexml|geohash|gtid_subset|gtid_subtract| insert | delete | update | drop | chr | mid | master | truncate | char | declare |user()";
|
||||||
String[] xssArr = specialXssStr.split("\\|");
|
String[] xssArr = specialXssStr.split("\\|");
|
||||||
if (value == null || "".equals(value)) {
|
if (value == null || "".equals(value)) {
|
||||||
return;
|
return;
|
||||||
@ -282,5 +287,13 @@ public class SqlInjectionUtil {
|
|||||||
log.error(error);
|
log.error(error);
|
||||||
throw new RuntimeException(error);
|
throw new RuntimeException(error);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// issues/4737 sys/duplicate/check SQL注入 #4737
|
||||||
|
Matcher sleepMatcher = FUN_SLEEP.matcher(str);
|
||||||
|
if(sleepMatcher.find()){
|
||||||
|
String error = "请注意，值可能存在SQL注入风险---> sleep";
|
||||||
|
log.error(error);
|
||||||
|
throw new RuntimeException(error);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -5,6 +5,7 @@ import org.apache.commons.lang3.StringUtils;
|
|||||||
import org.jeecg.common.api.CommonAPI;
|
import org.jeecg.common.api.CommonAPI;
|
||||||
import org.jeecg.common.constant.CacheConstant;
|
import org.jeecg.common.constant.CacheConstant;
|
||||||
import org.jeecg.common.constant.CommonConstant;
|
import org.jeecg.common.constant.CommonConstant;
|
||||||
|
import org.jeecg.common.constant.TenantConstant;
|
||||||
import org.jeecg.common.desensitization.util.SensitiveInfoUtil;
|
import org.jeecg.common.desensitization.util.SensitiveInfoUtil;
|
||||||
import org.jeecg.common.exception.JeecgBoot401Exception;
|
import org.jeecg.common.exception.JeecgBoot401Exception;
|
||||||
import org.jeecg.common.system.util.JwtUtil;
|
import org.jeecg.common.system.util.JwtUtil;
|
||||||
@ -34,6 +35,34 @@ public class TokenUtils {
|
|||||||
return token;
|
return token;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 获取 request 里传递的 tenantId (租户ID)
|
||||||
|
*
|
||||||
|
* @param request
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
public static String getTenantIdByRequest(HttpServletRequest request) {
|
||||||
|
String tenantId = request.getParameter(TenantConstant.TENANT_ID);
|
||||||
|
if (tenantId == null) {
|
||||||
|
tenantId = oConvertUtils.getString(request.getHeader(CommonConstant.TENANT_ID));
|
||||||
|
}
|
||||||
|
return tenantId;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 获取 request 里传递的 lowAppId (低代码应用ID)
|
||||||
|
*
|
||||||
|
* @param request
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
public static String getLowAppIdByRequest(HttpServletRequest request) {
|
||||||
|
String lowAppId = request.getParameter(TenantConstant.FIELD_LOW_APP_ID);
|
||||||
|
if (lowAppId == null) {
|
||||||
|
lowAppId = oConvertUtils.getString(request.getHeader(TenantConstant.X_LOW_APP_ID));
|
||||||
|
}
|
||||||
|
return lowAppId;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 验证Token
|
* 验证Token
|
||||||
*/
|
*/
|
||||||
|
|||||||
@ -1,19 +1,19 @@
|
|||||||
package org.jeecg.common.util.filter;
|
package org.jeecg.common.util.filter;
|
||||||
|
|
||||||
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.apache.commons.lang3.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.springframework.web.multipart.MultipartFile;
|
import org.springframework.web.multipart.MultipartFile;
|
||||||
|
|
||||||
import java.io.InputStream;
|
import java.io.InputStream;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.Iterator;
|
import java.util.Iterator;
|
||||||
import java.util.regex.Matcher;
|
|
||||||
import java.util.regex.Pattern;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @Description: 校验上传文件敏感后缀
|
* @Description: 校验上传文件敏感后缀
|
||||||
* @author: lsq
|
* @author: lsq
|
||||||
* @date: 2021年08月09日 15:29
|
* @date: 2021年08月09日 15:29
|
||||||
*/
|
*/
|
||||||
|
@Slf4j
|
||||||
public class FileTypeFilter {
|
public class FileTypeFilter {
|
||||||
|
|
||||||
/**文件后缀*/
|
/**文件后缀*/
|
||||||
@ -112,8 +112,9 @@ public class FileTypeFilter {
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
private static String getFileType(MultipartFile file) throws Exception {
|
private static String getFileType(MultipartFile file) throws Exception {
|
||||||
|
//update-begin-author:liusq date:20230404 for: [issue/4672]方法造成的文件被占用，注释掉此方法tomcat就能自动清理掉临时文件
|
||||||
String fileExtendName = null;
|
String fileExtendName = null;
|
||||||
InputStream is;
|
InputStream is = null;
|
||||||
try {
|
try {
|
||||||
//is = new FileInputStream(file);
|
//is = new FileInputStream(file);
|
||||||
is = file.getInputStream();
|
is = file.getInputStream();
|
||||||
@ -130,16 +131,29 @@ public class FileTypeFilter {
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
log.info("-----获取到的指定文件类型------"+fileExtendName);
|
||||||
// 如果不是上述类型，则判断扩展名
|
// 如果不是上述类型，则判断扩展名
|
||||||
if (StringUtils.isBlank(fileExtendName)) {
|
if (StringUtils.isBlank(fileExtendName)) {
|
||||||
String fileName = file.getOriginalFilename();
|
String fileName = file.getOriginalFilename();
|
||||||
|
// 如果无扩展名，则直接返回空串
|
||||||
|
if (-1 == fileName.indexOf(".")) {
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
// 如果有扩展名，则返回扩展名
|
||||||
return getFileTypeBySuffix(fileName);
|
return getFileTypeBySuffix(fileName);
|
||||||
}
|
}
|
||||||
|
log.info("-----最終的文件类型------"+fileExtendName);
|
||||||
is.close();
|
is.close();
|
||||||
return fileExtendName;
|
return fileExtendName;
|
||||||
} catch (Exception exception) {
|
} catch (Exception e) {
|
||||||
throw new Exception(exception.getMessage(), exception);
|
log.error(e.getMessage(), e);
|
||||||
|
return "";
|
||||||
|
}finally {
|
||||||
|
if (is != null) {
|
||||||
|
is.close();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
//update-end-author:liusq date:20230404 for: [issue/4672]方法造成的文件被占用，注释掉此方法tomcat就能自动清理掉临时文件
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@ -1,5 +1,6 @@
|
|||||||
package org.jeecg.common.util;
|
package org.jeecg.common.util;
|
||||||
|
|
||||||
|
import com.alibaba.fastjson.JSONArray;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.apache.commons.io.IOUtils;
|
import org.apache.commons.io.IOUtils;
|
||||||
import org.jeecg.common.constant.CommonConstant;
|
import org.jeecg.common.constant.CommonConstant;
|
||||||
@ -86,7 +87,7 @@ public class oConvertUtils {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static int getInt(String s, int defval) {
|
public static int getInt(String s, int defval) {
|
||||||
if (s == null || s == "") {
|
if (s == null || "".equals(s)) {
|
||||||
return (defval);
|
return (defval);
|
||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
@ -97,7 +98,7 @@ public class oConvertUtils {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static int getInt(String s) {
|
public static int getInt(String s) {
|
||||||
if (s == null || s == "") {
|
if (s == null || "".equals(s)) {
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
@ -108,7 +109,7 @@ public class oConvertUtils {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static int getInt(String s, Integer df) {
|
public static int getInt(String s, Integer df) {
|
||||||
if (s == null || s == "") {
|
if (s == null || "".equals(s)) {
|
||||||
return df;
|
return df;
|
||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
@ -131,7 +132,7 @@ public class oConvertUtils {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static double getDouble(String s, double defval) {
|
public static double getDouble(String s, double defval) {
|
||||||
if (s == null || s == "") {
|
if (s == null || "".equals(s)) {
|
||||||
return (defval);
|
return (defval);
|
||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
@ -353,23 +354,63 @@ public class oConvertUtils {
|
|||||||
/**
|
/**
|
||||||
* 判断元素是否在数组内
|
* 判断元素是否在数组内
|
||||||
*
|
*
|
||||||
* @param substring
|
* @param child
|
||||||
* @param source
|
* @param all
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public static boolean isIn(String substring, String[] source) {
|
public static boolean isIn(String child, String[] all) {
|
||||||
if (source == null || source.length == 0) {
|
if (all == null || all.length == 0) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
for (int i = 0; i < source.length; i++) {
|
for (int i = 0; i < all.length; i++) {
|
||||||
String aSource = source[i];
|
String aSource = all[i];
|
||||||
if (aSource.equals(substring)) {
|
if (aSource.equals(child)) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 判断元素是否在数组内
|
||||||
|
*
|
||||||
|
* @param childArray
|
||||||
|
* @param all
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
public static boolean isArrayIn(String[] childArray, String[] all) {
|
||||||
|
if (all == null || all.length == 0) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
for (String v : childArray) {
|
||||||
|
if (!isIn(v, all)) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 判断元素是否在数组内
|
||||||
|
*
|
||||||
|
* @param childArray
|
||||||
|
* @param all
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
public static boolean isJsonArrayIn(JSONArray childArray, String[] all) {
|
||||||
|
if (all == null || all.length == 0) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
String[] childs = childArray.toArray(new String[]{});
|
||||||
|
for (String v : childs) {
|
||||||
|
if (!isIn(v, all)) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 获取Map对象
|
* 获取Map对象
|
||||||
*/
|
*/
|
||||||
@ -649,6 +690,95 @@ public class oConvertUtils {
|
|||||||
return (list == null || list.size() == 0);
|
return (list == null || list.size() == 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 判断旧值与新值 是否相等
|
||||||
|
*
|
||||||
|
* @param oldVal
|
||||||
|
* @param newVal
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
public static boolean isEqual(Object oldVal, Object newVal) {
|
||||||
|
if (oldVal != null && newVal != null) {
|
||||||
|
if (isArray(oldVal)) {
|
||||||
|
return equalityOfArrays((Object[]) oldVal, (Object[]) newVal);
|
||||||
|
}else if(oldVal instanceof JSONArray){
|
||||||
|
return equalityOfJSONArray((JSONArray) oldVal, (JSONArray) newVal);
|
||||||
|
}
|
||||||
|
return oldVal.equals(newVal);
|
||||||
|
} else {
|
||||||
|
if (oldVal == null && newVal == null) {
|
||||||
|
return true;
|
||||||
|
} else {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 方法描述 判断一个对象是否是一个数组
|
||||||
|
*
|
||||||
|
* @param obj
|
||||||
|
* @return
|
||||||
|
* @author yaomy
|
||||||
|
* @date 2018年2月5日 下午5:03:00
|
||||||
|
*/
|
||||||
|
public static boolean isArray(Object obj) {
|
||||||
|
if (obj == null) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
return obj.getClass().isArray();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 判断两个数组是否相等（数组元素不分顺序）
|
||||||
|
*
|
||||||
|
* @param oldVal
|
||||||
|
* @param newVal
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
public static boolean equalityOfJSONArray(JSONArray oldVal, JSONArray newVal) {
|
||||||
|
if (oldVal != null && newVal != null) {
|
||||||
|
Object[] oldValArray = oldVal.toArray();
|
||||||
|
Object[] newValArray = newVal.toArray();
|
||||||
|
return equalityOfArrays(oldValArray,newValArray);
|
||||||
|
} else {
|
||||||
|
if (oldVal == null && newVal == null) {
|
||||||
|
return true;
|
||||||
|
} else {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 判断两个数组是否相等（数组元素不分顺序）
|
||||||
|
*
|
||||||
|
* @param oldVal
|
||||||
|
* @param newVal
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
public static boolean equalityOfArrays(Object[] oldVal, Object newVal[]) {
|
||||||
|
if (oldVal != null && newVal != null) {
|
||||||
|
Arrays.sort(oldVal);
|
||||||
|
Arrays.sort(newVal);
|
||||||
|
return Arrays.equals(oldVal, newVal);
|
||||||
|
} else {
|
||||||
|
if (oldVal == null && newVal == null) {
|
||||||
|
return true;
|
||||||
|
} else {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// public static void main(String[] args) {
|
||||||
|
//// String[] a = new String[]{"1", "2"};
|
||||||
|
//// String[] b = new String[]{"2", "1"};
|
||||||
|
// Integer a = null;
|
||||||
|
// Integer b = 1;
|
||||||
|
// System.out.println(oConvertUtils.isEqual(a, b));
|
||||||
|
// }
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 判断 list 是否不为空
|
* 判断 list 是否不为空
|
||||||
*
|
*
|
||||||
|
|||||||
@ -7,7 +7,7 @@ import com.aliyun.oss.model.CannedAccessControlList;
|
|||||||
import com.aliyun.oss.model.OSSObject;
|
import com.aliyun.oss.model.OSSObject;
|
||||||
import com.aliyun.oss.model.PutObjectResult;
|
import com.aliyun.oss.model.PutObjectResult;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.apache.tomcat.util.http.fileupload.FileItemStream;
|
import org.apache.commons.fileupload.FileItemStream;
|
||||||
import org.jeecg.common.constant.CommonConstant;
|
import org.jeecg.common.constant.CommonConstant;
|
||||||
import org.jeecg.common.constant.SymbolConstant;
|
import org.jeecg.common.constant.SymbolConstant;
|
||||||
import org.jeecg.common.util.CommonUtils;
|
import org.jeecg.common.util.CommonUtils;
|
||||||
@ -20,6 +20,7 @@ import java.io.BufferedInputStream;
|
|||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.io.InputStream;
|
import java.io.InputStream;
|
||||||
import java.net.URL;
|
import java.net.URL;
|
||||||
|
import java.net.URLDecoder;
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
|
|
||||||
@ -141,10 +142,10 @@ public class OssBootUtil {
|
|||||||
log.info("------OSS文件上传成功------" + fileUrl);
|
log.info("------OSS文件上传成功------" + fileUrl);
|
||||||
}
|
}
|
||||||
} catch (IOException e) {
|
} catch (IOException e) {
|
||||||
e.printStackTrace();
|
log.error(e.getMessage(),e);
|
||||||
return null;
|
return null;
|
||||||
}catch (Exception e) {
|
}catch (Exception e) {
|
||||||
e.printStackTrace();
|
log.error(e.getMessage(),e);
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
return filePath;
|
return filePath;
|
||||||
|
|||||||
@ -3,6 +3,8 @@ package org.jeecg.common.util.security;
|
|||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
|
import java.util.regex.Matcher;
|
||||||
|
import java.util.regex.Pattern;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 查询表/字段 黑名单处理
|
* 查询表/字段 黑名单处理
|
||||||
@ -21,6 +23,11 @@ public abstract class AbstractQueryBlackListHandler {
|
|||||||
*/
|
*/
|
||||||
public static Map<String, String> ruleMap = new HashMap<>();
|
public static Map<String, String> ruleMap = new HashMap<>();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 以下字符不能出现在表名中或是字段名中
|
||||||
|
*/
|
||||||
|
public static final Pattern ILLEGAL_NAME_REG = Pattern.compile("[-]{2,}");
|
||||||
|
|
||||||
static {
|
static {
|
||||||
ruleMap.put("sys_user", "password,salt");
|
ruleMap.put("sys_user", "password,salt");
|
||||||
}
|
}
|
||||||
@ -53,7 +60,10 @@ public abstract class AbstractQueryBlackListHandler {
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
log.info("--获取sql信息--", list.toString());
|
log.info("--获取sql信息--", list.toString());
|
||||||
boolean flag = true;
|
boolean flag = checkTableAndFieldsName(list);
|
||||||
|
if(flag == false){
|
||||||
|
return false;
|
||||||
|
}
|
||||||
for (QueryTable table : list) {
|
for (QueryTable table : list) {
|
||||||
String name = table.getName();
|
String name = table.getName();
|
||||||
String fieldString = ruleMap.get(name);
|
String fieldString = ruleMap.get(name);
|
||||||
@ -73,6 +83,46 @@ public abstract class AbstractQueryBlackListHandler {
|
|||||||
return flag;
|
return flag;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 校验表名和字段名是否有效，或是是否会带些特殊的字符串进行sql注入
|
||||||
|
* issues/4983 SQL Injection in 3.5.1 #4983
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
private boolean checkTableAndFieldsName(List<QueryTable> list){
|
||||||
|
boolean flag = true;
|
||||||
|
for(QueryTable queryTable: list){
|
||||||
|
String tableName = queryTable.getName();
|
||||||
|
if(hasSpecialString(tableName)){
|
||||||
|
flag = false;
|
||||||
|
log.warn("sql黑名单校验，表名【"+tableName+"】包含特殊字符");
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
Set<String> fields = queryTable.getFields();
|
||||||
|
for(String name: fields){
|
||||||
|
if(hasSpecialString(name)){
|
||||||
|
flag = false;
|
||||||
|
log.warn("sql黑名单校验，字段名【"+name+"】包含特殊字符");
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return flag;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 是否包含特殊的字符串
|
||||||
|
* @param name
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
private boolean hasSpecialString(String name){
|
||||||
|
Matcher m = ILLEGAL_NAME_REG.matcher(name);
|
||||||
|
if (m.find()) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 查询的表的信息
|
* 查询的表的信息
|
||||||
*/
|
*/
|
||||||
|
|||||||
@ -1,6 +1,7 @@
|
|||||||
package org.jeecg.config;
|
package org.jeecg.config;
|
||||||
|
|
||||||
import org.jeecg.config.vo.DomainUrl;
|
import org.jeecg.config.vo.DomainUrl;
|
||||||
|
import org.jeecg.config.vo.Elasticsearch;
|
||||||
import org.jeecg.config.vo.Path;
|
import org.jeecg.config.vo.Path;
|
||||||
import org.jeecg.config.vo.Shiro;
|
import org.jeecg.config.vo.Shiro;
|
||||||
import org.springframework.boot.context.properties.ConfigurationProperties;
|
import org.springframework.boot.context.properties.ConfigurationProperties;
|
||||||
@ -52,6 +53,18 @@ public class JeecgBaseConfig {
|
|||||||
* 文件预览
|
* 文件预览
|
||||||
*/
|
*/
|
||||||
private String fileViewDomain;
|
private String fileViewDomain;
|
||||||
|
/**
|
||||||
|
* ES配置
|
||||||
|
*/
|
||||||
|
private Elasticsearch elasticsearch;
|
||||||
|
|
||||||
|
public Elasticsearch getElasticsearch() {
|
||||||
|
return elasticsearch;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setElasticsearch(Elasticsearch elasticsearch) {
|
||||||
|
this.elasticsearch = elasticsearch;
|
||||||
|
}
|
||||||
|
|
||||||
public Boolean getSafeMode() {
|
public Boolean getSafeMode() {
|
||||||
return safeMode;
|
return safeMode;
|
||||||
@ -108,4 +121,12 @@ public class JeecgBaseConfig {
|
|||||||
public void setFileViewDomain(String fileViewDomain) {
|
public void setFileViewDomain(String fileViewDomain) {
|
||||||
this.fileViewDomain = fileViewDomain;
|
this.fileViewDomain = fileViewDomain;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public String getUploadType() {
|
||||||
|
return uploadType;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setUploadType(String uploadType) {
|
||||||
|
this.uploadType = uploadType;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -12,13 +12,13 @@ import org.springframework.stereotype.Component;
|
|||||||
@Data
|
@Data
|
||||||
public class StaticConfig {
|
public class StaticConfig {
|
||||||
|
|
||||||
@Value("${jeecg.oss.accessKey}")
|
@Value("${jeecg.oss.accessKey:}")
|
||||||
private String accessKeyId;
|
private String accessKeyId;
|
||||||
|
|
||||||
@Value("${jeecg.oss.secretKey}")
|
@Value("${jeecg.oss.secretKey:}")
|
||||||
private String accessKeySecret;
|
private String accessKeySecret;
|
||||||
|
|
||||||
@Value(value = "${spring.mail.username}")
|
@Value(value = "${spring.mail.username:}")
|
||||||
private String emailFrom;
|
private String emailFrom;
|
||||||
|
|
||||||
// /**
|
// /**
|
||||||
|
|||||||
@ -116,7 +116,7 @@ public class Swagger2Config implements WebMvcConfigurer {
|
|||||||
// 描述
|
// 描述
|
||||||
.description("后台API接口")
|
.description("后台API接口")
|
||||||
// 作者
|
// 作者
|
||||||
.contact(new Contact("北京国炬信息技术有限公司","www.jeccg.com","jeecgos@163.com"))
|
.contact(new Contact("北京敲敲云科技有限公司","www.jeccg.com","jeecgos@163.com"))
|
||||||
.license("The Apache License, Version 2.0")
|
.license("The Apache License, Version 2.0")
|
||||||
.licenseUrl("http://www.apache.org/licenses/LICENSE-2.0.html")
|
.licenseUrl("http://www.apache.org/licenses/LICENSE-2.0.html")
|
||||||
.build();
|
.build();
|
||||||
|
|||||||
@ -25,6 +25,7 @@ import org.springframework.http.converter.json.MappingJackson2HttpMessageConvert
|
|||||||
import org.springframework.web.cors.CorsConfiguration;
|
import org.springframework.web.cors.CorsConfiguration;
|
||||||
import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
|
import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
|
||||||
import org.springframework.web.filter.CorsFilter;
|
import org.springframework.web.filter.CorsFilter;
|
||||||
|
import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistration;
|
||||||
import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
|
import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
|
||||||
import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
|
import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
|
||||||
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
|
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
|
||||||
@ -59,12 +60,13 @@ public class WebMvcConfiguration implements WebMvcConfigurer {
|
|||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public void addResourceHandlers(ResourceHandlerRegistry registry) {
|
public void addResourceHandlers(ResourceHandlerRegistry registry) {
|
||||||
registry.addResourceHandler("/**")
|
ResourceHandlerRegistration resourceHandlerRegistration = registry.addResourceHandler("/**");
|
||||||
//update-begin-author:taoyan date:20211116 for: jeecg.path.webapp配置无效 #3126
|
if (jeecgBaseConfig.getPath() != null && jeecgBaseConfig.getPath().getUpload() != null) {
|
||||||
.addResourceLocations("file:" + jeecgBaseConfig.getPath().getUpload() + "//")
|
resourceHandlerRegistration
|
||||||
.addResourceLocations("file:" + jeecgBaseConfig.getPath().getWebapp() + "//")
|
.addResourceLocations("file:" + jeecgBaseConfig.getPath().getUpload() + "//")
|
||||||
//update-end-author:taoyan date:20211116 for: jeecg.path.webapp配置无效 #3126
|
.addResourceLocations("file:" + jeecgBaseConfig.getPath().getWebapp() + "//");
|
||||||
.addResourceLocations(staticLocations.split(","));
|
}
|
||||||
|
resourceHandlerRegistration.addResourceLocations(staticLocations.split(","));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@ -31,7 +31,7 @@ public class WebSocketConfig {
|
|||||||
FilterRegistrationBean bean = new FilterRegistrationBean();
|
FilterRegistrationBean bean = new FilterRegistrationBean();
|
||||||
bean.setFilter(websocketFilter());
|
bean.setFilter(websocketFilter());
|
||||||
//TODO 临时注释掉，测试下线上socket总断的问题
|
//TODO 临时注释掉，测试下线上socket总断的问题
|
||||||
bean.addUrlPatterns("/websocket/*","/eoaSocket/*", "/newsWebsocket/*", "/vxeSocket/*");
|
bean.addUrlPatterns("/websocket/*","/eoaSocket/*","/eoaNewChatSocket/*", "/newsWebsocket/*", "/vxeSocket/*");
|
||||||
return bean;
|
return bean;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -7,6 +7,8 @@ import org.apache.ibatis.mapping.MappedStatement;
|
|||||||
import org.apache.ibatis.mapping.SqlCommandType;
|
import org.apache.ibatis.mapping.SqlCommandType;
|
||||||
import org.apache.ibatis.plugin.*;
|
import org.apache.ibatis.plugin.*;
|
||||||
import org.apache.shiro.SecurityUtils;
|
import org.apache.shiro.SecurityUtils;
|
||||||
|
import org.jeecg.common.config.TenantContext;
|
||||||
|
import org.jeecg.common.constant.TenantConstant;
|
||||||
import org.jeecg.common.system.vo.LoginUser;
|
import org.jeecg.common.system.vo.LoginUser;
|
||||||
import org.jeecg.common.util.oConvertUtils;
|
import org.jeecg.common.util.oConvertUtils;
|
||||||
import org.springframework.stereotype.Component;
|
import org.springframework.stereotype.Component;
|
||||||
@ -82,6 +84,23 @@ public class MybatisInterceptor implements Interceptor {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//------------------------------------------------------------------------------------------------
|
||||||
|
//注入租户ID（是否开启系统管理模块的多租户数据隔离【SAAS多租户模式】）
|
||||||
|
if(MybatisPlusSaasConfig.OPEN_SYSTEM_TENANT_CONTROL) {
|
||||||
|
if (TenantConstant.TENANT_ID.equals(field.getName())) {
|
||||||
|
field.setAccessible(true);
|
||||||
|
Object localTenantId = field.get(parameter);
|
||||||
|
field.setAccessible(false);
|
||||||
|
if (localTenantId == null) {
|
||||||
|
field.setAccessible(true);
|
||||||
|
field.set(parameter, oConvertUtils.getInt(TenantContext.getTenant(),0));
|
||||||
|
field.setAccessible(false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
//------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -5,8 +5,12 @@ import java.util.List;
|
|||||||
|
|
||||||
import cn.hutool.core.util.ObjectUtil;
|
import cn.hutool.core.util.ObjectUtil;
|
||||||
import com.baomidou.mybatisplus.extension.plugins.inner.DynamicTableNameInnerInterceptor;
|
import com.baomidou.mybatisplus.extension.plugins.inner.DynamicTableNameInnerInterceptor;
|
||||||
|
import com.baomidou.mybatisplus.extension.plugins.inner.OptimisticLockerInnerInterceptor;
|
||||||
import org.jeecg.common.config.TenantContext;
|
import org.jeecg.common.config.TenantContext;
|
||||||
import org.jeecg.common.constant.CommonConstant;
|
import org.jeecg.common.constant.CommonConstant;
|
||||||
|
import org.jeecg.common.constant.TenantConstant;
|
||||||
|
import org.jeecg.common.util.SpringContextUtils;
|
||||||
|
import org.jeecg.common.util.TokenUtils;
|
||||||
import org.jeecg.common.util.oConvertUtils;
|
import org.jeecg.common.util.oConvertUtils;
|
||||||
import org.mybatis.spring.annotation.MapperScan;
|
import org.mybatis.spring.annotation.MapperScan;
|
||||||
import org.springframework.context.annotation.Bean;
|
import org.springframework.context.annotation.Bean;
|
||||||
@ -28,22 +32,41 @@ import net.sf.jsqlparser.expression.LongValue;
|
|||||||
@Configuration
|
@Configuration
|
||||||
@MapperScan(value={"org.jeecg.modules.**.mapper*"})
|
@MapperScan(value={"org.jeecg.modules.**.mapper*"})
|
||||||
public class MybatisPlusSaasConfig {
|
public class MybatisPlusSaasConfig {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* tenant_id 字段名
|
* 是否开启系统模块的租户隔离
|
||||||
|
* 控制范围：用户、角色、部门、我的部门、字典、分类字典、多数据源、职务、通知公告
|
||||||
|
*
|
||||||
|
* 实现功能
|
||||||
|
* 1.用户表通过硬编码实现租户ID隔离
|
||||||
|
* 2.角色、部门、我的部门、字典、分类字典、多数据源、职务、通知公告除了硬编码还加入的 TENANT_TABLE 配置中，实现租户隔离更安全
|
||||||
|
* 3.菜单表、租户表不做租户隔离
|
||||||
|
* 4.通过拦截器MybatisInterceptor实现，增删改查数据 自动注入租户ID
|
||||||
*/
|
*/
|
||||||
private static final String TENANT_FIELD_NAME = "tenant_id";
|
public static final Boolean OPEN_SYSTEM_TENANT_CONTROL = false;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 哪些表需要做多租户 表需要添加一个字段 tenant_id
|
* 哪些表需要做多租户 表需要添加一个字段 tenant_id
|
||||||
*/
|
*/
|
||||||
private static final List<String> TENANT_TABLE = new ArrayList<String>();
|
public static final List<String> TENANT_TABLE = new ArrayList<String>();
|
||||||
|
|
||||||
static {
|
static {
|
||||||
TENANT_TABLE.add("demo");
|
//1.需要租户隔离的表请在此配置
|
||||||
|
if (MybatisPlusSaasConfig.OPEN_SYSTEM_TENANT_CONTROL) {
|
||||||
|
//a.系统管理表
|
||||||
|
//TENANT_TABLE.add("sys_role");
|
||||||
|
//TENANT_TABLE.add("sys_user_role");
|
||||||
|
TENANT_TABLE.add("sys_depart");
|
||||||
|
TENANT_TABLE.add("sys_category");
|
||||||
|
TENANT_TABLE.add("sys_data_source");
|
||||||
|
TENANT_TABLE.add("sys_position");
|
||||||
|
//TENANT_TABLE.add("sys_announcement");
|
||||||
|
}
|
||||||
|
|
||||||
// //角色、菜单、部门
|
//2.示例测试
|
||||||
// tenantTable.add("sys_role");
|
//TENANT_TABLE.add("demo");
|
||||||
// tenantTable.add("sys_permission");
|
//3.online租户隔离测试
|
||||||
// tenantTable.add("sys_depart");
|
//TENANT_TABLE.add("ceapp_issue");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -54,13 +77,24 @@ public class MybatisPlusSaasConfig {
|
|||||||
interceptor.addInnerInterceptor(new TenantLineInnerInterceptor(new TenantLineHandler() {
|
interceptor.addInnerInterceptor(new TenantLineInnerInterceptor(new TenantLineHandler() {
|
||||||
@Override
|
@Override
|
||||||
public Expression getTenantId() {
|
public Expression getTenantId() {
|
||||||
String tenantId = oConvertUtils.getString(TenantContext.getTenant(),"0");
|
String tenantId = TenantContext.getTenant();
|
||||||
|
//如果通过线程获取租户ID为空，则通过当前请求的request获取租户（shiro排除拦截器的请求会获取不到租户ID）
|
||||||
|
if(oConvertUtils.isEmpty(tenantId)){
|
||||||
|
try {
|
||||||
|
tenantId = TokenUtils.getTenantIdByRequest(SpringContextUtils.getHttpServletRequest());
|
||||||
|
} catch (Exception e) {
|
||||||
|
//e.printStackTrace();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if(oConvertUtils.isEmpty(tenantId)){
|
||||||
|
tenantId = "0";
|
||||||
|
}
|
||||||
return new LongValue(tenantId);
|
return new LongValue(tenantId);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getTenantIdColumn(){
|
public String getTenantIdColumn(){
|
||||||
return TENANT_FIELD_NAME;
|
return TenantConstant.TENANT_ID_TABLE;
|
||||||
}
|
}
|
||||||
|
|
||||||
// 返回 true 表示不走租户逻辑
|
// 返回 true 表示不走租户逻辑
|
||||||
@ -74,10 +108,12 @@ public class MybatisPlusSaasConfig {
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}));
|
}));
|
||||||
interceptor.addInnerInterceptor(new PaginationInnerInterceptor());
|
|
||||||
//update-begin-author:zyf date:20220425 for:【VUEN-606】注入动态表名适配拦截器解决多表名问题
|
//update-begin-author:zyf date:20220425 for:【VUEN-606】注入动态表名适配拦截器解决多表名问题
|
||||||
interceptor.addInnerInterceptor(dynamicTableNameInnerInterceptor());
|
interceptor.addInnerInterceptor(dynamicTableNameInnerInterceptor());
|
||||||
//update-end-author:zyf date:20220425 for:【VUEN-606】注入动态表名适配拦截器解决多表名问题
|
//update-end-author:zyf date:20220425 for:【VUEN-606】注入动态表名适配拦截器解决多表名问题
|
||||||
|
interceptor.addInnerInterceptor(new PaginationInnerInterceptor());
|
||||||
|
//【jeecg-boot/issues/3847】增加@Version乐观锁支持
|
||||||
|
interceptor.addInnerInterceptor(new OptimisticLockerInnerInterceptor());
|
||||||
return interceptor;
|
return interceptor;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -5,6 +5,7 @@ import org.jeecg.common.constant.CommonConstant;
|
|||||||
import org.jeecg.common.constant.SymbolConstant;
|
import org.jeecg.common.constant.SymbolConstant;
|
||||||
import org.jeecg.common.util.MinioUtil;
|
import org.jeecg.common.util.MinioUtil;
|
||||||
import org.springframework.beans.factory.annotation.Value;
|
import org.springframework.beans.factory.annotation.Value;
|
||||||
|
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
|
||||||
import org.springframework.context.annotation.Bean;
|
import org.springframework.context.annotation.Bean;
|
||||||
import org.springframework.context.annotation.Configuration;
|
import org.springframework.context.annotation.Configuration;
|
||||||
|
|
||||||
@ -14,6 +15,7 @@ import org.springframework.context.annotation.Configuration;
|
|||||||
*/
|
*/
|
||||||
@Slf4j
|
@Slf4j
|
||||||
@Configuration
|
@Configuration
|
||||||
|
@ConditionalOnProperty(prefix = "jeecg.minio", name = "minio_url")
|
||||||
public class MinioConfig {
|
public class MinioConfig {
|
||||||
@Value(value = "${jeecg.minio.minio_url}")
|
@Value(value = "${jeecg.minio.minio_url}")
|
||||||
private String minioUrl;
|
private String minioUrl;
|
||||||
|
|||||||
@ -2,6 +2,7 @@ package org.jeecg.config.oss;
|
|||||||
|
|
||||||
import org.jeecg.common.util.oss.OssBootUtil;
|
import org.jeecg.common.util.oss.OssBootUtil;
|
||||||
import org.springframework.beans.factory.annotation.Value;
|
import org.springframework.beans.factory.annotation.Value;
|
||||||
|
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
|
||||||
import org.springframework.context.annotation.Bean;
|
import org.springframework.context.annotation.Bean;
|
||||||
import org.springframework.context.annotation.Configuration;
|
import org.springframework.context.annotation.Configuration;
|
||||||
|
|
||||||
@ -10,6 +11,7 @@ import org.springframework.context.annotation.Configuration;
|
|||||||
* @author: jeecg-boot
|
* @author: jeecg-boot
|
||||||
*/
|
*/
|
||||||
@Configuration
|
@Configuration
|
||||||
|
@ConditionalOnProperty(prefix = "jeecg.oss", name = "endpoint")
|
||||||
public class OssConfiguration {
|
public class OssConfiguration {
|
||||||
|
|
||||||
@Value("${jeecg.oss.endpoint}")
|
@Value("${jeecg.oss.endpoint}")
|
||||||
|
|||||||
@ -20,7 +20,6 @@ import org.jeecg.config.shiro.filters.CustomShiroFilterFactoryBean;
|
|||||||
import org.jeecg.config.shiro.filters.JwtFilter;
|
import org.jeecg.config.shiro.filters.JwtFilter;
|
||||||
import org.springframework.aop.framework.autoproxy.DefaultAdvisorAutoProxyCreator;
|
import org.springframework.aop.framework.autoproxy.DefaultAdvisorAutoProxyCreator;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.beans.factory.annotation.Value;
|
|
||||||
import org.springframework.context.annotation.Bean;
|
import org.springframework.context.annotation.Bean;
|
||||||
import org.springframework.context.annotation.Configuration;
|
import org.springframework.context.annotation.Configuration;
|
||||||
import org.springframework.context.annotation.DependsOn;
|
import org.springframework.context.annotation.DependsOn;
|
||||||
@ -111,19 +110,16 @@ public class ShiroConfig {
|
|||||||
filterChainDefinitionMap.put("/**/*.png", "anon");
|
filterChainDefinitionMap.put("/**/*.png", "anon");
|
||||||
filterChainDefinitionMap.put("/**/*.gif", "anon");
|
filterChainDefinitionMap.put("/**/*.gif", "anon");
|
||||||
filterChainDefinitionMap.put("/**/*.ico", "anon");
|
filterChainDefinitionMap.put("/**/*.ico", "anon");
|
||||||
|
|
||||||
// update-begin--Author:sunjianlei Date:20190813 for：排除字体格式的后缀
|
|
||||||
filterChainDefinitionMap.put("/**/*.ttf", "anon");
|
filterChainDefinitionMap.put("/**/*.ttf", "anon");
|
||||||
filterChainDefinitionMap.put("/**/*.woff", "anon");
|
filterChainDefinitionMap.put("/**/*.woff", "anon");
|
||||||
filterChainDefinitionMap.put("/**/*.woff2", "anon");
|
filterChainDefinitionMap.put("/**/*.woff2", "anon");
|
||||||
// update-begin--Author:sunjianlei Date:20190813 for：排除字体格式的后缀
|
|
||||||
|
|
||||||
filterChainDefinitionMap.put("/druid/**", "anon");
|
filterChainDefinitionMap.put("/druid/**", "anon");
|
||||||
filterChainDefinitionMap.put("/swagger-ui.html", "anon");
|
filterChainDefinitionMap.put("/swagger-ui.html", "anon");
|
||||||
filterChainDefinitionMap.put("/swagger**/**", "anon");
|
filterChainDefinitionMap.put("/swagger**/**", "anon");
|
||||||
filterChainDefinitionMap.put("/webjars/**", "anon");
|
filterChainDefinitionMap.put("/webjars/**", "anon");
|
||||||
filterChainDefinitionMap.put("/v2/**", "anon");
|
filterChainDefinitionMap.put("/v2/**", "anon");
|
||||||
|
|
||||||
filterChainDefinitionMap.put("/sys/annountCement/show/**", "anon");
|
filterChainDefinitionMap.put("/sys/annountCement/show/**", "anon");
|
||||||
|
|
||||||
//积木报表排除
|
//积木报表排除
|
||||||
@ -144,13 +140,16 @@ public class ShiroConfig {
|
|||||||
filterChainDefinitionMap.put("/newsWebsocket/**", "anon");//CMS模块
|
filterChainDefinitionMap.put("/newsWebsocket/**", "anon");//CMS模块
|
||||||
filterChainDefinitionMap.put("/vxeSocket/**", "anon");//JVxeTable无痕刷新示例
|
filterChainDefinitionMap.put("/vxeSocket/**", "anon");//JVxeTable无痕刷新示例
|
||||||
|
|
||||||
|
//性能监控——安全隐患泄露TOEKN（durid连接池也有）
|
||||||
//性能监控，放开排除会存在安全漏洞泄露TOEKN（durid连接池也有）
|
|
||||||
//filterChainDefinitionMap.put("/actuator/**", "anon");
|
//filterChainDefinitionMap.put("/actuator/**", "anon");
|
||||||
|
|
||||||
//测试模块排除
|
//测试模块排除
|
||||||
filterChainDefinitionMap.put("/test/seata/**", "anon");
|
filterChainDefinitionMap.put("/test/seata/**", "anon");
|
||||||
|
|
||||||
|
// update-begin--author:liusq Date:20230522 for：[issues/4829]访问不存在的url时会提示Token失效，请重新登录呢
|
||||||
|
//错误路径排除
|
||||||
|
filterChainDefinitionMap.put("/error", "anon");
|
||||||
|
// update-end--author:liusq Date:20230522 for：[issues/4829]访问不存在的url时会提示Token失效，请重新登录呢
|
||||||
|
|
||||||
// 添加自己的过滤器并且取名为jwt
|
// 添加自己的过滤器并且取名为jwt
|
||||||
Map<String, Filter> filterMap = new HashMap<String, Filter>(1);
|
Map<String, Filter> filterMap = new HashMap<String, Filter>(1);
|
||||||
//如果cloudServer为空 则说明是单体 需要加载跨域配置【微服务跨域切换】
|
//如果cloudServer为空 则说明是单体 需要加载跨域配置【微服务跨域切换】
|
||||||
|
|||||||
@ -11,6 +11,7 @@ import org.apache.shiro.realm.AuthorizingRealm;
|
|||||||
import org.apache.shiro.subject.PrincipalCollection;
|
import org.apache.shiro.subject.PrincipalCollection;
|
||||||
import org.jeecg.common.api.CommonAPI;
|
import org.jeecg.common.api.CommonAPI;
|
||||||
import org.jeecg.common.config.TenantContext;
|
import org.jeecg.common.config.TenantContext;
|
||||||
|
import org.jeecg.common.constant.CacheConstant;
|
||||||
import org.jeecg.common.constant.CommonConstant;
|
import org.jeecg.common.constant.CommonConstant;
|
||||||
import org.jeecg.common.system.util.JwtUtil;
|
import org.jeecg.common.system.util.JwtUtil;
|
||||||
import org.jeecg.common.system.vo.LoginUser;
|
import org.jeecg.common.system.vo.LoginUser;
|
||||||
@ -140,12 +141,35 @@ public class ShiroRealm extends AuthorizingRealm {
|
|||||||
String userTenantIds = loginUser.getRelTenantIds();
|
String userTenantIds = loginUser.getRelTenantIds();
|
||||||
if(oConvertUtils.isNotEmpty(userTenantIds)){
|
if(oConvertUtils.isNotEmpty(userTenantIds)){
|
||||||
String contextTenantId = TenantContext.getTenant();
|
String contextTenantId = TenantContext.getTenant();
|
||||||
|
log.debug("登录租户：" + contextTenantId);
|
||||||
|
log.debug("用户拥有那些租户：" + userTenantIds);
|
||||||
|
//登录用户无租户，前端header中租户ID值为 0
|
||||||
String str ="0";
|
String str ="0";
|
||||||
if(oConvertUtils.isNotEmpty(contextTenantId) && !str.equals(contextTenantId)){
|
if(oConvertUtils.isNotEmpty(contextTenantId) && !str.equals(contextTenantId)){
|
||||||
//update-begin-author:taoyan date:20211227 for: /issues/I4O14W 用户租户信息变更判断漏洞
|
//update-begin-author:taoyan date:20211227 for: /issues/I4O14W 用户租户信息变更判断漏洞
|
||||||
String[] arr = userTenantIds.split(",");
|
String[] arr = userTenantIds.split(",");
|
||||||
if(!oConvertUtils.isIn(contextTenantId, arr)){
|
if(!oConvertUtils.isIn(contextTenantId, arr)){
|
||||||
throw new AuthenticationException("用户租户信息变更,请重新登陆!");
|
boolean isAuthorization = false;
|
||||||
|
//========================================================================
|
||||||
|
// 查询用户信息（如果租户不匹配从数据库中重新查询一次用户信息）
|
||||||
|
String loginUserKey = CacheConstant.SYS_USERS_CACHE + "::" + username;
|
||||||
|
redisUtil.del(loginUserKey);
|
||||||
|
LoginUser loginUserFromDb = commonApi.getUserByName(username);
|
||||||
|
if (oConvertUtils.isNotEmpty(loginUserFromDb.getRelTenantIds())) {
|
||||||
|
String[] newArray = loginUserFromDb.getRelTenantIds().split(",");
|
||||||
|
if (oConvertUtils.isIn(contextTenantId, newArray)) {
|
||||||
|
isAuthorization = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
//========================================================================
|
||||||
|
|
||||||
|
//*********************************************
|
||||||
|
if(!isAuthorization){
|
||||||
|
log.info("租户异常——登录租户：" + contextTenantId);
|
||||||
|
log.info("租户异常——用户拥有租户组：" + userTenantIds);
|
||||||
|
throw new AuthenticationException("登录租户授权变更，请重新登陆!");
|
||||||
|
}
|
||||||
|
//*********************************************
|
||||||
}
|
}
|
||||||
//update-end-author:taoyan date:20211227 for: /issues/I4O14W 用户租户信息变更判断漏洞
|
//update-end-author:taoyan date:20211227 for: /issues/I4O14W 用户租户信息变更判断漏洞
|
||||||
}
|
}
|
||||||
|
|||||||
@ -10,6 +10,7 @@ import javax.servlet.http.HttpServletResponse;
|
|||||||
import org.jeecg.common.api.vo.Result;
|
import org.jeecg.common.api.vo.Result;
|
||||||
import org.jeecg.common.constant.CommonConstant;
|
import org.jeecg.common.constant.CommonConstant;
|
||||||
import org.jeecg.common.util.DateUtils;
|
import org.jeecg.common.util.DateUtils;
|
||||||
|
import org.jeecg.common.util.oConvertUtils;
|
||||||
import org.jeecg.config.sign.util.BodyReaderHttpServletRequestWrapper;
|
import org.jeecg.config.sign.util.BodyReaderHttpServletRequestWrapper;
|
||||||
import org.jeecg.config.sign.util.HttpUtils;
|
import org.jeecg.config.sign.util.HttpUtils;
|
||||||
import org.jeecg.config.sign.util.SignUtil;
|
import org.jeecg.config.sign.util.SignUtil;
|
||||||
@ -39,6 +40,18 @@ public class SignAuthInterceptor implements HandlerInterceptor {
|
|||||||
//对参数进行签名验证
|
//对参数进行签名验证
|
||||||
String headerSign = request.getHeader(CommonConstant.X_SIGN);
|
String headerSign = request.getHeader(CommonConstant.X_SIGN);
|
||||||
String xTimestamp = request.getHeader(CommonConstant.X_TIMESTAMP);
|
String xTimestamp = request.getHeader(CommonConstant.X_TIMESTAMP);
|
||||||
|
|
||||||
|
if(oConvertUtils.isEmpty(xTimestamp)){
|
||||||
|
Result<?> result = Result.error("Sign签名校验失败！");
|
||||||
|
log.error("Sign 签名校验失败！Header xTimestamp 为空");
|
||||||
|
//校验失败返回前端
|
||||||
|
response.setCharacterEncoding("UTF-8");
|
||||||
|
response.setContentType("application/json; charset=utf-8");
|
||||||
|
PrintWriter out = response.getWriter();
|
||||||
|
out.print(JSON.toJSON(result));
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
//客户端时间
|
//客户端时间
|
||||||
Long clientTimestamp = Long.parseLong(xTimestamp);
|
Long clientTimestamp = Long.parseLong(xTimestamp);
|
||||||
|
|
||||||
|
|||||||
@ -0,0 +1,26 @@
|
|||||||
|
package org.jeecg.config.vo;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @author: scott
|
||||||
|
* @date: 2023年05月10日 16:06
|
||||||
|
*/
|
||||||
|
public class Elasticsearch {
|
||||||
|
private String clusterNodes;
|
||||||
|
private boolean checkEnabled;
|
||||||
|
|
||||||
|
public String getClusterNodes() {
|
||||||
|
return clusterNodes;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setClusterNodes(String clusterNodes) {
|
||||||
|
this.clusterNodes = clusterNodes;
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean isCheckEnabled() {
|
||||||
|
return checkEnabled;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setCheckEnabled(boolean checkEnabled) {
|
||||||
|
this.checkEnabled = checkEnabled;
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -4,7 +4,7 @@
|
|||||||
|
|
||||||
<!-- 保存日志11 -->
|
<!-- 保存日志11 -->
|
||||||
<insert id="saveLog" parameterType="Object">
|
<insert id="saveLog" parameterType="Object">
|
||||||
insert into sys_log (id, log_type, log_content, method, operate_type, request_url, request_type, request_param, ip, userid, username, cost_time, create_time,create_by)
|
insert into sys_log (id, log_type, log_content, method, operate_type, request_url, request_type, request_param, ip, userid, username, cost_time, create_time,create_by, tenant_id)
|
||||||
values(
|
values(
|
||||||
#{dto.id,jdbcType=VARCHAR},
|
#{dto.id,jdbcType=VARCHAR},
|
||||||
#{dto.logType,jdbcType=INTEGER},
|
#{dto.logType,jdbcType=INTEGER},
|
||||||
@ -19,7 +19,8 @@
|
|||||||
#{dto.username,jdbcType=VARCHAR},
|
#{dto.username,jdbcType=VARCHAR},
|
||||||
#{dto.costTime,jdbcType=BIGINT},
|
#{dto.costTime,jdbcType=BIGINT},
|
||||||
#{dto.createTime,jdbcType=TIMESTAMP},
|
#{dto.createTime,jdbcType=TIMESTAMP},
|
||||||
#{dto.createBy,jdbcType=VARCHAR}
|
#{dto.createBy,jdbcType=VARCHAR},
|
||||||
|
#{dto.tenantId,jdbcType=INTEGER}
|
||||||
)
|
)
|
||||||
</insert>
|
</insert>
|
||||||
|
|
||||||
|
|||||||
@ -5,7 +5,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<artifactId>jeecg-boot-parent</artifactId>
|
<artifactId>jeecg-boot-parent</artifactId>
|
||||||
<groupId>org.jeecgframework.boot</groupId>
|
<groupId>org.jeecgframework.boot</groupId>
|
||||||
<version>3.4.4</version>
|
<version>3.5.3</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
|
|||||||
@ -44,7 +44,7 @@
|
|||||||
//// /**
|
//// /**
|
||||||
//// * 测试调用 erp 微服务接口
|
//// * 测试调用 erp 微服务接口
|
||||||
//// * 【如何测试：通过archetype生成微服务模块，快速集成测试】
|
//// * 【如何测试：通过archetype生成微服务模块，快速集成测试】
|
||||||
//// * http://doc.jeecg.com/2194069
|
//// * https://help.jeecg.com/java/springcloud/archetype.html
|
||||||
//// * @return
|
//// * @return
|
||||||
//// */
|
//// */
|
||||||
//// @GetMapping("/callErp")
|
//// @GetMapping("/callErp")
|
||||||
|
|||||||
@ -2,6 +2,7 @@ package org.jeecg.modules.demo.test.entity;
|
|||||||
|
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
|
|
||||||
|
import com.baomidou.mybatisplus.annotation.Version;
|
||||||
import org.jeecg.common.system.base.entity.JeecgEntity;
|
import org.jeecg.common.system.base.entity.JeecgEntity;
|
||||||
import org.jeecgframework.poi.excel.annotation.Excel;
|
import org.jeecgframework.poi.excel.annotation.Excel;
|
||||||
import org.springframework.format.annotation.DateTimeFormat;
|
import org.springframework.format.annotation.DateTimeFormat;
|
||||||
@ -78,5 +79,8 @@ public class JeecgDemo extends JeecgEntity implements Serializable {
|
|||||||
|
|
||||||
@ApiModelProperty(value = "租户ID")
|
@ApiModelProperty(value = "租户ID")
|
||||||
private java.lang.Integer tenantId;
|
private java.lang.Integer tenantId;
|
||||||
|
/** 乐观锁字段 */
|
||||||
|
@Version
|
||||||
|
private java.lang.Integer updateCount;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -5,7 +5,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<artifactId>jeecg-system-api</artifactId>
|
<artifactId>jeecg-system-api</artifactId>
|
||||||
<groupId>org.jeecgframework.boot</groupId>
|
<groupId>org.jeecgframework.boot</groupId>
|
||||||
<version>3.4.4</version>
|
<version>3.5.3</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
|
|||||||
@ -0,0 +1,40 @@
|
|||||||
|
package org.jeecg.common.drag.api;
|
||||||
|
|
||||||
|
import org.jeecg.common.constant.ServiceNameConstants;
|
||||||
|
import org.jeecg.common.drag.api.fallbak.DragBaseApiFallback;
|
||||||
|
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass;
|
||||||
|
import org.springframework.cloud.openfeign.FeignClient;
|
||||||
|
import org.springframework.stereotype.Component;
|
||||||
|
import org.springframework.web.bind.annotation.DeleteMapping;
|
||||||
|
import org.springframework.web.bind.annotation.GetMapping;
|
||||||
|
import org.springframework.web.bind.annotation.RequestParam;
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 仪表盘API接口
|
||||||
|
*
|
||||||
|
* @author lsq
|
||||||
|
* @date 2023/01/09
|
||||||
|
*/
|
||||||
|
@Component
|
||||||
|
@FeignClient(contextId = "dragBaseRemoteApi", value = ServiceNameConstants.SERVICE_SYSTEM, fallbackFactory = DragBaseApiFallback.class)
|
||||||
|
@ConditionalOnMissingClass("org.jeecg.modules.drag.service.impl.OnlDragBaseApiImpl")
|
||||||
|
public interface IDragBaseApi {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 通过id赋值仪表盘数据
|
||||||
|
*
|
||||||
|
* @param id
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
@GetMapping(value = "/drag/api/copyDragPage")
|
||||||
|
String copyDragPage( @RequestParam("id") String id);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 删除表单
|
||||||
|
* @param id
|
||||||
|
*/
|
||||||
|
@DeleteMapping(value = "/drag/api/deleteDragPage")
|
||||||
|
void deleteDragPage(@RequestParam("id") String id);
|
||||||
|
|
||||||
|
}
|
||||||
@ -0,0 +1,23 @@
|
|||||||
|
package org.jeecg.common.drag.api.factory;
|
||||||
|
|
||||||
|
import org.jeecg.common.drag.api.IDragBaseApi;
|
||||||
|
import org.jeecg.common.drag.api.fallbak.DragBaseApiFallback;
|
||||||
|
import org.springframework.cloud.openfeign.FallbackFactory;
|
||||||
|
import org.springframework.stereotype.Component;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* DragBaseApiFallbackFactory
|
||||||
|
* @author: lsq
|
||||||
|
* @date 2023/01/09
|
||||||
|
*/
|
||||||
|
@Component
|
||||||
|
public class DragBaseApiFallbackFactory implements FallbackFactory<IDragBaseApi> {
|
||||||
|
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public IDragBaseApi create(Throwable throwable) {
|
||||||
|
DragBaseApiFallback fallback = new DragBaseApiFallback();
|
||||||
|
fallback.setCause(throwable);
|
||||||
|
return fallback;
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,26 @@
|
|||||||
|
package org.jeecg.common.drag.api.fallbak;
|
||||||
|
|
||||||
|
import lombok.Setter;
|
||||||
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
import org.jeecg.common.drag.api.IDragBaseApi;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* IDragBaseApi fallback
|
||||||
|
* @author LSQ
|
||||||
|
* @date 2023/01/09
|
||||||
|
*/
|
||||||
|
@Slf4j
|
||||||
|
public class DragBaseApiFallback implements IDragBaseApi {
|
||||||
|
|
||||||
|
@Setter
|
||||||
|
private Throwable cause;
|
||||||
|
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void deleteDragPage(String id) {}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String copyDragPage(String id) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -434,13 +434,13 @@ public interface ISysBaseAPI extends CommonAPI {
|
|||||||
@RequestMapping("/sys/api/queryDepartsByOrgcodes")
|
@RequestMapping("/sys/api/queryDepartsByOrgcodes")
|
||||||
List<JSONObject> queryDepartsByOrgcodes(@RequestParam("orgCodes") String orgCodes);
|
List<JSONObject> queryDepartsByOrgcodes(@RequestParam("orgCodes") String orgCodes);
|
||||||
|
|
||||||
/**
|
// /**
|
||||||
* 39根据多个部门编码(逗号分隔)，查询返回多个部门信息
|
// * 39根据多个部门编码(逗号分隔)，查询返回多个部门信息
|
||||||
* @param ids
|
// * @param ids
|
||||||
* @return
|
// * @return
|
||||||
*/
|
// */
|
||||||
@GetMapping("/sys/api/queryDepartsByOrgIds")
|
// @GetMapping("/sys/api/queryDepartsByOrgIds")
|
||||||
List<JSONObject> queryDepartsByOrgIds(@RequestParam("ids") String ids);
|
// List<JSONObject> queryDepartsByOrgIds(@RequestParam("ids") String ids);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 40发送邮件消息
|
* 40发送邮件消息
|
||||||
|
|||||||
@ -303,10 +303,10 @@ public class SysBaseAPIFallback implements ISysBaseAPI {
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
// @Override
|
||||||
public List<JSONObject> queryDepartsByOrgIds(String ids) {
|
// public List<JSONObject> queryDepartsByOrgIds(String ids) {
|
||||||
return null;
|
// return null;
|
||||||
}
|
// }
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<String> loadCategoryDictItem(String ids) {
|
public List<String> loadCategoryDictItem(String ids) {
|
||||||
|
|||||||
@ -5,7 +5,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<artifactId>jeecg-system-api</artifactId>
|
<artifactId>jeecg-system-api</artifactId>
|
||||||
<groupId>org.jeecgframework.boot</groupId>
|
<groupId>org.jeecgframework.boot</groupId>
|
||||||
<version>3.4.4</version>
|
<version>3.5.3</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
|
|||||||
@ -0,0 +1,27 @@
|
|||||||
|
package org.jeecg.common.drag.api;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 仪表盘API接口
|
||||||
|
* @date 2023/1/9
|
||||||
|
* @author lsq
|
||||||
|
*/
|
||||||
|
public interface IDragBaseApi {
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 通过id删除仪表盘
|
||||||
|
*
|
||||||
|
* @param id
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
void deleteDragPage(String id);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 通过id复制仪表盘
|
||||||
|
*
|
||||||
|
* @param id
|
||||||
|
* @return id
|
||||||
|
*/
|
||||||
|
String copyDragPage(String id);
|
||||||
|
|
||||||
|
}
|
||||||
@ -5,7 +5,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<artifactId>jeecg-module-system</artifactId>
|
<artifactId>jeecg-module-system</artifactId>
|
||||||
<groupId>org.jeecgframework.boot</groupId>
|
<groupId>org.jeecgframework.boot</groupId>
|
||||||
<version>3.4.4</version>
|
<version>3.5.3</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
|
|||||||
@ -4,7 +4,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.jeecgframework.boot</groupId>
|
<groupId>org.jeecgframework.boot</groupId>
|
||||||
<artifactId>jeecg-module-system</artifactId>
|
<artifactId>jeecg-module-system</artifactId>
|
||||||
<version>3.4.4</version>
|
<version>3.5.3</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
@ -34,6 +34,11 @@
|
|||||||
<groupId>org.jeecgframework.jimureport</groupId>
|
<groupId>org.jeecgframework.jimureport</groupId>
|
||||||
<artifactId>jimureport-spring-boot-starter</artifactId>
|
<artifactId>jimureport-spring-boot-starter</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.jeecgframework.boot</groupId>
|
||||||
|
<artifactId>drag-free</artifactId>
|
||||||
|
<version>1.0.1</version>
|
||||||
|
</dependency>
|
||||||
<!-- 积木报表 mongo redis 支持包
|
<!-- 积木报表 mongo redis 支持包
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.jeecgframework.jimureport</groupId>
|
<groupId>org.jeecgframework.jimureport</groupId>
|
||||||
|
|||||||
@ -17,7 +17,6 @@ import java.nio.charset.StandardCharsets;
|
|||||||
* 自动初始化代码生成器模板
|
* 自动初始化代码生成器模板
|
||||||
* <p>
|
* <p>
|
||||||
* 解决JAR发布需要手工配置代码生成器模板问题
|
* 解决JAR发布需要手工配置代码生成器模板问题
|
||||||
* http://doc.jeecg.com/2043922
|
|
||||||
* @author zhang
|
* @author zhang
|
||||||
*/
|
*/
|
||||||
@Slf4j
|
@Slf4j
|
||||||
|
|||||||
@ -0,0 +1,27 @@
|
|||||||
|
package org.jeecg.modules.aop;
|
||||||
|
|
||||||
|
import org.jeecg.common.constant.CommonConstant;
|
||||||
|
import org.jeecg.common.constant.enums.ModuleType;
|
||||||
|
|
||||||
|
import java.lang.annotation.*;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 系统日志注解
|
||||||
|
*
|
||||||
|
* @Author scott
|
||||||
|
* @email jeecgos@163.com
|
||||||
|
* @Date 2019年1月14日
|
||||||
|
*/
|
||||||
|
@Target(ElementType.METHOD)
|
||||||
|
@Retention(RetentionPolicy.RUNTIME)
|
||||||
|
@Documented
|
||||||
|
public @interface TenantLog {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 操作日志类型（1查询，2添加，3修改，4删除）
|
||||||
|
*
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
int value() default 0;
|
||||||
|
|
||||||
|
}
|
||||||
@ -0,0 +1,99 @@
|
|||||||
|
package org.jeecg.modules.aop;
|
||||||
|
|
||||||
|
import org.apache.shiro.SecurityUtils;
|
||||||
|
import org.aspectj.lang.ProceedingJoinPoint;
|
||||||
|
import org.aspectj.lang.annotation.AfterThrowing;
|
||||||
|
import org.aspectj.lang.annotation.Around;
|
||||||
|
import org.aspectj.lang.annotation.Aspect;
|
||||||
|
import org.aspectj.lang.annotation.Pointcut;
|
||||||
|
import org.aspectj.lang.reflect.MethodSignature;
|
||||||
|
import org.jeecg.common.api.dto.LogDTO;
|
||||||
|
import org.jeecg.common.system.vo.LoginUser;
|
||||||
|
import org.jeecg.modules.base.service.BaseCommonService;
|
||||||
|
import org.jeecg.modules.system.entity.SysTenantPack;
|
||||||
|
import org.jeecg.modules.system.entity.SysTenantPackUser;
|
||||||
|
import org.springframework.stereotype.Component;
|
||||||
|
|
||||||
|
import javax.annotation.Resource;
|
||||||
|
import java.lang.reflect.Method;
|
||||||
|
import java.util.Date;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @Author taoYan
|
||||||
|
* @Date 2023/2/16 14:27
|
||||||
|
**/
|
||||||
|
@Aspect
|
||||||
|
@Component
|
||||||
|
public class TenantPackUserLogAspect {
|
||||||
|
|
||||||
|
@Resource
|
||||||
|
private BaseCommonService baseCommonService;
|
||||||
|
|
||||||
|
@Pointcut("@annotation(org.jeecg.modules.aop.TenantLog)")
|
||||||
|
public void tenantLogPointCut() {
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
@Around("tenantLogPointCut()")
|
||||||
|
public Object aroundMethod(ProceedingJoinPoint joinPoint)throws Throwable {
|
||||||
|
//System.out.println("环绕通知>>>>>>>>>");
|
||||||
|
|
||||||
|
MethodSignature signature = (MethodSignature) joinPoint.getSignature();
|
||||||
|
Method method = signature.getMethod();
|
||||||
|
TenantLog log = method.getAnnotation(TenantLog.class);
|
||||||
|
if(log != null){
|
||||||
|
int opType = log.value();
|
||||||
|
Integer logType = null;
|
||||||
|
String content = null;
|
||||||
|
Integer tenantId = null;
|
||||||
|
//获取参数
|
||||||
|
Object[] args = joinPoint.getArgs();
|
||||||
|
if(args.length>0){
|
||||||
|
for(Object obj: args){
|
||||||
|
if(obj instanceof SysTenantPack){
|
||||||
|
// logType=3 租户操作日志
|
||||||
|
logType = 3;
|
||||||
|
SysTenantPack pack = (SysTenantPack)obj;
|
||||||
|
if(opType==2){
|
||||||
|
content = "创建了角色权限 "+ pack.getPackName();
|
||||||
|
}
|
||||||
|
tenantId = pack.getTenantId();
|
||||||
|
break;
|
||||||
|
}else if(obj instanceof SysTenantPackUser){
|
||||||
|
logType = 3;
|
||||||
|
SysTenantPackUser packUser = (SysTenantPackUser)obj;
|
||||||
|
if(opType==2){
|
||||||
|
content = "将 "+packUser.getRealname()+" 添加到角色 "+ packUser.getPackName();
|
||||||
|
}else if(opType==4){
|
||||||
|
content = "移除了 "+packUser.getPackName()+" 成员 "+ packUser.getRealname();
|
||||||
|
}
|
||||||
|
tenantId = packUser.getTenantId();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if(logType!=null){
|
||||||
|
LogDTO dto = new LogDTO();
|
||||||
|
dto.setLogType(logType);
|
||||||
|
dto.setLogContent(content);
|
||||||
|
dto.setOperateType(opType);
|
||||||
|
dto.setTenantId(tenantId);
|
||||||
|
//获取登录用户信息
|
||||||
|
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
||||||
|
if(sysUser!=null){
|
||||||
|
dto.setUserid(sysUser.getUsername());
|
||||||
|
dto.setUsername(sysUser.getRealname());
|
||||||
|
|
||||||
|
}
|
||||||
|
dto.setCreateTime(new Date());
|
||||||
|
//保存系统日志
|
||||||
|
baseCommonService.addLog(dto);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return joinPoint.proceed();
|
||||||
|
}
|
||||||
|
|
||||||
|
@AfterThrowing("tenantLogPointCut()")
|
||||||
|
public void afterThrowing()throws Throwable{
|
||||||
|
System.out.println("异常通知");
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -90,7 +90,7 @@ public class CasClientController {
|
|||||||
if (departs == null || departs.size() == 0) {
|
if (departs == null || departs.size() == 0) {
|
||||||
obj.put("multi_depart", 0);
|
obj.put("multi_depart", 0);
|
||||||
} else if (departs.size() == 1) {
|
} else if (departs.size() == 1) {
|
||||||
sysUserService.updateUserDepart(principal, departs.get(0).getOrgCode());
|
sysUserService.updateUserDepart(principal, departs.get(0).getOrgCode(),null);
|
||||||
obj.put("multi_depart", 1);
|
obj.put("multi_depart", 1);
|
||||||
} else {
|
} else {
|
||||||
obj.put("multi_depart", 2);
|
obj.put("multi_depart", 2);
|
||||||
|
|||||||
@ -2,6 +2,7 @@ package org.jeecg.modules.message.handle.impl;
|
|||||||
|
|
||||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
import org.apache.commons.lang3.ObjectUtils;
|
||||||
import org.jeecg.common.api.dto.message.MessageDTO;
|
import org.jeecg.common.api.dto.message.MessageDTO;
|
||||||
import org.jeecg.common.constant.CommonConstant;
|
import org.jeecg.common.constant.CommonConstant;
|
||||||
import org.jeecg.common.system.util.JwtUtil;
|
import org.jeecg.common.system.util.JwtUtil;
|
||||||
@ -42,6 +43,11 @@ public class EmailSendMsgHandle implements ISendMsgHandle {
|
|||||||
@Autowired
|
@Autowired
|
||||||
private RedisUtil redisUtil;
|
private RedisUtil redisUtil;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 真实姓名变量
|
||||||
|
*/
|
||||||
|
private static final String realNameExp = "{REALNAME}";
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@ -52,6 +58,7 @@ public class EmailSendMsgHandle implements ISendMsgHandle {
|
|||||||
//update-begin-author：taoyan date:20200811 for:配置类数据获取
|
//update-begin-author：taoyan date:20200811 for:配置类数据获取
|
||||||
if(oConvertUtils.isEmpty(emailFrom)){
|
if(oConvertUtils.isEmpty(emailFrom)){
|
||||||
StaticConfig staticConfig = SpringContextUtils.getBean(StaticConfig.class);
|
StaticConfig staticConfig = SpringContextUtils.getBean(StaticConfig.class);
|
||||||
|
log.info("邮件配置 emailFrom：" + emailFrom);
|
||||||
setEmailFrom(staticConfig.getEmailFrom());
|
setEmailFrom(staticConfig.getEmailFrom());
|
||||||
}
|
}
|
||||||
//update-end-author：taoyan date:20200811 for:配置类数据获取
|
//update-end-author：taoyan date:20200811 for:配置类数据获取
|
||||||
@ -76,26 +83,81 @@ public class EmailSendMsgHandle implements ISendMsgHandle {
|
|||||||
List<SysUser> list = sysUserMapper.selectList(query);
|
List<SysUser> list = sysUserMapper.selectList(query);
|
||||||
String content = messageDTO.getContent();
|
String content = messageDTO.getContent();
|
||||||
String title = messageDTO.getTitle();
|
String title = messageDTO.getTitle();
|
||||||
String realNameExp = "{REALNAME}";
|
|
||||||
for(SysUser user: list){
|
for(SysUser user: list){
|
||||||
String email = user.getEmail();
|
String email = user.getEmail();
|
||||||
if(email==null || "".equals(email)){
|
if (ObjectUtils.isEmpty(email)) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
if(content.indexOf(realNameExp)>0){
|
content=replaceContent(user,content);
|
||||||
content = content.replace(realNameExp, user.getRealname());
|
|
||||||
}
|
|
||||||
if(content.indexOf(CommonConstant.LOGIN_TOKEN)>0){
|
|
||||||
String token = getToken(user);
|
|
||||||
try {
|
|
||||||
content = content.replace(CommonConstant.LOGIN_TOKEN, URLEncoder.encode(token, "UTF-8"));
|
|
||||||
} catch (UnsupportedEncodingException e) {
|
|
||||||
log.error("邮件消息token编码失败", e.getMessage());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
log.info("邮件内容："+ content);
|
log.info("邮件内容："+ content);
|
||||||
sendMsg(email, title, content);
|
sendMsg(email, title, content);
|
||||||
}
|
}
|
||||||
|
//发送给抄送人
|
||||||
|
sendMessageToCopyUser(messageDTO);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 发送邮件给抄送人
|
||||||
|
* @param messageDTO
|
||||||
|
*/
|
||||||
|
public void sendMessageToCopyUser(MessageDTO messageDTO) {
|
||||||
|
String copyToUser = messageDTO.getCopyToUser();
|
||||||
|
if(ObjectUtils.isNotEmpty(copyToUser)) {
|
||||||
|
LambdaQueryWrapper<SysUser> query = new LambdaQueryWrapper<SysUser>().in(SysUser::getUsername, copyToUser.split(","));
|
||||||
|
List<SysUser> list = sysUserMapper.selectList(query);
|
||||||
|
String content = messageDTO.getContent();
|
||||||
|
String title = messageDTO.getTitle();
|
||||||
|
|
||||||
|
for (SysUser user : list) {
|
||||||
|
String email = user.getEmail();
|
||||||
|
if (ObjectUtils.isEmpty(email)) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
content=replaceContent(user,content);
|
||||||
|
log.info("邮件内容：" + content);
|
||||||
|
JavaMailSender mailSender = (JavaMailSender) SpringContextUtils.getBean("mailSender");
|
||||||
|
MimeMessage message = mailSender.createMimeMessage();
|
||||||
|
MimeMessageHelper helper = null;
|
||||||
|
if (oConvertUtils.isEmpty(emailFrom)) {
|
||||||
|
StaticConfig staticConfig = SpringContextUtils.getBean(StaticConfig.class);
|
||||||
|
setEmailFrom(staticConfig.getEmailFrom());
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
helper = new MimeMessageHelper(message, true);
|
||||||
|
// 设置发送方邮箱地址
|
||||||
|
helper.setFrom(emailFrom);
|
||||||
|
helper.setTo(email);
|
||||||
|
//设置抄送人
|
||||||
|
helper.setCc(email);
|
||||||
|
helper.setSubject(title);
|
||||||
|
helper.setText(content, true);
|
||||||
|
mailSender.send(message);
|
||||||
|
} catch (MessagingException e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 替换邮件内容变量
|
||||||
|
* @param user
|
||||||
|
* @param content
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
private String replaceContent(SysUser user,String content){
|
||||||
|
if (content.indexOf(realNameExp) > 0) {
|
||||||
|
content = content.replace("$"+realNameExp,user.getRealname()).replace(realNameExp, user.getRealname());
|
||||||
|
}
|
||||||
|
if (content.indexOf(CommonConstant.LOGIN_TOKEN) > 0) {
|
||||||
|
String token = getToken(user);
|
||||||
|
try {
|
||||||
|
content = content.replace(CommonConstant.LOGIN_TOKEN, URLEncoder.encode(token, "UTF-8"));
|
||||||
|
} catch (UnsupportedEncodingException e) {
|
||||||
|
log.error("邮件消息token编码失败", e.getMessage());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return content;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@ -2,7 +2,6 @@ package org.jeecg.modules.message.websocket;
|
|||||||
|
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.concurrent.ConcurrentHashMap;
|
import java.util.concurrent.ConcurrentHashMap;
|
||||||
import javax.annotation.Resource;
|
|
||||||
import javax.websocket.*;
|
import javax.websocket.*;
|
||||||
import javax.websocket.server.PathParam;
|
import javax.websocket.server.PathParam;
|
||||||
import javax.websocket.server.ServerEndpoint;
|
import javax.websocket.server.ServerEndpoint;
|
||||||
@ -11,6 +10,7 @@ import com.alibaba.fastjson.JSONObject;
|
|||||||
import org.jeecg.common.base.BaseMap;
|
import org.jeecg.common.base.BaseMap;
|
||||||
import org.jeecg.common.constant.WebsocketConst;
|
import org.jeecg.common.constant.WebsocketConst;
|
||||||
import org.jeecg.common.modules.redis.client.JeecgRedisClient;
|
import org.jeecg.common.modules.redis.client.JeecgRedisClient;
|
||||||
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.stereotype.Component;
|
import org.springframework.stereotype.Component;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
|
||||||
@ -31,7 +31,7 @@ public class WebSocket {
|
|||||||
* Redis触发监听名字
|
* Redis触发监听名字
|
||||||
*/
|
*/
|
||||||
public static final String REDIS_TOPIC_NAME = "socketHandler";
|
public static final String REDIS_TOPIC_NAME = "socketHandler";
|
||||||
@Resource
|
@Autowired
|
||||||
private JeecgRedisClient jeecgRedisClient;
|
private JeecgRedisClient jeecgRedisClient;
|
||||||
|
|
||||||
|
|
||||||
@ -111,14 +111,14 @@ public class WebSocket {
|
|||||||
log.debug("【系统 WebSocket】收到客户端消息:" + message);
|
log.debug("【系统 WebSocket】收到客户端消息:" + message);
|
||||||
}
|
}
|
||||||
|
|
||||||
//------------------------------------------------------------------------------
|
// //------------------------------------------------------------------------------
|
||||||
JSONObject obj = new JSONObject();
|
// JSONObject obj = new JSONObject();
|
||||||
//业务类型
|
// //业务类型
|
||||||
obj.put(WebsocketConst.MSG_CMD, WebsocketConst.CMD_CHECK);
|
// obj.put(WebsocketConst.MSG_CMD, WebsocketConst.CMD_CHECK);
|
||||||
//消息内容
|
// //消息内容
|
||||||
obj.put(WebsocketConst.MSG_TXT, "心跳响应");
|
// obj.put(WebsocketConst.MSG_TXT, "心跳响应");
|
||||||
this.pushMessage(userId, obj.toJSONString());
|
// this.pushMessage(userId, obj.toJSONString());
|
||||||
//------------------------------------------------------------------------------
|
// //------------------------------------------------------------------------------
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -130,7 +130,7 @@ public class WebSocket {
|
|||||||
@OnError
|
@OnError
|
||||||
public void onError(Session session, Throwable t) {
|
public void onError(Session session, Throwable t) {
|
||||||
log.warn("【系统 WebSocket】消息出现错误");
|
log.warn("【系统 WebSocket】消息出现错误");
|
||||||
//t.printStackTrace();
|
t.printStackTrace();
|
||||||
}
|
}
|
||||||
//==========【系统 WebSocket接受、推送消息等方法 —— 具体服务节点推送ws消息】========================================================================================
|
//==========【系统 WebSocket接受、推送消息等方法 —— 具体服务节点推送ws消息】========================================================================================
|
||||||
|
|
||||||
|
|||||||
@ -39,7 +39,7 @@ public class ActuatorRedisController {
|
|||||||
@GetMapping("/info")
|
@GetMapping("/info")
|
||||||
public Result<?> getRedisInfo() throws Exception {
|
public Result<?> getRedisInfo() throws Exception {
|
||||||
List<RedisInfo> infoList = this.redisService.getRedisInfo();
|
List<RedisInfo> infoList = this.redisService.getRedisInfo();
|
||||||
log.info(infoList.toString());
|
//log.info(infoList.toString());
|
||||||
return Result.ok(infoList);
|
return Result.ok(infoList);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -2,6 +2,7 @@ package org.jeecg.modules.oss.controller;
|
|||||||
|
|
||||||
import javax.servlet.http.HttpServletRequest;
|
import javax.servlet.http.HttpServletRequest;
|
||||||
|
|
||||||
|
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
||||||
import org.apache.shiro.authz.annotation.RequiresRoles;
|
import org.apache.shiro.authz.annotation.RequiresRoles;
|
||||||
import org.jeecg.common.api.vo.Result;
|
import org.jeecg.common.api.vo.Result;
|
||||||
import org.jeecg.common.system.query.QueryGenerator;
|
import org.jeecg.common.system.query.QueryGenerator;
|
||||||
@ -47,6 +48,7 @@ public class OssFileController {
|
|||||||
@ResponseBody
|
@ResponseBody
|
||||||
@PostMapping("/upload")
|
@PostMapping("/upload")
|
||||||
//@RequiresRoles("admin")
|
//@RequiresRoles("admin")
|
||||||
|
//@RequiresPermissions("system:ossFile:upload")
|
||||||
public Result upload(@RequestParam("file") MultipartFile multipartFile) {
|
public Result upload(@RequestParam("file") MultipartFile multipartFile) {
|
||||||
Result result = new Result();
|
Result result = new Result();
|
||||||
try {
|
try {
|
||||||
|
|||||||
@ -1,7 +1,9 @@
|
|||||||
package org.jeecg.modules.oss.service.impl;
|
package org.jeecg.modules.oss.service.impl;
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||||
|
import org.jeecg.common.exception.JeecgBootException;
|
||||||
import org.jeecg.common.util.CommonUtils;
|
import org.jeecg.common.util.CommonUtils;
|
||||||
|
import org.jeecg.common.util.oConvertUtils;
|
||||||
import org.jeecg.common.util.oss.OssBootUtil;
|
import org.jeecg.common.util.oss.OssBootUtil;
|
||||||
import org.jeecg.modules.oss.entity.OssFile;
|
import org.jeecg.modules.oss.entity.OssFile;
|
||||||
import org.jeecg.modules.oss.mapper.OssFileMapper;
|
import org.jeecg.modules.oss.mapper.OssFileMapper;
|
||||||
@ -25,6 +27,9 @@ public class OssFileServiceImpl extends ServiceImpl<OssFileMapper, OssFile> impl
|
|||||||
OssFile ossFile = new OssFile();
|
OssFile ossFile = new OssFile();
|
||||||
ossFile.setFileName(fileName);
|
ossFile.setFileName(fileName);
|
||||||
String url = OssBootUtil.upload(multipartFile,"upload/test");
|
String url = OssBootUtil.upload(multipartFile,"upload/test");
|
||||||
|
if(oConvertUtils.isEmpty(url)){
|
||||||
|
throw new JeecgBootException("上传文件失败! ");
|
||||||
|
}
|
||||||
//update-begin--Author:scott Date:20201227 for：JT-361【文件预览】阿里云原生域名可以文件预览，自己映射域名kkfileview提示文件下载失败-------------------
|
//update-begin--Author:scott Date:20201227 for：JT-361【文件预览】阿里云原生域名可以文件预览，自己映射域名kkfileview提示文件下载失败-------------------
|
||||||
// 返回阿里云原生域名前缀URL
|
// 返回阿里云原生域名前缀URL
|
||||||
ossFile.setUrl(OssBootUtil.getOriginalUrl(url));
|
ossFile.setUrl(OssBootUtil.getOriginalUrl(url));
|
||||||
|
|||||||
@ -7,6 +7,7 @@ import io.swagger.annotations.Api;
|
|||||||
import io.swagger.annotations.ApiOperation;
|
import io.swagger.annotations.ApiOperation;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.apache.shiro.SecurityUtils;
|
import org.apache.shiro.SecurityUtils;
|
||||||
|
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
||||||
import org.apache.shiro.authz.annotation.RequiresRoles;
|
import org.apache.shiro.authz.annotation.RequiresRoles;
|
||||||
import org.jeecg.common.api.vo.Result;
|
import org.jeecg.common.api.vo.Result;
|
||||||
import org.jeecg.common.constant.CommonConstant;
|
import org.jeecg.common.constant.CommonConstant;
|
||||||
@ -79,6 +80,7 @@ public class QuartzJobController {
|
|||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
//@RequiresRoles("admin")
|
//@RequiresRoles("admin")
|
||||||
|
//@RequiresPermissions("system:quartzJob:add")
|
||||||
@RequestMapping(value = "/add", method = RequestMethod.POST)
|
@RequestMapping(value = "/add", method = RequestMethod.POST)
|
||||||
public Result<?> add(@RequestBody QuartzJob quartzJob) {
|
public Result<?> add(@RequestBody QuartzJob quartzJob) {
|
||||||
quartzJobService.saveAndScheduleJob(quartzJob);
|
quartzJobService.saveAndScheduleJob(quartzJob);
|
||||||
@ -92,6 +94,7 @@ public class QuartzJobController {
|
|||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
//@RequiresRoles("admin")
|
//@RequiresRoles("admin")
|
||||||
|
//@RequiresPermissions("system:quartzJob:edit")
|
||||||
@RequestMapping(value = "/edit", method ={RequestMethod.PUT, RequestMethod.POST})
|
@RequestMapping(value = "/edit", method ={RequestMethod.PUT, RequestMethod.POST})
|
||||||
public Result<?> eidt(@RequestBody QuartzJob quartzJob) {
|
public Result<?> eidt(@RequestBody QuartzJob quartzJob) {
|
||||||
try {
|
try {
|
||||||
@ -110,6 +113,7 @@ public class QuartzJobController {
|
|||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
//@RequiresRoles("admin")
|
//@RequiresRoles("admin")
|
||||||
|
//@RequiresPermissions("system:quartzJob:delete")
|
||||||
@RequestMapping(value = "/delete", method = RequestMethod.DELETE)
|
@RequestMapping(value = "/delete", method = RequestMethod.DELETE)
|
||||||
public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
|
public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
|
||||||
QuartzJob quartzJob = quartzJobService.getById(id);
|
QuartzJob quartzJob = quartzJobService.getById(id);
|
||||||
@ -128,6 +132,7 @@ public class QuartzJobController {
|
|||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
//@RequiresRoles("admin")
|
//@RequiresRoles("admin")
|
||||||
|
//@RequiresPermissions("system:quartzJob:deleteBatch")
|
||||||
@RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE)
|
@RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE)
|
||||||
public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
|
public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
|
||||||
if (ids == null || "".equals(ids.trim())) {
|
if (ids == null || "".equals(ids.trim())) {
|
||||||
@ -147,6 +152,7 @@ public class QuartzJobController {
|
|||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
//@RequiresRoles("admin")
|
//@RequiresRoles("admin")
|
||||||
|
//@RequiresPermissions("system:quartzJob:pause")
|
||||||
@GetMapping(value = "/pause")
|
@GetMapping(value = "/pause")
|
||||||
@ApiOperation(value = "停止定时任务")
|
@ApiOperation(value = "停止定时任务")
|
||||||
public Result<Object> pauseJob(@RequestParam(name = "id") String id) {
|
public Result<Object> pauseJob(@RequestParam(name = "id") String id) {
|
||||||
@ -165,6 +171,7 @@ public class QuartzJobController {
|
|||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
//@RequiresRoles("admin")
|
//@RequiresRoles("admin")
|
||||||
|
//@RequiresPermissions("system:quartzJob:resume")
|
||||||
@GetMapping(value = "/resume")
|
@GetMapping(value = "/resume")
|
||||||
@ApiOperation(value = "启动定时任务")
|
@ApiOperation(value = "启动定时任务")
|
||||||
public Result<Object> resumeJob(@RequestParam(name = "id") String id) {
|
public Result<Object> resumeJob(@RequestParam(name = "id") String id) {
|
||||||
@ -265,6 +272,7 @@ public class QuartzJobController {
|
|||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
//@RequiresRoles("admin")
|
//@RequiresRoles("admin")
|
||||||
|
//@RequiresPermissions("system:quartzJob:execute")
|
||||||
@GetMapping("/execute")
|
@GetMapping("/execute")
|
||||||
public Result<?> execute(@RequestParam(name = "id", required = true) String id) {
|
public Result<?> execute(@RequestParam(name = "id", required = true) String id) {
|
||||||
QuartzJob quartzJob = quartzJobService.getById(id);
|
QuartzJob quartzJob = quartzJobService.getById(id);
|
||||||
|
|||||||
@ -1,20 +1,25 @@
|
|||||||
package org.jeecg.modules.system.controller;
|
package org.jeecg.modules.system.controller;
|
||||||
|
|
||||||
|
import com.alibaba.fastjson.JSON;
|
||||||
|
import com.alibaba.fastjson.JSONObject;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.jeecg.common.api.vo.Result;
|
import org.jeecg.common.api.vo.Result;
|
||||||
import org.jeecg.common.constant.CommonConstant;
|
import org.jeecg.common.constant.CommonConstant;
|
||||||
import org.jeecg.common.constant.SymbolConstant;
|
import org.jeecg.common.constant.SymbolConstant;
|
||||||
import org.jeecg.common.exception.JeecgBootException;
|
import org.jeecg.common.exception.JeecgBootException;
|
||||||
import org.jeecg.common.util.CommonUtils;
|
import org.jeecg.common.util.CommonUtils;
|
||||||
|
import org.jeecg.common.util.RestUtil;
|
||||||
|
import org.jeecg.common.util.TokenUtils;
|
||||||
import org.jeecg.common.util.filter.FileTypeFilter;
|
import org.jeecg.common.util.filter.FileTypeFilter;
|
||||||
import org.jeecg.common.util.oConvertUtils;
|
import org.jeecg.common.util.oConvertUtils;
|
||||||
import org.springframework.beans.factory.annotation.Value;
|
import org.springframework.beans.factory.annotation.Value;
|
||||||
|
import org.springframework.http.HttpHeaders;
|
||||||
|
import org.springframework.http.HttpMethod;
|
||||||
|
import org.springframework.http.ResponseEntity;
|
||||||
|
import org.springframework.http.server.ServletServerHttpRequest;
|
||||||
import org.springframework.util.AntPathMatcher;
|
import org.springframework.util.AntPathMatcher;
|
||||||
import org.springframework.util.FileCopyUtils;
|
import org.springframework.util.FileCopyUtils;
|
||||||
import org.springframework.web.bind.annotation.GetMapping;
|
import org.springframework.web.bind.annotation.*;
|
||||||
import org.springframework.web.bind.annotation.PostMapping;
|
|
||||||
import org.springframework.web.bind.annotation.RequestMapping;
|
|
||||||
import org.springframework.web.bind.annotation.RestController;
|
|
||||||
import org.springframework.web.multipart.MultipartFile;
|
import org.springframework.web.multipart.MultipartFile;
|
||||||
import org.springframework.web.multipart.MultipartHttpServletRequest;
|
import org.springframework.web.multipart.MultipartHttpServletRequest;
|
||||||
import org.springframework.web.servlet.HandlerMapping;
|
import org.springframework.web.servlet.HandlerMapping;
|
||||||
@ -23,7 +28,7 @@ import org.springframework.web.servlet.ModelAndView;
|
|||||||
import javax.servlet.http.HttpServletRequest;
|
import javax.servlet.http.HttpServletRequest;
|
||||||
import javax.servlet.http.HttpServletResponse;
|
import javax.servlet.http.HttpServletResponse;
|
||||||
import java.io.*;
|
import java.io.*;
|
||||||
|
import java.net.URLDecoder;
|
||||||
/**
|
/**
|
||||||
* <p>
|
* <p>
|
||||||
* 用户表 前端控制器
|
* 用户表 前端控制器
|
||||||
|
|||||||
@ -9,7 +9,9 @@ import org.jeecg.common.util.SqlInjectionUtil;
|
|||||||
import org.jeecg.modules.system.mapper.SysDictMapper;
|
import org.jeecg.modules.system.mapper.SysDictMapper;
|
||||||
import org.jeecg.modules.system.model.DuplicateCheckVo;
|
import org.jeecg.modules.system.model.DuplicateCheckVo;
|
||||||
import org.jeecg.modules.system.security.DictQueryBlackListHandler;
|
import org.jeecg.modules.system.security.DictQueryBlackListHandler;
|
||||||
|
import org.mybatis.spring.MyBatisSystemException;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
import org.springframework.web.bind.annotation.ExceptionHandler;
|
||||||
import org.springframework.web.bind.annotation.RequestMapping;
|
import org.springframework.web.bind.annotation.RequestMapping;
|
||||||
import org.springframework.web.bind.annotation.RequestMethod;
|
import org.springframework.web.bind.annotation.RequestMethod;
|
||||||
import org.springframework.web.bind.annotation.RestController;
|
import org.springframework.web.bind.annotation.RestController;
|
||||||
@ -47,7 +49,7 @@ public class DuplicateCheckController {
|
|||||||
public Result<String> doDuplicateCheck(DuplicateCheckVo duplicateCheckVo, HttpServletRequest request) {
|
public Result<String> doDuplicateCheck(DuplicateCheckVo duplicateCheckVo, HttpServletRequest request) {
|
||||||
Long num = null;
|
Long num = null;
|
||||||
|
|
||||||
log.info("----duplicate check------："+ duplicateCheckVo.toString());
|
log.debug("----duplicate check------："+ duplicateCheckVo.toString());
|
||||||
//关联表字典（举例：sys_user,realname,id）
|
//关联表字典（举例：sys_user,realname,id）
|
||||||
//SQL注入校验（只限制非法串改数据库）
|
//SQL注入校验（只限制非法串改数据库）
|
||||||
final String[] sqlInjCheck = {duplicateCheckVo.getTableName(),duplicateCheckVo.getFieldName()};
|
final String[] sqlInjCheck = {duplicateCheckVo.getTableName(),duplicateCheckVo.getFieldName()};
|
||||||
@ -67,13 +69,22 @@ public class DuplicateCheckController {
|
|||||||
}
|
}
|
||||||
//update-end-author:taoyan date:20220329 for: VUEN-223【安全漏洞】当前被攻击的接口
|
//update-end-author:taoyan date:20220329 for: VUEN-223【安全漏洞】当前被攻击的接口
|
||||||
// update-end-author:taoyan date:20211227 for: JTC-25 【online报表】oracle 操作问题 录入弹框啥都不填直接保存 ①编码不是应该提示必填么？②报错也应该是具体文字提示，不是后台错误日志
|
// update-end-author:taoyan date:20211227 for: JTC-25 【online报表】oracle 操作问题 录入弹框啥都不填直接保存 ①编码不是应该提示必填么？②报错也应该是具体文字提示，不是后台错误日志
|
||||||
if (StringUtils.isNotBlank(duplicateCheckVo.getDataId())) {
|
|
||||||
// [2].编辑页面校验
|
// update-begin-author:liusq date:20230721 for: [issues/5134] duplicate/check Sql泄露问题
|
||||||
num = sysDictMapper.duplicateCheckCountSql(duplicateCheckVo);
|
try{
|
||||||
} else {
|
if (StringUtils.isNotBlank(duplicateCheckVo.getDataId())) {
|
||||||
// [1].添加页面校验
|
// [2].编辑页面校验
|
||||||
num = sysDictMapper.duplicateCheckCountSqlNoDataId(duplicateCheckVo);
|
num = sysDictMapper.duplicateCheckCountSql(duplicateCheckVo);
|
||||||
|
} else {
|
||||||
|
// [1].添加页面校验
|
||||||
|
num = sysDictMapper.duplicateCheckCountSqlNoDataId(duplicateCheckVo);
|
||||||
|
}
|
||||||
|
}catch(MyBatisSystemException e){
|
||||||
|
log.error(e.getMessage(), e);
|
||||||
|
String errorCause = "查询异常,请检查唯一校验的配置！";
|
||||||
|
return Result.error(errorCause);
|
||||||
}
|
}
|
||||||
|
// update-end-author:liusq date:20230721 for: [issues/5134] duplicate/check Sql泄露问题
|
||||||
|
|
||||||
if (num == null || num == 0) {
|
if (num == null || num == 0) {
|
||||||
// 该值可用
|
// 该值可用
|
||||||
@ -84,4 +95,21 @@ public class DuplicateCheckController {
|
|||||||
return Result.error("该值不可用，系统中已存在！");
|
return Result.error("该值不可用，系统中已存在！");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* VUEN-2584【issue】平台sql注入漏洞几个问题
|
||||||
|
* 部分特殊函数 可以将查询结果混夹在错误信息中，导致数据库的信息暴露
|
||||||
|
* @param e
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
@ExceptionHandler(java.sql.SQLException.class)
|
||||||
|
public Result<?> handleSQLException(Exception e){
|
||||||
|
String msg = e.getMessage();
|
||||||
|
String extractvalue = "extractvalue";
|
||||||
|
String updatexml = "updatexml";
|
||||||
|
if(msg!=null && (msg.toLowerCase().indexOf(extractvalue)>=0 || msg.toLowerCase().indexOf(updatexml)>=0)){
|
||||||
|
return Result.error("校验失败，sql解析异常！");
|
||||||
|
}
|
||||||
|
return Result.error("校验失败，sql解析异常！" + msg);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -9,6 +9,7 @@ import io.swagger.annotations.Api;
|
|||||||
import io.swagger.annotations.ApiOperation;
|
import io.swagger.annotations.ApiOperation;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.apache.shiro.SecurityUtils;
|
import org.apache.shiro.SecurityUtils;
|
||||||
|
import org.apache.shiro.authz.annotation.RequiresRoles;
|
||||||
import org.jeecg.common.api.vo.Result;
|
import org.jeecg.common.api.vo.Result;
|
||||||
import org.jeecg.common.constant.CacheConstant;
|
import org.jeecg.common.constant.CacheConstant;
|
||||||
import org.jeecg.common.constant.CommonConstant;
|
import org.jeecg.common.constant.CommonConstant;
|
||||||
@ -76,6 +77,11 @@ public class LoginController {
|
|||||||
Result<JSONObject> result = new Result<JSONObject>();
|
Result<JSONObject> result = new Result<JSONObject>();
|
||||||
String username = sysLoginModel.getUsername();
|
String username = sysLoginModel.getUsername();
|
||||||
String password = sysLoginModel.getPassword();
|
String password = sysLoginModel.getPassword();
|
||||||
|
//update-begin-author:taoyan date:2022-11-7 for: issues/4109 平台用户登录失败锁定用户
|
||||||
|
if(isLoginFailOvertimes(username)){
|
||||||
|
return result.error500("该用户登录失败次数过多，请于10分钟后再次登录！");
|
||||||
|
}
|
||||||
|
//update-end-author:taoyan date:2022-11-7 for: issues/4109 平台用户登录失败锁定用户
|
||||||
//update-begin--Author:scott Date:20190805 for：暂时注释掉密码加密逻辑，有点问题
|
//update-begin--Author:scott Date:20190805 for：暂时注释掉密码加密逻辑，有点问题
|
||||||
//前端密码加密，后端进行密码解密
|
//前端密码加密，后端进行密码解密
|
||||||
//password = AesEncryptUtil.desEncrypt(sysLoginModel.getPassword().replaceAll("%2B", "\\+")).trim();//密码解密
|
//password = AesEncryptUtil.desEncrypt(sysLoginModel.getPassword().replaceAll("%2B", "\\+")).trim();//密码解密
|
||||||
@ -119,6 +125,9 @@ public class LoginController {
|
|||||||
String userpassword = PasswordUtil.encrypt(username, password, sysUser.getSalt());
|
String userpassword = PasswordUtil.encrypt(username, password, sysUser.getSalt());
|
||||||
String syspassword = sysUser.getPassword();
|
String syspassword = sysUser.getPassword();
|
||||||
if (!syspassword.equals(userpassword)) {
|
if (!syspassword.equals(userpassword)) {
|
||||||
|
//update-begin-author:taoyan date:2022-11-7 for: issues/4109 平台用户登录失败锁定用户
|
||||||
|
addLoginFailOvertimes(username);
|
||||||
|
//update-end-author:taoyan date:2022-11-7 for: issues/4109 平台用户登录失败锁定用户
|
||||||
result.error500("用户名或密码错误");
|
result.error500("用户名或密码错误");
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
@ -128,6 +137,7 @@ public class LoginController {
|
|||||||
//update-begin--Author:liusq Date:20210126 for：登录成功，删除redis中的验证码
|
//update-begin--Author:liusq Date:20210126 for：登录成功，删除redis中的验证码
|
||||||
redisUtil.del(realKey);
|
redisUtil.del(realKey);
|
||||||
//update-begin--Author:liusq Date:20210126 for：登录成功，删除redis中的验证码
|
//update-begin--Author:liusq Date:20210126 for：登录成功，删除redis中的验证码
|
||||||
|
redisUtil.del(CommonConstant.LOGIN_FAIL + username);
|
||||||
LoginUser loginUser = new LoginUser();
|
LoginUser loginUser = new LoginUser();
|
||||||
BeanUtils.copyProperties(sysUser, loginUser);
|
BeanUtils.copyProperties(sysUser, loginUser);
|
||||||
baseCommonService.addLog("用户名: " + username + ",登录成功！", CommonConstant.LOG_TYPE_1, null,loginUser);
|
baseCommonService.addLog("用户名: " + username + ",登录成功！", CommonConstant.LOG_TYPE_1, null,loginUser);
|
||||||
@ -271,8 +281,12 @@ public class LoginController {
|
|||||||
LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal();
|
LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal();
|
||||||
username = sysUser.getUsername();
|
username = sysUser.getUsername();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//获取登录部门
|
||||||
String orgCode= user.getOrgCode();
|
String orgCode= user.getOrgCode();
|
||||||
this.sysUserService.updateUserDepart(username, orgCode);
|
//获取登录租户
|
||||||
|
Integer tenantId = user.getLoginTenantId();
|
||||||
|
this.sysUserService.updateUserDepart(username, orgCode,tenantId);
|
||||||
SysUser sysUser = sysUserService.getUserByName(username);
|
SysUser sysUser = sysUserService.getUserByName(username);
|
||||||
JSONObject obj = new JSONObject();
|
JSONObject obj = new JSONObject();
|
||||||
obj.put("userInfo", sysUser);
|
obj.put("userInfo", sysUser);
|
||||||
@ -386,7 +400,11 @@ public class LoginController {
|
|||||||
public Result<JSONObject> phoneLogin(@RequestBody JSONObject jsonObject) {
|
public Result<JSONObject> phoneLogin(@RequestBody JSONObject jsonObject) {
|
||||||
Result<JSONObject> result = new Result<JSONObject>();
|
Result<JSONObject> result = new Result<JSONObject>();
|
||||||
String phone = jsonObject.getString("mobile");
|
String phone = jsonObject.getString("mobile");
|
||||||
|
//update-begin-author:taoyan date:2022-11-7 for: issues/4109 平台用户登录失败锁定用户
|
||||||
|
if(isLoginFailOvertimes(phone)){
|
||||||
|
return result.error500("该用户登录失败次数过多，请于10分钟后再次登录！");
|
||||||
|
}
|
||||||
|
//update-end-author:taoyan date:2022-11-7 for: issues/4109 平台用户登录失败锁定用户
|
||||||
//校验用户有效性
|
//校验用户有效性
|
||||||
SysUser sysUser = sysUserService.getUserByPhone(phone);
|
SysUser sysUser = sysUserService.getUserByPhone(phone);
|
||||||
result = sysUserService.checkUserIsEffective(sysUser);
|
result = sysUserService.checkUserIsEffective(sysUser);
|
||||||
@ -402,6 +420,9 @@ public class LoginController {
|
|||||||
//update-end-author:taoyan date:2022-9-13 for: VUEN-2245 【漏洞】发现新漏洞待处理20220906
|
//update-end-author:taoyan date:2022-9-13 for: VUEN-2245 【漏洞】发现新漏洞待处理20220906
|
||||||
|
|
||||||
if (!smscode.equals(code)) {
|
if (!smscode.equals(code)) {
|
||||||
|
//update-begin-author:taoyan date:2022-11-7 for: issues/4109 平台用户登录失败锁定用户
|
||||||
|
addLoginFailOvertimes(phone);
|
||||||
|
//update-end-author:taoyan date:2022-11-7 for: issues/4109 平台用户登录失败锁定用户
|
||||||
result.setMessage("手机验证码错误");
|
result.setMessage("手机验证码错误");
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
@ -427,46 +448,36 @@ public class LoginController {
|
|||||||
// 获取用户部门信息
|
// 获取用户部门信息
|
||||||
JSONObject obj = new JSONObject(new LinkedHashMap<>());
|
JSONObject obj = new JSONObject(new LinkedHashMap<>());
|
||||||
|
|
||||||
// 生成token
|
//1.生成token
|
||||||
String token = JwtUtil.sign(username, syspassword);
|
String token = JwtUtil.sign(username, syspassword);
|
||||||
// 设置token缓存有效时间
|
// 设置token缓存有效时间
|
||||||
redisUtil.set(CommonConstant.PREFIX_USER_TOKEN + token, token);
|
redisUtil.set(CommonConstant.PREFIX_USER_TOKEN + token, token);
|
||||||
redisUtil.expire(CommonConstant.PREFIX_USER_TOKEN + token, JwtUtil.EXPIRE_TIME * 2 / 1000);
|
redisUtil.expire(CommonConstant.PREFIX_USER_TOKEN + token, JwtUtil.EXPIRE_TIME * 2 / 1000);
|
||||||
obj.put("token", token);
|
obj.put("token", token);
|
||||||
|
|
||||||
// update-begin--Author:sunjianlei Date:20210802 for：获取用户租户信息
|
//2.设置登录租户
|
||||||
String tenantIds = sysUser.getRelTenantIds();
|
Result<JSONObject> loginTenantError = sysUserService.setLoginTenant(sysUser, obj, username,result);
|
||||||
if (oConvertUtils.isNotEmpty(tenantIds)) {
|
if (loginTenantError != null) {
|
||||||
List<Integer> tenantIdList = new ArrayList<>();
|
return loginTenantError;
|
||||||
for(String id: tenantIds.split(SymbolConstant.COMMA)){
|
|
||||||
tenantIdList.add(Integer.valueOf(id));
|
|
||||||
}
|
|
||||||
// 该方法仅查询有效的租户，如果返回0个就说明所有的租户均无效。
|
|
||||||
List<SysTenant> tenantList = sysTenantService.queryEffectiveTenant(tenantIdList);
|
|
||||||
if (tenantList.size() == 0) {
|
|
||||||
result.error500("与该用户关联的租户均已被冻结，无法登录！");
|
|
||||||
return result;
|
|
||||||
} else {
|
|
||||||
obj.put("tenantList", tenantList);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
// update-end--Author:sunjianlei Date:20210802 for：获取用户租户信息
|
|
||||||
|
|
||||||
|
//3.设置登录用户信息
|
||||||
obj.put("userInfo", sysUser);
|
obj.put("userInfo", sysUser);
|
||||||
|
|
||||||
|
//4.设置登录部门
|
||||||
List<SysDepart> departs = sysDepartService.queryUserDeparts(sysUser.getId());
|
List<SysDepart> departs = sysDepartService.queryUserDeparts(sysUser.getId());
|
||||||
obj.put("departs", departs);
|
obj.put("departs", departs);
|
||||||
if (departs == null || departs.size() == 0) {
|
if (departs == null || departs.size() == 0) {
|
||||||
obj.put("multi_depart", 0);
|
obj.put("multi_depart", 0);
|
||||||
} else if (departs.size() == 1) {
|
} else if (departs.size() == 1) {
|
||||||
sysUserService.updateUserDepart(username, departs.get(0).getOrgCode());
|
sysUserService.updateUserDepart(username, departs.get(0).getOrgCode(),null);
|
||||||
obj.put("multi_depart", 1);
|
obj.put("multi_depart", 1);
|
||||||
} else {
|
} else {
|
||||||
//查询当前是否有登录部门
|
//查询当前是否有登录部门
|
||||||
// update-begin--Author:wangshuai Date:20200805 for：如果用戶为选择部门，数据库为存在上一次登录部门，则取一条存进去
|
// update-begin--Author:wangshuai Date:20200805 for：如果用戶为选择部门，数据库为存在上一次登录部门，则取一条存进去
|
||||||
SysUser sysUserById = sysUserService.getById(sysUser.getId());
|
SysUser sysUserById = sysUserService.getById(sysUser.getId());
|
||||||
if(oConvertUtils.isEmpty(sysUserById.getOrgCode())){
|
if(oConvertUtils.isEmpty(sysUserById.getOrgCode())){
|
||||||
sysUserService.updateUserDepart(username, departs.get(0).getOrgCode());
|
sysUserService.updateUserDepart(username, departs.get(0).getOrgCode(),null);
|
||||||
}
|
}
|
||||||
// update-end--Author:wangshuai Date:20200805 for：如果用戶为选择部门，数据库为存在上一次登录部门，则取一条存进去
|
// update-end--Author:wangshuai Date:20200805 for：如果用戶为选择部门，数据库为存在上一次登录部门，则取一条存进去
|
||||||
obj.put("multi_depart", 2);
|
obj.put("multi_depart", 2);
|
||||||
@ -529,6 +540,7 @@ public class LoginController {
|
|||||||
/**
|
/**
|
||||||
* 切换菜单表为vue3的表
|
* 切换菜单表为vue3的表
|
||||||
*/
|
*/
|
||||||
|
@RequiresRoles({"admin"})
|
||||||
@GetMapping(value = "/switchVue3Menu")
|
@GetMapping(value = "/switchVue3Menu")
|
||||||
public Result<String> switchVue3Menu(HttpServletResponse response) {
|
public Result<String> switchVue3Menu(HttpServletResponse response) {
|
||||||
Result<String> res = new Result<String>();
|
Result<String> res = new Result<String>();
|
||||||
@ -547,7 +559,13 @@ public class LoginController {
|
|||||||
Result<JSONObject> result = new Result<JSONObject>();
|
Result<JSONObject> result = new Result<JSONObject>();
|
||||||
String username = sysLoginModel.getUsername();
|
String username = sysLoginModel.getUsername();
|
||||||
String password = sysLoginModel.getPassword();
|
String password = sysLoginModel.getPassword();
|
||||||
|
JSONObject obj = new JSONObject();
|
||||||
|
|
||||||
|
//update-begin-author:taoyan date:2022-11-7 for: issues/4109 平台用户登录失败锁定用户
|
||||||
|
if(isLoginFailOvertimes(username)){
|
||||||
|
return result.error500("该用户登录失败次数过多，请于10分钟后再次登录！");
|
||||||
|
}
|
||||||
|
//update-end-author:taoyan date:2022-11-7 for: issues/4109 平台用户登录失败锁定用户
|
||||||
//1. 校验用户是否有效
|
//1. 校验用户是否有效
|
||||||
SysUser sysUser = sysUserService.getUserByName(username);
|
SysUser sysUser = sysUserService.getUserByName(username);
|
||||||
result = sysUserService.checkUserIsEffective(sysUser);
|
result = sysUserService.checkUserIsEffective(sysUser);
|
||||||
@ -559,10 +577,14 @@ public class LoginController {
|
|||||||
String userpassword = PasswordUtil.encrypt(username, password, sysUser.getSalt());
|
String userpassword = PasswordUtil.encrypt(username, password, sysUser.getSalt());
|
||||||
String syspassword = sysUser.getPassword();
|
String syspassword = sysUser.getPassword();
|
||||||
if (!syspassword.equals(userpassword)) {
|
if (!syspassword.equals(userpassword)) {
|
||||||
|
//update-begin-author:taoyan date:2022-11-7 for: issues/4109 平台用户登录失败锁定用户
|
||||||
|
addLoginFailOvertimes(username);
|
||||||
|
//update-end-author:taoyan date:2022-11-7 for: issues/4109 平台用户登录失败锁定用户
|
||||||
result.error500("用户名或密码错误");
|
result.error500("用户名或密码错误");
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//3.设置登录部门
|
||||||
String orgCode = sysUser.getOrgCode();
|
String orgCode = sysUser.getOrgCode();
|
||||||
if(oConvertUtils.isEmpty(orgCode)) {
|
if(oConvertUtils.isEmpty(orgCode)) {
|
||||||
//如果当前用户无选择部门 查看部门关联信息
|
//如果当前用户无选择部门 查看部门关联信息
|
||||||
@ -574,15 +596,21 @@ public class LoginController {
|
|||||||
}else{
|
}else{
|
||||||
orgCode = departs.get(0).getOrgCode();
|
orgCode = departs.get(0).getOrgCode();
|
||||||
sysUser.setOrgCode(orgCode);
|
sysUser.setOrgCode(orgCode);
|
||||||
this.sysUserService.updateUserDepart(username, orgCode);
|
this.sysUserService.updateUserDepart(username, orgCode,null);
|
||||||
}
|
}
|
||||||
//update-end-author:taoyan date:20220117 for: JTC-1068【app】新建用户，没有设置部门及角色，点击登录提示暂未归属部，一直在登录页面 使用手机号登录 可正常
|
//update-end-author:taoyan date:20220117 for: JTC-1068【app】新建用户，没有设置部门及角色，点击登录提示暂未归属部，一直在登录页面 使用手机号登录 可正常
|
||||||
}
|
}
|
||||||
JSONObject obj = new JSONObject();
|
|
||||||
//用户登录信息
|
//4. 设置登录租户
|
||||||
|
Result<JSONObject> loginTenantError = sysUserService.setLoginTenant(sysUser, obj, username, result);
|
||||||
|
if (loginTenantError != null) {
|
||||||
|
return loginTenantError;
|
||||||
|
}
|
||||||
|
|
||||||
|
//5. 设置登录用户信息
|
||||||
obj.put("userInfo", sysUser);
|
obj.put("userInfo", sysUser);
|
||||||
|
|
||||||
// 生成token
|
//6. 生成token
|
||||||
String token = JwtUtil.sign(username, syspassword);
|
String token = JwtUtil.sign(username, syspassword);
|
||||||
// 设置超时时间
|
// 设置超时时间
|
||||||
redisUtil.set(CommonConstant.PREFIX_USER_TOKEN + token, token);
|
redisUtil.set(CommonConstant.PREFIX_USER_TOKEN + token, token);
|
||||||
@ -671,4 +699,36 @@ public class LoginController {
|
|||||||
return Result.OK(result);
|
return Result.OK(result);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 登录失败超出次数5 返回true
|
||||||
|
* @param username
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
private boolean isLoginFailOvertimes(String username){
|
||||||
|
String key = CommonConstant.LOGIN_FAIL + username;
|
||||||
|
Object failTime = redisUtil.get(key);
|
||||||
|
if(failTime!=null){
|
||||||
|
Integer val = Integer.parseInt(failTime.toString());
|
||||||
|
if(val>5){
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 记录登录失败次数
|
||||||
|
* @param username
|
||||||
|
*/
|
||||||
|
private void addLoginFailOvertimes(String username){
|
||||||
|
String key = CommonConstant.LOGIN_FAIL + username;
|
||||||
|
Object failTime = redisUtil.get(key);
|
||||||
|
Integer val = 0;
|
||||||
|
if(failTime!=null){
|
||||||
|
val = Integer.parseInt(failTime.toString());
|
||||||
|
}
|
||||||
|
// 1小时
|
||||||
|
redisUtil.set(key, ++val, 3600);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@ -11,6 +11,7 @@ import lombok.extern.slf4j.Slf4j;
|
|||||||
import org.apache.commons.lang.StringUtils;
|
import org.apache.commons.lang.StringUtils;
|
||||||
import org.apache.shiro.SecurityUtils;
|
import org.apache.shiro.SecurityUtils;
|
||||||
import org.jeecg.common.api.vo.Result;
|
import org.jeecg.common.api.vo.Result;
|
||||||
|
import org.jeecg.common.config.TenantContext;
|
||||||
import org.jeecg.common.constant.CommonConstant;
|
import org.jeecg.common.constant.CommonConstant;
|
||||||
import org.jeecg.common.constant.CommonSendStatus;
|
import org.jeecg.common.constant.CommonSendStatus;
|
||||||
import org.jeecg.common.constant.WebsocketConst;
|
import org.jeecg.common.constant.WebsocketConst;
|
||||||
@ -21,6 +22,7 @@ import org.jeecg.common.util.DateUtils;
|
|||||||
import org.jeecg.common.util.RedisUtil;
|
import org.jeecg.common.util.RedisUtil;
|
||||||
import org.jeecg.common.util.TokenUtils;
|
import org.jeecg.common.util.TokenUtils;
|
||||||
import org.jeecg.common.util.oConvertUtils;
|
import org.jeecg.common.util.oConvertUtils;
|
||||||
|
import org.jeecg.config.mybatis.MybatisPlusSaasConfig;
|
||||||
import org.jeecg.modules.message.enums.RangeDateEnum;
|
import org.jeecg.modules.message.enums.RangeDateEnum;
|
||||||
import org.jeecg.modules.message.websocket.WebSocket;
|
import org.jeecg.modules.message.websocket.WebSocket;
|
||||||
import org.jeecg.modules.system.entity.SysAnnouncement;
|
import org.jeecg.modules.system.entity.SysAnnouncement;
|
||||||
@ -93,6 +95,12 @@ public class SysAnnouncementController {
|
|||||||
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
||||||
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
|
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
|
||||||
HttpServletRequest req) {
|
HttpServletRequest req) {
|
||||||
|
//------------------------------------------------------------------------------------------------
|
||||||
|
//是否开启系统管理模块的多租户数据隔离【SAAS多租户模式】
|
||||||
|
if(MybatisPlusSaasConfig.OPEN_SYSTEM_TENANT_CONTROL){
|
||||||
|
sysAnnouncement.setTenantId(oConvertUtils.getInt(TenantContext.getTenant(), 0));
|
||||||
|
}
|
||||||
|
//------------------------------------------------------------------------------------------------
|
||||||
Result<IPage<SysAnnouncement>> result = new Result<IPage<SysAnnouncement>>();
|
Result<IPage<SysAnnouncement>> result = new Result<IPage<SysAnnouncement>>();
|
||||||
sysAnnouncement.setDelFlag(CommonConstant.DEL_FLAG_0.toString());
|
sysAnnouncement.setDelFlag(CommonConstant.DEL_FLAG_0.toString());
|
||||||
QueryWrapper<SysAnnouncement> queryWrapper = QueryGenerator.initQueryWrapper(sysAnnouncement, req.getParameterMap());
|
QueryWrapper<SysAnnouncement> queryWrapper = QueryGenerator.initQueryWrapper(sysAnnouncement, req.getParameterMap());
|
||||||
@ -547,7 +555,32 @@ public class SysAnnouncementController {
|
|||||||
sysAnnouncementService.updateReaded(annoceIdList);
|
sysAnnouncementService.updateReaded(annoceIdList);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
//update-begin-author:taoyan date:2022-9-25 for: VUEN-2261【移动端 系统消息】通知公告显示7条消息，点进去查看后，仍然显示7条；其他地方已读后，未读条数减少
|
||||||
|
JSONObject obj = new JSONObject();
|
||||||
|
obj.put(WebsocketConst.MSG_CMD, WebsocketConst.CMD_USER);
|
||||||
|
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
||||||
|
webSocket.sendMessage(sysUser.getId(), obj.toJSONString());
|
||||||
|
//update-end-author:taoyan date:2022-9-25 for: VUEN-2261【移动端 系统消息】通知公告显示7条消息，点进去查看后，仍然显示7条；其他地方已读后，未读条数减少
|
||||||
return Result.ok(ls);
|
return Result.ok(ls);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 根据用户id获取最新一条消息发送时间(创建时间)
|
||||||
|
* @param userId
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
@GetMapping("/getLastAnnountTime")
|
||||||
|
public Result<Page<SysAnnouncementSend>> getLastAnnountTime(@RequestParam(name = "userId") String userId){
|
||||||
|
Result<Page<SysAnnouncementSend>> result = new Result<>();
|
||||||
|
Page<SysAnnouncementSend> page = new Page<>(1,1);
|
||||||
|
LambdaQueryWrapper<SysAnnouncementSend> query = new LambdaQueryWrapper<>();
|
||||||
|
query.eq(SysAnnouncementSend::getUserId,userId);
|
||||||
|
query.select(SysAnnouncementSend::getCreateTime);
|
||||||
|
query.orderByDesc(SysAnnouncementSend::getCreateTime);
|
||||||
|
Page<SysAnnouncementSend> pageList = sysAnnouncementSendService.page(page, query);
|
||||||
|
result.setSuccess(true);
|
||||||
|
result.setResult(pageList);
|
||||||
|
return result;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -9,6 +9,7 @@ import lombok.extern.slf4j.Slf4j;
|
|||||||
import org.apache.commons.lang.StringUtils;
|
import org.apache.commons.lang.StringUtils;
|
||||||
import org.apache.shiro.SecurityUtils;
|
import org.apache.shiro.SecurityUtils;
|
||||||
import org.jeecg.common.api.vo.Result;
|
import org.jeecg.common.api.vo.Result;
|
||||||
|
import org.jeecg.common.config.TenantContext;
|
||||||
import org.jeecg.common.constant.CommonConstant;
|
import org.jeecg.common.constant.CommonConstant;
|
||||||
import org.jeecg.common.system.query.QueryGenerator;
|
import org.jeecg.common.system.query.QueryGenerator;
|
||||||
import org.jeecg.common.system.vo.DictModel;
|
import org.jeecg.common.system.vo.DictModel;
|
||||||
@ -16,6 +17,7 @@ import org.jeecg.common.system.vo.LoginUser;
|
|||||||
import org.jeecg.common.util.ImportExcelUtil;
|
import org.jeecg.common.util.ImportExcelUtil;
|
||||||
import org.jeecg.common.util.SqlInjectionUtil;
|
import org.jeecg.common.util.SqlInjectionUtil;
|
||||||
import org.jeecg.common.util.oConvertUtils;
|
import org.jeecg.common.util.oConvertUtils;
|
||||||
|
import org.jeecg.config.mybatis.MybatisPlusSaasConfig;
|
||||||
import org.jeecg.modules.system.entity.SysCategory;
|
import org.jeecg.modules.system.entity.SysCategory;
|
||||||
import org.jeecg.modules.system.model.TreeSelectModel;
|
import org.jeecg.modules.system.model.TreeSelectModel;
|
||||||
import org.jeecg.modules.system.service.ISysCategoryService;
|
import org.jeecg.modules.system.service.ISysCategoryService;
|
||||||
@ -71,6 +73,12 @@ public class SysCategoryController {
|
|||||||
sysCategory.setPid("0");
|
sysCategory.setPid("0");
|
||||||
}
|
}
|
||||||
Result<IPage<SysCategory>> result = new Result<IPage<SysCategory>>();
|
Result<IPage<SysCategory>> result = new Result<IPage<SysCategory>>();
|
||||||
|
//------------------------------------------------------------------------------------------------
|
||||||
|
//是否开启系统管理模块的多租户数据隔离【SAAS多租户模式】
|
||||||
|
if(MybatisPlusSaasConfig.OPEN_SYSTEM_TENANT_CONTROL){
|
||||||
|
sysCategory.setTenantId(oConvertUtils.getInt(TenantContext.getTenant(),0));
|
||||||
|
}
|
||||||
|
//------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
//--author:os_chengtgen---date:20190804 -----for: 分类字典页面显示错误,issues:377--------start
|
//--author:os_chengtgen---date:20190804 -----for: 分类字典页面显示错误,issues:377--------start
|
||||||
//--author:liusq---date:20211119 -----for: 【vue3】分类字典页面查询条件配置--------start
|
//--author:liusq---date:20211119 -----for: 【vue3】分类字典页面查询条件配置--------start
|
||||||
@ -93,6 +101,12 @@ public class SysCategoryController {
|
|||||||
|
|
||||||
@GetMapping(value = "/childList")
|
@GetMapping(value = "/childList")
|
||||||
public Result<List<SysCategory>> queryPageList(SysCategory sysCategory,HttpServletRequest req) {
|
public Result<List<SysCategory>> queryPageList(SysCategory sysCategory,HttpServletRequest req) {
|
||||||
|
//------------------------------------------------------------------------------------------------
|
||||||
|
//是否开启系统管理模块的多租户数据隔离【SAAS多租户模式】
|
||||||
|
if(MybatisPlusSaasConfig.OPEN_SYSTEM_TENANT_CONTROL){
|
||||||
|
sysCategory.setTenantId(oConvertUtils.getInt(TenantContext.getTenant(), 0));
|
||||||
|
}
|
||||||
|
//------------------------------------------------------------------------------------------------
|
||||||
Result<List<SysCategory>> result = new Result<List<SysCategory>>();
|
Result<List<SysCategory>> result = new Result<List<SysCategory>>();
|
||||||
QueryWrapper<SysCategory> queryWrapper = QueryGenerator.initQueryWrapper(sysCategory, req.getParameterMap());
|
QueryWrapper<SysCategory> queryWrapper = QueryGenerator.initQueryWrapper(sysCategory, req.getParameterMap());
|
||||||
List<SysCategory> list = sysCategoryService.list(queryWrapper);
|
List<SysCategory> list = sysCategoryService.list(queryWrapper);
|
||||||
@ -199,6 +213,13 @@ public class SysCategoryController {
|
|||||||
*/
|
*/
|
||||||
@RequestMapping(value = "/exportXls")
|
@RequestMapping(value = "/exportXls")
|
||||||
public ModelAndView exportXls(HttpServletRequest request, SysCategory sysCategory) {
|
public ModelAndView exportXls(HttpServletRequest request, SysCategory sysCategory) {
|
||||||
|
//------------------------------------------------------------------------------------------------
|
||||||
|
//是否开启系统管理模块的多租户数据隔离【SAAS多租户模式】
|
||||||
|
if(MybatisPlusSaasConfig.OPEN_SYSTEM_TENANT_CONTROL){
|
||||||
|
sysCategory.setTenantId(oConvertUtils.getInt(TenantContext.getTenant(), 0));
|
||||||
|
}
|
||||||
|
//------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
// Step.1 组装查询条件查询数据
|
// Step.1 组装查询条件查询数据
|
||||||
QueryWrapper<SysCategory> queryWrapper = QueryGenerator.initQueryWrapper(sysCategory, request.getParameterMap());
|
QueryWrapper<SysCategory> queryWrapper = QueryGenerator.initQueryWrapper(sysCategory, request.getParameterMap());
|
||||||
List<SysCategory> pageList = sysCategoryService.list(queryWrapper);
|
List<SysCategory> pageList = sysCategoryService.list(queryWrapper);
|
||||||
|
|||||||
@ -97,7 +97,7 @@ public class SysCommentController extends JeecgController<SysComment, ISysCommen
|
|||||||
sysCommentService.saveOneFileComment(request);
|
sysCommentService.saveOneFileComment(request);
|
||||||
return Result.OK("success");
|
return Result.OK("success");
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
log.error("评论文件上传失败", e.getMessage());
|
log.error("评论文件上传失败：{}", e.getMessage());
|
||||||
return Result.error("操作失败," + e.getMessage());
|
return Result.error("操作失败," + e.getMessage());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -144,7 +144,7 @@ public class SysCommentController extends JeecgController<SysComment, ISysCommen
|
|||||||
* @param req
|
* @param req
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
////@AutoLog(value = "系统评论回复表-分页列表查询")
|
//@AutoLog(value = "系统评论回复表-分页列表查询")
|
||||||
@ApiOperation(value = "系统评论回复表-分页列表查询", notes = "系统评论回复表-分页列表查询")
|
@ApiOperation(value = "系统评论回复表-分页列表查询", notes = "系统评论回复表-分页列表查询")
|
||||||
@GetMapping(value = "/list")
|
@GetMapping(value = "/list")
|
||||||
public Result<IPage<SysComment>> queryPageList(SysComment sysComment,
|
public Result<IPage<SysComment>> queryPageList(SysComment sysComment,
|
||||||
@ -223,7 +223,7 @@ public class SysCommentController extends JeecgController<SysComment, ISysCommen
|
|||||||
* @param id
|
* @param id
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
////@AutoLog(value = "系统评论回复表-通过id查询")
|
//@AutoLog(value = "系统评论回复表-通过id查询")
|
||||||
@ApiOperation(value = "系统评论回复表-通过id查询", notes = "系统评论回复表-通过id查询")
|
@ApiOperation(value = "系统评论回复表-通过id查询", notes = "系统评论回复表-通过id查询")
|
||||||
@GetMapping(value = "/queryById")
|
@GetMapping(value = "/queryById")
|
||||||
public Result<SysComment> queryById(@RequestParam(name = "id", required = true) String id) {
|
public Result<SysComment> queryById(@RequestParam(name = "id", required = true) String id) {
|
||||||
|
|||||||
@ -13,14 +13,18 @@ import io.swagger.annotations.Api;
|
|||||||
import io.swagger.annotations.ApiOperation;
|
import io.swagger.annotations.ApiOperation;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.apache.commons.lang.StringUtils;
|
import org.apache.commons.lang.StringUtils;
|
||||||
|
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
||||||
import org.apache.shiro.authz.annotation.RequiresRoles;
|
import org.apache.shiro.authz.annotation.RequiresRoles;
|
||||||
import org.jeecg.common.api.vo.Result;
|
import org.jeecg.common.api.vo.Result;
|
||||||
import org.jeecg.common.aspect.annotation.AutoLog;
|
import org.jeecg.common.aspect.annotation.AutoLog;
|
||||||
|
import org.jeecg.common.config.TenantContext;
|
||||||
import org.jeecg.common.exception.JeecgBootException;
|
import org.jeecg.common.exception.JeecgBootException;
|
||||||
import org.jeecg.common.system.base.controller.JeecgController;
|
import org.jeecg.common.system.base.controller.JeecgController;
|
||||||
import org.jeecg.common.system.query.QueryGenerator;
|
import org.jeecg.common.system.query.QueryGenerator;
|
||||||
import org.jeecg.common.util.dynamic.db.DataSourceCachePool;
|
import org.jeecg.common.util.dynamic.db.DataSourceCachePool;
|
||||||
|
import org.jeecg.common.util.oConvertUtils;
|
||||||
import org.jeecg.common.util.security.JdbcSecurityUtil;
|
import org.jeecg.common.util.security.JdbcSecurityUtil;
|
||||||
|
import org.jeecg.config.mybatis.MybatisPlusSaasConfig;
|
||||||
import org.jeecg.modules.system.entity.SysDataSource;
|
import org.jeecg.modules.system.entity.SysDataSource;
|
||||||
import org.jeecg.modules.system.service.ISysDataSourceService;
|
import org.jeecg.modules.system.service.ISysDataSourceService;
|
||||||
import org.jeecg.modules.system.util.SecurityUtil;
|
import org.jeecg.modules.system.util.SecurityUtil;
|
||||||
@ -61,14 +65,19 @@ public class SysDataSourceController extends JeecgController<SysDataSource, ISys
|
|||||||
*/
|
*/
|
||||||
@AutoLog(value = "多数据源管理-分页列表查询")
|
@AutoLog(value = "多数据源管理-分页列表查询")
|
||||||
@ApiOperation(value = "多数据源管理-分页列表查询", notes = "多数据源管理-分页列表查询")
|
@ApiOperation(value = "多数据源管理-分页列表查询", notes = "多数据源管理-分页列表查询")
|
||||||
//@RequiresRoles("admin")
|
//@RequiresPermissions("system:datasource:list")
|
||||||
@GetMapping(value = "/list")
|
@GetMapping(value = "/list")
|
||||||
public Result<?> queryPageList(
|
public Result<?> queryPageList(
|
||||||
SysDataSource sysDataSource,
|
SysDataSource sysDataSource,
|
||||||
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
|
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
|
||||||
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
|
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
|
||||||
HttpServletRequest req
|
HttpServletRequest req) {
|
||||||
) {
|
//------------------------------------------------------------------------------------------------
|
||||||
|
//是否开启系统管理模块的多租户数据隔离【SAAS多租户模式】
|
||||||
|
if(MybatisPlusSaasConfig.OPEN_SYSTEM_TENANT_CONTROL){
|
||||||
|
sysDataSource.setTenantId(oConvertUtils.getInt(TenantContext.getTenant(), 0));
|
||||||
|
}
|
||||||
|
//------------------------------------------------------------------------------------------------
|
||||||
QueryWrapper<SysDataSource> queryWrapper = QueryGenerator.initQueryWrapper(sysDataSource, req.getParameterMap());
|
QueryWrapper<SysDataSource> queryWrapper = QueryGenerator.initQueryWrapper(sysDataSource, req.getParameterMap());
|
||||||
Page<SysDataSource> page = new Page<>(pageNo, pageSize);
|
Page<SysDataSource> page = new Page<>(pageNo, pageSize);
|
||||||
IPage<SysDataSource> pageList = sysDataSourceService.page(page, queryWrapper);
|
IPage<SysDataSource> pageList = sysDataSourceService.page(page, queryWrapper);
|
||||||
@ -77,6 +86,13 @@ public class SysDataSourceController extends JeecgController<SysDataSource, ISys
|
|||||||
|
|
||||||
@GetMapping(value = "/options")
|
@GetMapping(value = "/options")
|
||||||
public Result<?> queryOptions(SysDataSource sysDataSource, HttpServletRequest req) {
|
public Result<?> queryOptions(SysDataSource sysDataSource, HttpServletRequest req) {
|
||||||
|
//------------------------------------------------------------------------------------------------
|
||||||
|
//是否开启系统管理模块的多租户数据隔离【SAAS多租户模式】
|
||||||
|
if(MybatisPlusSaasConfig.OPEN_SYSTEM_TENANT_CONTROL){
|
||||||
|
sysDataSource.setTenantId(oConvertUtils.getInt(TenantContext.getTenant(), 0));
|
||||||
|
}
|
||||||
|
//------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
QueryWrapper<SysDataSource> queryWrapper = QueryGenerator.initQueryWrapper(sysDataSource, req.getParameterMap());
|
QueryWrapper<SysDataSource> queryWrapper = QueryGenerator.initQueryWrapper(sysDataSource, req.getParameterMap());
|
||||||
List<SysDataSource> pageList = sysDataSourceService.list(queryWrapper);
|
List<SysDataSource> pageList = sysDataSourceService.list(queryWrapper);
|
||||||
JSONArray array = new JSONArray(pageList.size());
|
JSONArray array = new JSONArray(pageList.size());
|
||||||
@ -192,6 +208,12 @@ public class SysDataSourceController extends JeecgController<SysDataSource, ISys
|
|||||||
*/
|
*/
|
||||||
@RequestMapping(value = "/exportXls")
|
@RequestMapping(value = "/exportXls")
|
||||||
public ModelAndView exportXls(HttpServletRequest request, SysDataSource sysDataSource) {
|
public ModelAndView exportXls(HttpServletRequest request, SysDataSource sysDataSource) {
|
||||||
|
//------------------------------------------------------------------------------------------------
|
||||||
|
//是否开启系统管理模块的多租户数据隔离【SAAS多租户模式】
|
||||||
|
if(MybatisPlusSaasConfig.OPEN_SYSTEM_TENANT_CONTROL){
|
||||||
|
sysDataSource.setTenantId(oConvertUtils.getInt(TenantContext.getTenant(), 0));
|
||||||
|
}
|
||||||
|
//------------------------------------------------------------------------------------------------
|
||||||
return super.exportXls(request, sysDataSource, SysDataSource.class, "多数据源管理");
|
return super.exportXls(request, sysDataSource, SysDataSource.class, "多数据源管理");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -6,8 +6,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.apache.commons.lang3.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.apache.shiro.SecurityUtils;
|
import org.apache.shiro.SecurityUtils;
|
||||||
import org.apache.shiro.authz.annotation.RequiresRoles;
|
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
||||||
import org.jeecg.common.api.vo.Result;
|
import org.jeecg.common.api.vo.Result;
|
||||||
|
import org.jeecg.common.config.TenantContext;
|
||||||
import org.jeecg.common.constant.CacheConstant;
|
import org.jeecg.common.constant.CacheConstant;
|
||||||
import org.jeecg.common.constant.CommonConstant;
|
import org.jeecg.common.constant.CommonConstant;
|
||||||
import org.jeecg.common.system.query.QueryGenerator;
|
import org.jeecg.common.system.query.QueryGenerator;
|
||||||
@ -16,6 +17,7 @@ import org.jeecg.common.system.vo.LoginUser;
|
|||||||
import org.jeecg.common.util.ImportExcelUtil;
|
import org.jeecg.common.util.ImportExcelUtil;
|
||||||
import org.jeecg.common.util.YouBianCodeUtil;
|
import org.jeecg.common.util.YouBianCodeUtil;
|
||||||
import org.jeecg.common.util.oConvertUtils;
|
import org.jeecg.common.util.oConvertUtils;
|
||||||
|
import org.jeecg.config.mybatis.MybatisPlusSaasConfig;
|
||||||
import org.jeecg.modules.system.entity.SysDepart;
|
import org.jeecg.modules.system.entity.SysDepart;
|
||||||
import org.jeecg.modules.system.entity.SysUser;
|
import org.jeecg.modules.system.entity.SysUser;
|
||||||
import org.jeecg.modules.system.model.DepartIdModel;
|
import org.jeecg.modules.system.model.DepartIdModel;
|
||||||
@ -148,8 +150,7 @@ public class SysDepartController {
|
|||||||
@GetMapping("/queryAllParentId")
|
@GetMapping("/queryAllParentId")
|
||||||
public Result queryParentIds(
|
public Result queryParentIds(
|
||||||
@RequestParam(name = "departId", required = false) String departId,
|
@RequestParam(name = "departId", required = false) String departId,
|
||||||
@RequestParam(name = "orgCode", required = false) String orgCode
|
@RequestParam(name = "orgCode", required = false) String orgCode) {
|
||||||
) {
|
|
||||||
try {
|
try {
|
||||||
JSONObject data;
|
JSONObject data;
|
||||||
if (oConvertUtils.isNotEmpty(departId)) {
|
if (oConvertUtils.isNotEmpty(departId)) {
|
||||||
@ -172,7 +173,7 @@ public class SysDepartController {
|
|||||||
* @param sysDepart
|
* @param sysDepart
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
//@RequiresRoles({"admin"})
|
//@RequiresPermissions("system:depart:add")
|
||||||
@RequestMapping(value = "/add", method = RequestMethod.POST)
|
@RequestMapping(value = "/add", method = RequestMethod.POST)
|
||||||
@CacheEvict(value= {CacheConstant.SYS_DEPARTS_CACHE,CacheConstant.SYS_DEPART_IDS_CACHE}, allEntries=true)
|
@CacheEvict(value= {CacheConstant.SYS_DEPARTS_CACHE,CacheConstant.SYS_DEPART_IDS_CACHE}, allEntries=true)
|
||||||
public Result<SysDepart> add(@RequestBody SysDepart sysDepart, HttpServletRequest request) {
|
public Result<SysDepart> add(@RequestBody SysDepart sysDepart, HttpServletRequest request) {
|
||||||
@ -198,7 +199,7 @@ public class SysDepartController {
|
|||||||
* @param sysDepart
|
* @param sysDepart
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
//@RequiresRoles({"admin"})
|
//@RequiresPermissions("system:depart:edit")
|
||||||
@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
|
@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
|
||||||
@CacheEvict(value= {CacheConstant.SYS_DEPARTS_CACHE,CacheConstant.SYS_DEPART_IDS_CACHE}, allEntries=true)
|
@CacheEvict(value= {CacheConstant.SYS_DEPARTS_CACHE,CacheConstant.SYS_DEPART_IDS_CACHE}, allEntries=true)
|
||||||
public Result<SysDepart> edit(@RequestBody SysDepart sysDepart, HttpServletRequest request) {
|
public Result<SysDepart> edit(@RequestBody SysDepart sysDepart, HttpServletRequest request) {
|
||||||
@ -226,7 +227,7 @@ public class SysDepartController {
|
|||||||
* @param id
|
* @param id
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
//@RequiresRoles({"admin"})
|
//@RequiresPermissions("system:depart:delete")
|
||||||
@RequestMapping(value = "/delete", method = RequestMethod.DELETE)
|
@RequestMapping(value = "/delete", method = RequestMethod.DELETE)
|
||||||
@CacheEvict(value= {CacheConstant.SYS_DEPARTS_CACHE,CacheConstant.SYS_DEPART_IDS_CACHE}, allEntries=true)
|
@CacheEvict(value= {CacheConstant.SYS_DEPARTS_CACHE,CacheConstant.SYS_DEPART_IDS_CACHE}, allEntries=true)
|
||||||
public Result<SysDepart> delete(@RequestParam(name="id",required=true) String id) {
|
public Result<SysDepart> delete(@RequestParam(name="id",required=true) String id) {
|
||||||
@ -236,13 +237,11 @@ public class SysDepartController {
|
|||||||
if(sysDepart==null) {
|
if(sysDepart==null) {
|
||||||
result.error500("未找到对应实体");
|
result.error500("未找到对应实体");
|
||||||
}else {
|
}else {
|
||||||
boolean ok = sysDepartService.delete(id);
|
sysDepartService.deleteDepart(id);
|
||||||
if(ok) {
|
//清除部门树内存
|
||||||
//清除部门树内存
|
//FindsDepartsChildrenUtil.clearSysDepartTreeList();
|
||||||
//FindsDepartsChildrenUtil.clearSysDepartTreeList();
|
// FindsDepartsChildrenUtil.clearDepartIdModel();
|
||||||
// FindsDepartsChildrenUtil.clearDepartIdModel();
|
result.success("删除成功!");
|
||||||
result.success("删除成功!");
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
@ -254,7 +253,7 @@ public class SysDepartController {
|
|||||||
* @param ids
|
* @param ids
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
//@RequiresRoles({"admin"})
|
//@RequiresPermissions("system:depart:deleteBatch")
|
||||||
@RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE)
|
@RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE)
|
||||||
@CacheEvict(value= {CacheConstant.SYS_DEPARTS_CACHE,CacheConstant.SYS_DEPART_IDS_CACHE}, allEntries=true)
|
@CacheEvict(value= {CacheConstant.SYS_DEPARTS_CACHE,CacheConstant.SYS_DEPART_IDS_CACHE}, allEntries=true)
|
||||||
public Result<SysDepart> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
|
public Result<SysDepart> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
|
||||||
@ -341,6 +340,13 @@ public class SysDepartController {
|
|||||||
*/
|
*/
|
||||||
@RequestMapping(value = "/exportXls")
|
@RequestMapping(value = "/exportXls")
|
||||||
public ModelAndView exportXls(SysDepart sysDepart,HttpServletRequest request) {
|
public ModelAndView exportXls(SysDepart sysDepart,HttpServletRequest request) {
|
||||||
|
//------------------------------------------------------------------------------------------------
|
||||||
|
//是否开启系统管理模块的多租户数据隔离【SAAS多租户模式】
|
||||||
|
if(MybatisPlusSaasConfig.OPEN_SYSTEM_TENANT_CONTROL){
|
||||||
|
sysDepart.setTenantId(oConvertUtils.getInt(TenantContext.getTenant(), 0));
|
||||||
|
}
|
||||||
|
//------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
// Step.1 组装查询条件
|
// Step.1 组装查询条件
|
||||||
QueryWrapper<SysDepart> queryWrapper = QueryGenerator.initQueryWrapper(sysDepart, request.getParameterMap());
|
QueryWrapper<SysDepart> queryWrapper = QueryGenerator.initQueryWrapper(sysDepart, request.getParameterMap());
|
||||||
//Step.2 AutoPoi 导出Excel
|
//Step.2 AutoPoi 导出Excel
|
||||||
@ -371,7 +377,7 @@ public class SysDepartController {
|
|||||||
* @param response
|
* @param response
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
//@RequiresRoles({"admin"})
|
//@RequiresPermissions("system:depart:importExcel")
|
||||||
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
|
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
|
||||||
@CacheEvict(value= {CacheConstant.SYS_DEPARTS_CACHE,CacheConstant.SYS_DEPART_IDS_CACHE}, allEntries=true)
|
@CacheEvict(value= {CacheConstant.SYS_DEPARTS_CACHE,CacheConstant.SYS_DEPART_IDS_CACHE}, allEntries=true)
|
||||||
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
|
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
|
||||||
@ -526,4 +532,46 @@ public class SysDepartController {
|
|||||||
result.setResult(sysUsers);
|
result.setResult(sysUsers);
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @功能：根据id 批量查询
|
||||||
|
* @param deptIds
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
@RequestMapping(value = "/queryByIds", method = RequestMethod.GET)
|
||||||
|
public Result<Collection<SysDepart>> queryByIds(@RequestParam String deptIds) {
|
||||||
|
Result<Collection<SysDepart>> result = new Result<>();
|
||||||
|
String[] ids = deptIds.split(",");
|
||||||
|
Collection<String> idList = Arrays.asList(ids);
|
||||||
|
Collection<SysDepart> deptList = sysDepartService.listByIds(idList);
|
||||||
|
result.setSuccess(true);
|
||||||
|
result.setResult(deptList);
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
@GetMapping("/getMyDepartList")
|
||||||
|
public Result<List<SysDepart>> getMyDepartList(){
|
||||||
|
List<SysDepart> list = sysDepartService.getMyDepartList();
|
||||||
|
return Result.ok(list);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 异步查询部门list
|
||||||
|
* @param parentId 父节点 异步加载时传递
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
@RequestMapping(value = "/queryBookDepTreeSync", method = RequestMethod.GET)
|
||||||
|
public Result<List<SysDepartTreeModel>> queryBookDepTreeSync(@RequestParam(name = "pid", required = false) String parentId,
|
||||||
|
@RequestParam(name = "tenantId") Integer tenantId,
|
||||||
|
@RequestParam(name = "departName",required = false) String departName) {
|
||||||
|
Result<List<SysDepartTreeModel>> result = new Result<>();
|
||||||
|
try {
|
||||||
|
List<SysDepartTreeModel> list = sysDepartService.queryBookDepTreeSync(parentId, tenantId, departName);
|
||||||
|
result.setResult(list);
|
||||||
|
result.setSuccess(true);
|
||||||
|
} catch (Exception e) {
|
||||||
|
log.error(e.getMessage(),e);
|
||||||
|
}
|
||||||
|
return result;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -9,6 +9,7 @@ import javax.servlet.http.HttpServletResponse;
|
|||||||
import com.alibaba.fastjson.JSONObject;
|
import com.alibaba.fastjson.JSONObject;
|
||||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||||
import org.apache.shiro.SecurityUtils;
|
import org.apache.shiro.SecurityUtils;
|
||||||
|
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
||||||
import org.apache.shiro.authz.annotation.RequiresRoles;
|
import org.apache.shiro.authz.annotation.RequiresRoles;
|
||||||
import org.jeecg.common.api.vo.Result;
|
import org.jeecg.common.api.vo.Result;
|
||||||
import org.jeecg.common.constant.CommonConstant;
|
import org.jeecg.common.constant.CommonConstant;
|
||||||
@ -103,7 +104,7 @@ public class SysDepartRoleController extends JeecgController<SysDepartRole, ISys
|
|||||||
* @param sysDepartRole
|
* @param sysDepartRole
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
//@RequiresRoles({"admin"})
|
//@RequiresPermissions("system:depart:role:add")
|
||||||
@ApiOperation(value="部门角色-添加", notes="部门角色-添加")
|
@ApiOperation(value="部门角色-添加", notes="部门角色-添加")
|
||||||
@PostMapping(value = "/add")
|
@PostMapping(value = "/add")
|
||||||
public Result<?> add(@RequestBody SysDepartRole sysDepartRole) {
|
public Result<?> add(@RequestBody SysDepartRole sysDepartRole) {
|
||||||
@ -117,8 +118,8 @@ public class SysDepartRoleController extends JeecgController<SysDepartRole, ISys
|
|||||||
* @param sysDepartRole
|
* @param sysDepartRole
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
//@RequiresRoles({"admin"})
|
|
||||||
@ApiOperation(value="部门角色-编辑", notes="部门角色-编辑")
|
@ApiOperation(value="部门角色-编辑", notes="部门角色-编辑")
|
||||||
|
//@RequiresPermissions("system:depart:role:edit")
|
||||||
@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
|
@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
|
||||||
public Result<?> edit(@RequestBody SysDepartRole sysDepartRole) {
|
public Result<?> edit(@RequestBody SysDepartRole sysDepartRole) {
|
||||||
sysDepartRoleService.updateById(sysDepartRole);
|
sysDepartRoleService.updateById(sysDepartRole);
|
||||||
@ -131,9 +132,9 @@ public class SysDepartRoleController extends JeecgController<SysDepartRole, ISys
|
|||||||
* @param id
|
* @param id
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
//@RequiresRoles({"admin"})
|
|
||||||
@AutoLog(value = "部门角色-通过id删除")
|
@AutoLog(value = "部门角色-通过id删除")
|
||||||
@ApiOperation(value="部门角色-通过id删除", notes="部门角色-通过id删除")
|
@ApiOperation(value="部门角色-通过id删除", notes="部门角色-通过id删除")
|
||||||
|
//@RequiresPermissions("system:depart:role:delete")
|
||||||
@DeleteMapping(value = "/delete")
|
@DeleteMapping(value = "/delete")
|
||||||
public Result<?> delete(@RequestParam(name="id",required=true) String id) {
|
public Result<?> delete(@RequestParam(name="id",required=true) String id) {
|
||||||
sysDepartRoleService.removeById(id);
|
sysDepartRoleService.removeById(id);
|
||||||
@ -146,9 +147,9 @@ public class SysDepartRoleController extends JeecgController<SysDepartRole, ISys
|
|||||||
* @param ids
|
* @param ids
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
//@RequiresRoles({"admin"})
|
|
||||||
@AutoLog(value = "部门角色-批量删除")
|
@AutoLog(value = "部门角色-批量删除")
|
||||||
@ApiOperation(value="部门角色-批量删除", notes="部门角色-批量删除")
|
@ApiOperation(value="部门角色-批量删除", notes="部门角色-批量删除")
|
||||||
|
//@RequiresPermissions("system:depart:role:deleteBatch")
|
||||||
@DeleteMapping(value = "/deleteBatch")
|
@DeleteMapping(value = "/deleteBatch")
|
||||||
public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
|
public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
|
||||||
this.sysDepartRoleService.removeByIds(Arrays.asList(ids.split(",")));
|
this.sysDepartRoleService.removeByIds(Arrays.asList(ids.split(",")));
|
||||||
@ -188,7 +189,7 @@ public class SysDepartRoleController extends JeecgController<SysDepartRole, ISys
|
|||||||
* @param json
|
* @param json
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
//@RequiresRoles({"admin"})
|
//@RequiresPermissions("system:depart:role:userAdd")
|
||||||
@RequestMapping(value = "/deptRoleUserAdd", method = RequestMethod.POST)
|
@RequestMapping(value = "/deptRoleUserAdd", method = RequestMethod.POST)
|
||||||
public Result<?> deptRoleAdd(@RequestBody JSONObject json) {
|
public Result<?> deptRoleAdd(@RequestBody JSONObject json) {
|
||||||
String newRoleId = json.getString("newRoleId");
|
String newRoleId = json.getString("newRoleId");
|
||||||
|
|||||||
@ -8,8 +8,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
|
|||||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.apache.shiro.SecurityUtils;
|
import org.apache.shiro.SecurityUtils;
|
||||||
import org.apache.shiro.authz.annotation.RequiresRoles;
|
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
||||||
import org.jeecg.common.api.vo.Result;
|
import org.jeecg.common.api.vo.Result;
|
||||||
|
import org.jeecg.common.config.TenantContext;
|
||||||
import org.jeecg.common.constant.CacheConstant;
|
import org.jeecg.common.constant.CacheConstant;
|
||||||
import org.jeecg.common.constant.CommonConstant;
|
import org.jeecg.common.constant.CommonConstant;
|
||||||
import org.jeecg.common.constant.SymbolConstant;
|
import org.jeecg.common.constant.SymbolConstant;
|
||||||
@ -17,9 +18,8 @@ import org.jeecg.common.system.query.QueryGenerator;
|
|||||||
import org.jeecg.common.system.vo.DictModel;
|
import org.jeecg.common.system.vo.DictModel;
|
||||||
import org.jeecg.common.system.vo.DictQuery;
|
import org.jeecg.common.system.vo.DictQuery;
|
||||||
import org.jeecg.common.system.vo.LoginUser;
|
import org.jeecg.common.system.vo.LoginUser;
|
||||||
import org.jeecg.common.util.ImportExcelUtil;
|
import org.jeecg.common.util.*;
|
||||||
import org.jeecg.common.util.SqlInjectionUtil;
|
import org.jeecg.config.mybatis.MybatisPlusSaasConfig;
|
||||||
import org.jeecg.common.util.oConvertUtils;
|
|
||||||
import org.jeecg.modules.system.entity.SysDict;
|
import org.jeecg.modules.system.entity.SysDict;
|
||||||
import org.jeecg.modules.system.entity.SysDictItem;
|
import org.jeecg.modules.system.entity.SysDictItem;
|
||||||
import org.jeecg.modules.system.model.SysDictTree;
|
import org.jeecg.modules.system.model.SysDictTree;
|
||||||
@ -28,6 +28,7 @@ import org.jeecg.modules.system.security.DictQueryBlackListHandler;
|
|||||||
import org.jeecg.modules.system.service.ISysDictItemService;
|
import org.jeecg.modules.system.service.ISysDictItemService;
|
||||||
import org.jeecg.modules.system.service.ISysDictService;
|
import org.jeecg.modules.system.service.ISysDictService;
|
||||||
import org.jeecg.modules.system.vo.SysDictPage;
|
import org.jeecg.modules.system.vo.SysDictPage;
|
||||||
|
import org.jeecg.modules.system.vo.lowapp.SysDictVo;
|
||||||
import org.jeecgframework.poi.excel.ExcelImportCheckUtil;
|
import org.jeecgframework.poi.excel.ExcelImportCheckUtil;
|
||||||
import org.jeecgframework.poi.excel.ExcelImportUtil;
|
import org.jeecgframework.poi.excel.ExcelImportUtil;
|
||||||
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
|
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
|
||||||
@ -45,6 +46,8 @@ import org.springframework.web.servlet.ModelAndView;
|
|||||||
|
|
||||||
import javax.servlet.http.HttpServletRequest;
|
import javax.servlet.http.HttpServletRequest;
|
||||||
import javax.servlet.http.HttpServletResponse;
|
import javax.servlet.http.HttpServletResponse;
|
||||||
|
import java.io.UnsupportedEncodingException;
|
||||||
|
import java.net.URLDecoder;
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -68,11 +71,19 @@ public class SysDictController {
|
|||||||
public RedisTemplate<String, Object> redisTemplate;
|
public RedisTemplate<String, Object> redisTemplate;
|
||||||
@Autowired
|
@Autowired
|
||||||
private DictQueryBlackListHandler dictQueryBlackListHandler;
|
private DictQueryBlackListHandler dictQueryBlackListHandler;
|
||||||
|
@Autowired
|
||||||
|
private RedisUtil redisUtil;
|
||||||
|
|
||||||
@RequestMapping(value = "/list", method = RequestMethod.GET)
|
@RequestMapping(value = "/list", method = RequestMethod.GET)
|
||||||
public Result<IPage<SysDict>> queryPageList(SysDict sysDict,@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
public Result<IPage<SysDict>> queryPageList(SysDict sysDict,@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
||||||
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,HttpServletRequest req) {
|
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,HttpServletRequest req) {
|
||||||
Result<IPage<SysDict>> result = new Result<IPage<SysDict>>();
|
Result<IPage<SysDict>> result = new Result<IPage<SysDict>>();
|
||||||
|
//------------------------------------------------------------------------------------------------
|
||||||
|
//是否开启系统管理模块的多租户数据隔离【SAAS多租户模式】
|
||||||
|
if(MybatisPlusSaasConfig.OPEN_SYSTEM_TENANT_CONTROL){
|
||||||
|
sysDict.setTenantId(oConvertUtils.getInt(TenantContext.getTenant(),0));
|
||||||
|
}
|
||||||
|
//------------------------------------------------------------------------------------------------
|
||||||
QueryWrapper<SysDict> queryWrapper = QueryGenerator.initQueryWrapper(sysDict, req.getParameterMap());
|
QueryWrapper<SysDict> queryWrapper = QueryGenerator.initQueryWrapper(sysDict, req.getParameterMap());
|
||||||
Page<SysDict> page = new Page<SysDict>(pageNo, pageSize);
|
Page<SysDict> page = new Page<SysDict>(pageNo, pageSize);
|
||||||
IPage<SysDict> pageList = sysDictService.page(page, queryWrapper);
|
IPage<SysDict> pageList = sysDictService.page(page, queryWrapper);
|
||||||
@ -191,9 +202,20 @@ public class SysDictController {
|
|||||||
*/
|
*/
|
||||||
@RequestMapping(value = "/loadDict/{dictCode}", method = RequestMethod.GET)
|
@RequestMapping(value = "/loadDict/{dictCode}", method = RequestMethod.GET)
|
||||||
public Result<List<DictModel>> loadDict(@PathVariable("dictCode") String dictCode,
|
public Result<List<DictModel>> loadDict(@PathVariable("dictCode") String dictCode,
|
||||||
@RequestParam(name="keyword",required = false) String keyword,
|
@RequestParam(name="keyword",required = false) String keyword,
|
||||||
@RequestParam(value = "sign",required = false) String sign,
|
@RequestParam(value = "sign",required = false) String sign,
|
||||||
@RequestParam(value = "pageSize", required = false) Integer pageSize) {
|
@RequestParam(value = "pageSize", required = false) Integer pageSize) {
|
||||||
|
|
||||||
|
//update-begin-author:taoyan date:2023-5-22 for: /issues/4905 因为中括号(%5)的问题导致的 表单生成器字段配置时，选择关联字段，在进行高级配置时，无法加载数据库列表，提示 Sgin签名校验错误！ #4905 RouteToRequestUrlFilter
|
||||||
|
if(keyword!=null && keyword.indexOf("%5")>=0){
|
||||||
|
try {
|
||||||
|
keyword = URLDecoder.decode(keyword, "UTF-8");
|
||||||
|
} catch (UnsupportedEncodingException e) {
|
||||||
|
log.error("下拉搜索关键字解码失败", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
//update-end-author:taoyan date:2023-5-22 for: /issues/4905 因为中括号(%5)的问题导致的 表单生成器字段配置时，选择关联字段，在进行高级配置时，无法加载数据库列表，提示 Sgin签名校验错误！ #4905
|
||||||
|
|
||||||
log.info(" 加载字典表数据,加载关键字: "+ keyword);
|
log.info(" 加载字典表数据,加载关键字: "+ keyword);
|
||||||
Result<List<DictModel>> result = new Result<List<DictModel>>();
|
Result<List<DictModel>> result = new Result<List<DictModel>>();
|
||||||
//update-begin-author:taoyan date:20220317 for: VUEN-222【安全机制】字典接口、online报表、online图表等接口，加一些安全机制
|
//update-begin-author:taoyan date:20220317 for: VUEN-222【安全机制】字典接口、online报表、online图表等接口，加一些安全机制
|
||||||
@ -325,6 +347,11 @@ public class SysDictController {
|
|||||||
// SQL注入漏洞 sign签名校验(表名,label字段,val字段,条件)
|
// SQL注入漏洞 sign签名校验(表名,label字段,val字段,条件)
|
||||||
String dictCode = tbname+","+text+","+code+","+condition;
|
String dictCode = tbname+","+text+","+code+","+condition;
|
||||||
SqlInjectionUtil.filterContent(dictCode);
|
SqlInjectionUtil.filterContent(dictCode);
|
||||||
|
//update-begin-author:scott date:20230723 for:【issues/5173】SQL注入
|
||||||
|
if(!dictQueryBlackListHandler.isPass(dictCode)){
|
||||||
|
return result.error500(dictQueryBlackListHandler.getError());
|
||||||
|
}
|
||||||
|
//update-end-author:scott date:20230723 for:【issues/5173】SQL注入
|
||||||
List<TreeSelectModel> ls = sysDictService.queryTreeList(query,tbname, text, code, pidField, pid,hasChildField,converIsLeafVal);
|
List<TreeSelectModel> ls = sysDictService.queryTreeList(query,tbname, text, code, pidField, pid,hasChildField,converIsLeafVal);
|
||||||
result.setSuccess(true);
|
result.setSuccess(true);
|
||||||
result.setResult(ls);
|
result.setResult(ls);
|
||||||
@ -364,7 +391,7 @@ public class SysDictController {
|
|||||||
* @param sysDict
|
* @param sysDict
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
//@RequiresRoles({"admin"})
|
//@RequiresPermissions("system:dict:add")
|
||||||
@RequestMapping(value = "/add", method = RequestMethod.POST)
|
@RequestMapping(value = "/add", method = RequestMethod.POST)
|
||||||
public Result<SysDict> add(@RequestBody SysDict sysDict) {
|
public Result<SysDict> add(@RequestBody SysDict sysDict) {
|
||||||
Result<SysDict> result = new Result<SysDict>();
|
Result<SysDict> result = new Result<SysDict>();
|
||||||
@ -385,7 +412,7 @@ public class SysDictController {
|
|||||||
* @param sysDict
|
* @param sysDict
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
//@RequiresRoles({"admin"})
|
//@RequiresPermissions("system:dict:edit")
|
||||||
@RequestMapping(value = "/edit", method = { RequestMethod.PUT,RequestMethod.POST })
|
@RequestMapping(value = "/edit", method = { RequestMethod.PUT,RequestMethod.POST })
|
||||||
public Result<SysDict> edit(@RequestBody SysDict sysDict) {
|
public Result<SysDict> edit(@RequestBody SysDict sysDict) {
|
||||||
Result<SysDict> result = new Result<SysDict>();
|
Result<SysDict> result = new Result<SysDict>();
|
||||||
@ -407,7 +434,7 @@ public class SysDictController {
|
|||||||
* @param id
|
* @param id
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
//@RequiresRoles({"admin"})
|
//@RequiresPermissions("system:dict:delete")
|
||||||
@RequestMapping(value = "/delete", method = RequestMethod.DELETE)
|
@RequestMapping(value = "/delete", method = RequestMethod.DELETE)
|
||||||
@CacheEvict(value={CacheConstant.SYS_DICT_CACHE, CacheConstant.SYS_ENABLE_DICT_CACHE}, allEntries=true)
|
@CacheEvict(value={CacheConstant.SYS_DICT_CACHE, CacheConstant.SYS_ENABLE_DICT_CACHE}, allEntries=true)
|
||||||
public Result<SysDict> delete(@RequestParam(name="id",required=true) String id) {
|
public Result<SysDict> delete(@RequestParam(name="id",required=true) String id) {
|
||||||
@ -426,7 +453,7 @@ public class SysDictController {
|
|||||||
* @param ids
|
* @param ids
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
//@RequiresRoles({"admin"})
|
//@RequiresPermissions("system:dict:deleteBatch")
|
||||||
@RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE)
|
@RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE)
|
||||||
@CacheEvict(value= {CacheConstant.SYS_DICT_CACHE, CacheConstant.SYS_ENABLE_DICT_CACHE}, allEntries=true)
|
@CacheEvict(value= {CacheConstant.SYS_DICT_CACHE, CacheConstant.SYS_ENABLE_DICT_CACHE}, allEntries=true)
|
||||||
public Result<SysDict> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
|
public Result<SysDict> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
|
||||||
@ -448,22 +475,33 @@ public class SysDictController {
|
|||||||
public Result<?> refleshCache() {
|
public Result<?> refleshCache() {
|
||||||
Result<?> result = new Result<SysDict>();
|
Result<?> result = new Result<SysDict>();
|
||||||
//清空字典缓存
|
//清空字典缓存
|
||||||
Set keys = redisTemplate.keys(CacheConstant.SYS_DICT_CACHE + "*");
|
// Set keys = redisTemplate.keys(CacheConstant.SYS_DICT_CACHE + "*");
|
||||||
Set keys7 = redisTemplate.keys(CacheConstant.SYS_ENABLE_DICT_CACHE + "*");
|
// Set keys7 = redisTemplate.keys(CacheConstant.SYS_ENABLE_DICT_CACHE + "*");
|
||||||
Set keys2 = redisTemplate.keys(CacheConstant.SYS_DICT_TABLE_CACHE + "*");
|
// Set keys2 = redisTemplate.keys(CacheConstant.SYS_DICT_TABLE_CACHE + "*");
|
||||||
Set keys21 = redisTemplate.keys(CacheConstant.SYS_DICT_TABLE_BY_KEYS_CACHE + "*");
|
// Set keys21 = redisTemplate.keys(CacheConstant.SYS_DICT_TABLE_BY_KEYS_CACHE + "*");
|
||||||
Set keys3 = redisTemplate.keys(CacheConstant.SYS_DEPARTS_CACHE + "*");
|
// Set keys3 = redisTemplate.keys(CacheConstant.SYS_DEPARTS_CACHE + "*");
|
||||||
Set keys4 = redisTemplate.keys(CacheConstant.SYS_DEPART_IDS_CACHE + "*");
|
// Set keys4 = redisTemplate.keys(CacheConstant.SYS_DEPART_IDS_CACHE + "*");
|
||||||
Set keys5 = redisTemplate.keys( "jmreport:cache:dict*");
|
// Set keys5 = redisTemplate.keys( "jmreport:cache:dict*");
|
||||||
Set keys6 = redisTemplate.keys( "jmreport:cache:dictTable*");
|
// Set keys6 = redisTemplate.keys( "jmreport:cache:dictTable*");
|
||||||
redisTemplate.delete(keys);
|
// redisTemplate.delete(keys);
|
||||||
redisTemplate.delete(keys2);
|
// redisTemplate.delete(keys2);
|
||||||
redisTemplate.delete(keys21);
|
// redisTemplate.delete(keys21);
|
||||||
redisTemplate.delete(keys3);
|
// redisTemplate.delete(keys3);
|
||||||
redisTemplate.delete(keys4);
|
// redisTemplate.delete(keys4);
|
||||||
redisTemplate.delete(keys5);
|
// redisTemplate.delete(keys5);
|
||||||
redisTemplate.delete(keys6);
|
// redisTemplate.delete(keys6);
|
||||||
redisTemplate.delete(keys7);
|
// redisTemplate.delete(keys7);
|
||||||
|
|
||||||
|
//update-begin-author:liusq date:20230404 for: [issue/4358]springCache中的清除缓存的操作使用了“keys”
|
||||||
|
redisUtil.removeAll(CacheConstant.SYS_DICT_CACHE);
|
||||||
|
redisUtil.removeAll(CacheConstant.SYS_ENABLE_DICT_CACHE);
|
||||||
|
redisUtil.removeAll(CacheConstant.SYS_DICT_TABLE_CACHE);
|
||||||
|
redisUtil.removeAll(CacheConstant.SYS_DICT_TABLE_BY_KEYS_CACHE);
|
||||||
|
redisUtil.removeAll(CacheConstant.SYS_DEPARTS_CACHE);
|
||||||
|
redisUtil.removeAll(CacheConstant.SYS_DEPART_IDS_CACHE);
|
||||||
|
redisUtil.removeAll("jmreport:cache:dict");
|
||||||
|
redisUtil.removeAll("jmreport:cache:dictTable");
|
||||||
|
//update-end-author:liusq date:20230404 for: [issue/4358]springCache中的清除缓存的操作使用了“keys”
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -474,6 +512,13 @@ public class SysDictController {
|
|||||||
*/
|
*/
|
||||||
@RequestMapping(value = "/exportXls")
|
@RequestMapping(value = "/exportXls")
|
||||||
public ModelAndView exportXls(SysDict sysDict,HttpServletRequest request) {
|
public ModelAndView exportXls(SysDict sysDict,HttpServletRequest request) {
|
||||||
|
//------------------------------------------------------------------------------------------------
|
||||||
|
//是否开启系统管理模块的多租户数据隔离【SAAS多租户模式】
|
||||||
|
if(MybatisPlusSaasConfig.OPEN_SYSTEM_TENANT_CONTROL){
|
||||||
|
sysDict.setTenantId(oConvertUtils.getInt(TenantContext.getTenant(), 0));
|
||||||
|
}
|
||||||
|
//------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
// Step.1 组装查询条件
|
// Step.1 组装查询条件
|
||||||
QueryWrapper<SysDict> queryWrapper = QueryGenerator.initQueryWrapper(sysDict, request.getParameterMap());
|
QueryWrapper<SysDict> queryWrapper = QueryGenerator.initQueryWrapper(sysDict, request.getParameterMap());
|
||||||
//Step.2 AutoPoi 导出Excel
|
//Step.2 AutoPoi 导出Excel
|
||||||
@ -509,7 +554,7 @@ public class SysDictController {
|
|||||||
* @param
|
* @param
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
//@RequiresRoles({"admin"})
|
//@RequiresPermissions("system:dict:importExcel")
|
||||||
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
|
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
|
||||||
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
|
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
|
||||||
MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
|
MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
|
||||||
@ -639,4 +684,36 @@ public class SysDictController {
|
|||||||
return Result.error("校验失败，sql解析异常！" + msg);
|
return Result.error("校验失败，sql解析异常！" + msg);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 根据应用id获取字典列表和详情
|
||||||
|
* @param request
|
||||||
|
*/
|
||||||
|
@GetMapping("/getDictListByLowAppId")
|
||||||
|
public Result<List<SysDictVo>> getDictListByLowAppId(HttpServletRequest request){
|
||||||
|
String lowAppId = oConvertUtils.getString(TokenUtils.getLowAppIdByRequest(request),"0");
|
||||||
|
List<SysDictVo> list = sysDictService.getDictListByLowAppId(lowAppId);
|
||||||
|
return Result.ok(list);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 添加字典
|
||||||
|
* @param sysDictVo
|
||||||
|
* @param request
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
@PostMapping("/addDictByLowAppId")
|
||||||
|
public Result<String> addDictByLowAppId(@RequestBody SysDictVo sysDictVo,HttpServletRequest request){
|
||||||
|
String lowAppId = oConvertUtils.getString(TokenUtils.getLowAppIdByRequest(request),"0");
|
||||||
|
sysDictVo.setLowAppId(lowAppId);
|
||||||
|
sysDictService.addDictByLowAppId(sysDictVo);
|
||||||
|
return Result.ok("添加成功");
|
||||||
|
}
|
||||||
|
|
||||||
|
@PutMapping("/editDictByLowAppId")
|
||||||
|
public Result<String> editDictByLowAppId(@RequestBody SysDictVo sysDictVo,HttpServletRequest request){
|
||||||
|
String lowAppId = oConvertUtils.getString(TokenUtils.getLowAppIdByRequest(request),"0");
|
||||||
|
sysDictVo.setLowAppId(lowAppId);
|
||||||
|
sysDictService.editDictByLowAppId(sysDictVo);
|
||||||
|
return Result.ok("编辑成功");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|||||||
import io.swagger.annotations.Api;
|
import io.swagger.annotations.Api;
|
||||||
import io.swagger.annotations.ApiOperation;
|
import io.swagger.annotations.ApiOperation;
|
||||||
import org.apache.commons.lang.StringUtils;
|
import org.apache.commons.lang.StringUtils;
|
||||||
|
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
||||||
import org.apache.shiro.authz.annotation.RequiresRoles;
|
import org.apache.shiro.authz.annotation.RequiresRoles;
|
||||||
import org.jeecg.common.api.vo.Result;
|
import org.jeecg.common.api.vo.Result;
|
||||||
import org.jeecg.common.constant.CacheConstant;
|
import org.jeecg.common.constant.CacheConstant;
|
||||||
@ -73,7 +74,7 @@ public class SysDictItemController {
|
|||||||
* @功能：新增
|
* @功能：新增
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
//@RequiresRoles({"admin"})
|
//@RequiresPermissions("system:dict:item:add")
|
||||||
@RequestMapping(value = "/add", method = RequestMethod.POST)
|
@RequestMapping(value = "/add", method = RequestMethod.POST)
|
||||||
@CacheEvict(value= {CacheConstant.SYS_DICT_CACHE, CacheConstant.SYS_ENABLE_DICT_CACHE}, allEntries=true)
|
@CacheEvict(value= {CacheConstant.SYS_DICT_CACHE, CacheConstant.SYS_ENABLE_DICT_CACHE}, allEntries=true)
|
||||||
public Result<SysDictItem> add(@RequestBody SysDictItem sysDictItem) {
|
public Result<SysDictItem> add(@RequestBody SysDictItem sysDictItem) {
|
||||||
@ -94,7 +95,7 @@ public class SysDictItemController {
|
|||||||
* @param sysDictItem
|
* @param sysDictItem
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
//@RequiresRoles({"admin"})
|
//@RequiresPermissions("system:dict:item:edit")
|
||||||
@RequestMapping(value = "/edit", method = { RequestMethod.PUT,RequestMethod.POST })
|
@RequestMapping(value = "/edit", method = { RequestMethod.PUT,RequestMethod.POST })
|
||||||
@CacheEvict(value={CacheConstant.SYS_DICT_CACHE, CacheConstant.SYS_ENABLE_DICT_CACHE}, allEntries=true)
|
@CacheEvict(value={CacheConstant.SYS_DICT_CACHE, CacheConstant.SYS_ENABLE_DICT_CACHE}, allEntries=true)
|
||||||
public Result<SysDictItem> edit(@RequestBody SysDictItem sysDictItem) {
|
public Result<SysDictItem> edit(@RequestBody SysDictItem sysDictItem) {
|
||||||
@ -118,7 +119,7 @@ public class SysDictItemController {
|
|||||||
* @param id
|
* @param id
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
//@RequiresRoles({"admin"})
|
//@RequiresPermissions("system:dict:item:delete")
|
||||||
@RequestMapping(value = "/delete", method = RequestMethod.DELETE)
|
@RequestMapping(value = "/delete", method = RequestMethod.DELETE)
|
||||||
@CacheEvict(value={CacheConstant.SYS_DICT_CACHE, CacheConstant.SYS_ENABLE_DICT_CACHE}, allEntries=true)
|
@CacheEvict(value={CacheConstant.SYS_DICT_CACHE, CacheConstant.SYS_ENABLE_DICT_CACHE}, allEntries=true)
|
||||||
public Result<SysDictItem> delete(@RequestParam(name="id",required=true) String id) {
|
public Result<SysDictItem> delete(@RequestParam(name="id",required=true) String id) {
|
||||||
@ -140,7 +141,7 @@ public class SysDictItemController {
|
|||||||
* @param ids
|
* @param ids
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
//@RequiresRoles({"admin"})
|
//@RequiresPermissions("system:dict:item:deleteBatch")
|
||||||
@RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE)
|
@RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE)
|
||||||
@CacheEvict(value={CacheConstant.SYS_DICT_CACHE, CacheConstant.SYS_ENABLE_DICT_CACHE}, allEntries=true)
|
@CacheEvict(value={CacheConstant.SYS_DICT_CACHE, CacheConstant.SYS_ENABLE_DICT_CACHE}, allEntries=true)
|
||||||
public Result<SysDictItem> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
|
public Result<SysDictItem> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
|
||||||
|
|||||||
@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
|
|||||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||||
import io.swagger.annotations.Api;
|
import io.swagger.annotations.Api;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
||||||
import org.apache.shiro.authz.annotation.RequiresRoles;
|
import org.apache.shiro.authz.annotation.RequiresRoles;
|
||||||
import org.jeecg.common.api.vo.Result;
|
import org.jeecg.common.api.vo.Result;
|
||||||
import org.jeecg.common.system.base.controller.JeecgController;
|
import org.jeecg.common.system.base.controller.JeecgController;
|
||||||
@ -67,7 +68,7 @@ public class SysGatewayRouteController extends JeecgController<SysGatewayRoute,
|
|||||||
* @param id
|
* @param id
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
//@RequiresRoles({"admin"})
|
//@RequiresPermissions("system:getway:delete")
|
||||||
@RequestMapping(value = "/delete", method = RequestMethod.DELETE)
|
@RequestMapping(value = "/delete", method = RequestMethod.DELETE)
|
||||||
public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
|
public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
|
||||||
sysGatewayRouteService.deleteById(id);
|
sysGatewayRouteService.deleteById(id);
|
||||||
|
|||||||
@ -1,11 +1,14 @@
|
|||||||
package org.jeecg.modules.system.controller;
|
package org.jeecg.modules.system.controller;
|
||||||
|
|
||||||
|
import cn.hutool.core.util.ObjectUtil;
|
||||||
import com.alibaba.fastjson.JSONArray;
|
import com.alibaba.fastjson.JSONArray;
|
||||||
import com.alibaba.fastjson.JSONObject;
|
import com.alibaba.fastjson.JSONObject;
|
||||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.apache.shiro.SecurityUtils;
|
import org.apache.shiro.SecurityUtils;
|
||||||
|
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
||||||
import org.apache.shiro.authz.annotation.RequiresRoles;
|
import org.apache.shiro.authz.annotation.RequiresRoles;
|
||||||
import org.jeecg.common.api.vo.Result;
|
import org.jeecg.common.api.vo.Result;
|
||||||
import org.jeecg.common.constant.CommonConstant;
|
import org.jeecg.common.constant.CommonConstant;
|
||||||
@ -75,6 +78,7 @@ public class SysPermissionController {
|
|||||||
*
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
|
//@RequiresPermissions("system:permission:list")
|
||||||
@RequestMapping(value = "/list", method = RequestMethod.GET)
|
@RequestMapping(value = "/list", method = RequestMethod.GET)
|
||||||
public Result<List<SysPermissionTree>> list(SysPermission sysPermission, HttpServletRequest req) {
|
public Result<List<SysPermissionTree>> list(SysPermission sysPermission, HttpServletRequest req) {
|
||||||
long start = System.currentTimeMillis();
|
long start = System.currentTimeMillis();
|
||||||
@ -356,7 +360,7 @@ public class SysPermissionController {
|
|||||||
* @param permission
|
* @param permission
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
//@RequiresRoles({ "admin" })
|
//@RequiresPermissions("system:permission:add")
|
||||||
@RequestMapping(value = "/add", method = RequestMethod.POST)
|
@RequestMapping(value = "/add", method = RequestMethod.POST)
|
||||||
public Result<SysPermission> add(@RequestBody SysPermission permission) {
|
public Result<SysPermission> add(@RequestBody SysPermission permission) {
|
||||||
Result<SysPermission> result = new Result<SysPermission>();
|
Result<SysPermission> result = new Result<SysPermission>();
|
||||||
@ -376,7 +380,7 @@ public class SysPermissionController {
|
|||||||
* @param permission
|
* @param permission
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
//@RequiresRoles({ "admin" })
|
//@RequiresPermissions("system:permission:edit")
|
||||||
@RequestMapping(value = "/edit", method = { RequestMethod.PUT, RequestMethod.POST })
|
@RequestMapping(value = "/edit", method = { RequestMethod.PUT, RequestMethod.POST })
|
||||||
public Result<SysPermission> edit(@RequestBody SysPermission permission) {
|
public Result<SysPermission> edit(@RequestBody SysPermission permission) {
|
||||||
Result<SysPermission> result = new Result<>();
|
Result<SysPermission> result = new Result<>();
|
||||||
@ -398,14 +402,14 @@ public class SysPermissionController {
|
|||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@RequestMapping(value = "/checkPermDuplication", method = RequestMethod.GET)
|
@RequestMapping(value = "/checkPermDuplication", method = RequestMethod.GET)
|
||||||
public Result<String> checkPermDuplication(@RequestParam(name = "id", required = false) String id, @RequestParam(name = "url") String url, @RequestParam(name = "alwaysShow") Boolean alwaysShow) {
|
public Result<String> checkPermDuplication(@RequestParam(name = "id", required = false) String id,@RequestParam(name = "url") String url,@RequestParam(name = "alwaysShow") Boolean alwaysShow) {
|
||||||
Result<String> result = new Result<>();
|
Result<String> result = new Result<>();
|
||||||
try {
|
try {
|
||||||
boolean check=sysPermissionService.checkPermDuplication(id,url,alwaysShow);
|
boolean check=sysPermissionService.checkPermDuplication(id,url,alwaysShow);
|
||||||
if(check){
|
if(check){
|
||||||
return Result.ok("该值可用！");
|
return Result.ok("该值可用！");
|
||||||
}
|
}
|
||||||
return Result.error("该值不可用，系统中已存在！");
|
return Result.error("访问路径不允许重复，请重定义！");
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
log.error(e.getMessage(), e);
|
log.error(e.getMessage(), e);
|
||||||
result.error500("操作失败");
|
result.error500("操作失败");
|
||||||
@ -418,7 +422,7 @@ public class SysPermissionController {
|
|||||||
* @param id
|
* @param id
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
//@RequiresRoles({ "admin" })
|
//@RequiresPermissions("system:permission:delete")
|
||||||
@RequestMapping(value = "/delete", method = RequestMethod.DELETE)
|
@RequestMapping(value = "/delete", method = RequestMethod.DELETE)
|
||||||
public Result<SysPermission> delete(@RequestParam(name = "id", required = true) String id) {
|
public Result<SysPermission> delete(@RequestParam(name = "id", required = true) String id) {
|
||||||
Result<SysPermission> result = new Result<>();
|
Result<SysPermission> result = new Result<>();
|
||||||
@ -437,7 +441,7 @@ public class SysPermissionController {
|
|||||||
* @param ids
|
* @param ids
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
//@RequiresRoles({ "admin" })
|
//@RequiresPermissions("system:permission:deleteBatch")
|
||||||
@RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE)
|
@RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE)
|
||||||
public Result<SysPermission> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
|
public Result<SysPermission> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
|
||||||
Result<SysPermission> result = new Result<>();
|
Result<SysPermission> result = new Result<>();
|
||||||
@ -544,8 +548,8 @@ public class SysPermissionController {
|
|||||||
*
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
|
//@RequiresPermissions("system:permission:saveRole")
|
||||||
@RequestMapping(value = "/saveRolePermission", method = RequestMethod.POST)
|
@RequestMapping(value = "/saveRolePermission", method = RequestMethod.POST)
|
||||||
//@RequiresRoles({ "admin" })
|
|
||||||
public Result<String> saveRolePermission(@RequestBody JSONObject json) {
|
public Result<String> saveRolePermission(@RequestBody JSONObject json) {
|
||||||
long start = System.currentTimeMillis();
|
long start = System.currentTimeMillis();
|
||||||
Result<String> result = new Result<>();
|
Result<String> result = new Result<>();
|
||||||
@ -873,7 +877,7 @@ public class SysPermissionController {
|
|||||||
* @param sysPermissionDataRule
|
* @param sysPermissionDataRule
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
//@RequiresRoles({ "admin" })
|
//@RequiresPermissions("system:permission:addRule")
|
||||||
@RequestMapping(value = "/addPermissionRule", method = RequestMethod.POST)
|
@RequestMapping(value = "/addPermissionRule", method = RequestMethod.POST)
|
||||||
public Result<SysPermissionDataRule> addPermissionRule(@RequestBody SysPermissionDataRule sysPermissionDataRule) {
|
public Result<SysPermissionDataRule> addPermissionRule(@RequestBody SysPermissionDataRule sysPermissionDataRule) {
|
||||||
Result<SysPermissionDataRule> result = new Result<SysPermissionDataRule>();
|
Result<SysPermissionDataRule> result = new Result<SysPermissionDataRule>();
|
||||||
@ -888,7 +892,7 @@ public class SysPermissionController {
|
|||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
//@RequiresRoles({ "admin" })
|
//@RequiresPermissions("system:permission:editRule")
|
||||||
@RequestMapping(value = "/editPermissionRule", method = { RequestMethod.PUT, RequestMethod.POST })
|
@RequestMapping(value = "/editPermissionRule", method = { RequestMethod.PUT, RequestMethod.POST })
|
||||||
public Result<SysPermissionDataRule> editPermissionRule(@RequestBody SysPermissionDataRule sysPermissionDataRule) {
|
public Result<SysPermissionDataRule> editPermissionRule(@RequestBody SysPermissionDataRule sysPermissionDataRule) {
|
||||||
Result<SysPermissionDataRule> result = new Result<SysPermissionDataRule>();
|
Result<SysPermissionDataRule> result = new Result<SysPermissionDataRule>();
|
||||||
@ -908,7 +912,7 @@ public class SysPermissionController {
|
|||||||
* @param id
|
* @param id
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
//@RequiresRoles({ "admin" })
|
//@RequiresPermissions("system:permission:deleteRule")
|
||||||
@RequestMapping(value = "/deletePermissionRule", method = RequestMethod.DELETE)
|
@RequestMapping(value = "/deletePermissionRule", method = RequestMethod.DELETE)
|
||||||
public Result<SysPermissionDataRule> deletePermissionRule(@RequestParam(name = "id", required = true) String id) {
|
public Result<SysPermissionDataRule> deletePermissionRule(@RequestParam(name = "id", required = true) String id) {
|
||||||
Result<SysPermissionDataRule> result = new Result<SysPermissionDataRule>();
|
Result<SysPermissionDataRule> result = new Result<SysPermissionDataRule>();
|
||||||
@ -965,7 +969,7 @@ public class SysPermissionController {
|
|||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@RequestMapping(value = "/saveDepartPermission", method = RequestMethod.POST)
|
@RequestMapping(value = "/saveDepartPermission", method = RequestMethod.POST)
|
||||||
//@RequiresRoles({ "admin" })
|
//@RequiresPermissions("system:permission:saveDepart")
|
||||||
public Result<String> saveDepartPermission(@RequestBody JSONObject json) {
|
public Result<String> saveDepartPermission(@RequestBody JSONObject json) {
|
||||||
long start = System.currentTimeMillis();
|
long start = System.currentTimeMillis();
|
||||||
Result<String> result = new Result<>();
|
Result<String> result = new Result<>();
|
||||||
|
|||||||
@ -1,5 +1,6 @@
|
|||||||
package org.jeecg.modules.system.controller;
|
package org.jeecg.modules.system.controller;
|
||||||
|
|
||||||
|
import cn.hutool.core.util.RandomUtil;
|
||||||
import com.alibaba.fastjson.JSON;
|
import com.alibaba.fastjson.JSON;
|
||||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||||
@ -7,18 +8,19 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|||||||
import io.swagger.annotations.Api;
|
import io.swagger.annotations.Api;
|
||||||
import io.swagger.annotations.ApiOperation;
|
import io.swagger.annotations.ApiOperation;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.apache.poi.ss.formula.functions.T;
|
|
||||||
import org.apache.shiro.SecurityUtils;
|
import org.apache.shiro.SecurityUtils;
|
||||||
import org.jeecg.common.api.vo.Result;
|
import org.jeecg.common.api.vo.Result;
|
||||||
import org.jeecg.common.aspect.annotation.AutoLog;
|
import org.jeecg.common.aspect.annotation.AutoLog;
|
||||||
|
import org.jeecg.common.config.TenantContext;
|
||||||
import org.jeecg.common.constant.CommonConstant;
|
import org.jeecg.common.constant.CommonConstant;
|
||||||
import org.jeecg.common.system.query.QueryGenerator;
|
import org.jeecg.common.system.query.QueryGenerator;
|
||||||
import org.jeecg.common.system.vo.LoginUser;
|
import org.jeecg.common.system.vo.LoginUser;
|
||||||
import org.jeecg.common.util.ImportExcelUtil;
|
import org.jeecg.common.util.ImportExcelUtil;
|
||||||
import org.jeecg.common.util.oConvertUtils;
|
import org.jeecg.common.util.oConvertUtils;
|
||||||
import org.jeecg.modules.quartz.service.IQuartzJobService;
|
import org.jeecg.config.mybatis.MybatisPlusSaasConfig;
|
||||||
import org.jeecg.modules.system.entity.SysPosition;
|
import org.jeecg.modules.system.entity.SysPosition;
|
||||||
import org.jeecg.modules.system.service.ISysPositionService;
|
import org.jeecg.modules.system.service.ISysPositionService;
|
||||||
|
import org.jeecg.modules.system.service.ISysUserService;
|
||||||
import org.jeecgframework.poi.excel.ExcelImportUtil;
|
import org.jeecgframework.poi.excel.ExcelImportUtil;
|
||||||
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
|
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
|
||||||
import org.jeecgframework.poi.excel.entity.ExportParams;
|
import org.jeecgframework.poi.excel.entity.ExportParams;
|
||||||
@ -39,6 +41,7 @@ import java.util.ArrayList;
|
|||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @Description: 职务表
|
* @Description: 职务表
|
||||||
@ -55,6 +58,9 @@ public class SysPositionController {
|
|||||||
@Autowired
|
@Autowired
|
||||||
private ISysPositionService sysPositionService;
|
private ISysPositionService sysPositionService;
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private ISysUserService userService;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 分页列表查询
|
* 分页列表查询
|
||||||
*
|
*
|
||||||
@ -72,6 +78,12 @@ public class SysPositionController {
|
|||||||
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
|
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
|
||||||
HttpServletRequest req) {
|
HttpServletRequest req) {
|
||||||
Result<IPage<SysPosition>> result = new Result<IPage<SysPosition>>();
|
Result<IPage<SysPosition>> result = new Result<IPage<SysPosition>>();
|
||||||
|
//------------------------------------------------------------------------------------------------
|
||||||
|
//是否开启系统管理模块的多租户数据隔离【SAAS多租户模式】
|
||||||
|
if(MybatisPlusSaasConfig.OPEN_SYSTEM_TENANT_CONTROL){
|
||||||
|
sysPosition.setTenantId(oConvertUtils.getInt(TenantContext.getTenant(),0));
|
||||||
|
}
|
||||||
|
//------------------------------------------------------------------------------------------------
|
||||||
QueryWrapper<SysPosition> queryWrapper = QueryGenerator.initQueryWrapper(sysPosition, req.getParameterMap());
|
QueryWrapper<SysPosition> queryWrapper = QueryGenerator.initQueryWrapper(sysPosition, req.getParameterMap());
|
||||||
Page<SysPosition> page = new Page<SysPosition>(pageNo, pageSize);
|
Page<SysPosition> page = new Page<SysPosition>(pageNo, pageSize);
|
||||||
IPage<SysPosition> pageList = sysPositionService.page(page, queryWrapper);
|
IPage<SysPosition> pageList = sysPositionService.page(page, queryWrapper);
|
||||||
@ -92,6 +104,13 @@ public class SysPositionController {
|
|||||||
public Result<SysPosition> add(@RequestBody SysPosition sysPosition) {
|
public Result<SysPosition> add(@RequestBody SysPosition sysPosition) {
|
||||||
Result<SysPosition> result = new Result<SysPosition>();
|
Result<SysPosition> result = new Result<SysPosition>();
|
||||||
try {
|
try {
|
||||||
|
//update-begin---author:wangshuai ---date:20230313 for：【QQYUN-4558】vue3职位功能调整，去掉编码和级别，可以先隐藏------------
|
||||||
|
//编号是空的，不需要判断多租户隔离了
|
||||||
|
if(oConvertUtils.isEmpty(sysPosition.getCode())){
|
||||||
|
//生成职位编码10位
|
||||||
|
sysPosition.setCode(RandomUtil.randomString(10));
|
||||||
|
}
|
||||||
|
//update-end---author:wangshuai ---date:20230313 for：【QQYUN-4558】vue3职位功能调整，去掉编码和级别，可以先隐藏-------------
|
||||||
sysPositionService.save(sysPosition);
|
sysPositionService.save(sysPosition);
|
||||||
result.success("添加成功！");
|
result.success("添加成功！");
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
@ -201,6 +220,12 @@ public class SysPositionController {
|
|||||||
if (oConvertUtils.isNotEmpty(paramsStr)) {
|
if (oConvertUtils.isNotEmpty(paramsStr)) {
|
||||||
String deString = URLDecoder.decode(paramsStr, "UTF-8");
|
String deString = URLDecoder.decode(paramsStr, "UTF-8");
|
||||||
SysPosition sysPosition = JSON.parseObject(deString, SysPosition.class);
|
SysPosition sysPosition = JSON.parseObject(deString, SysPosition.class);
|
||||||
|
//------------------------------------------------------------------------------------------------
|
||||||
|
//是否开启系统管理模块的多租户数据隔离【SAAS多租户模式】
|
||||||
|
if(MybatisPlusSaasConfig.OPEN_SYSTEM_TENANT_CONTROL){
|
||||||
|
sysPosition.setTenantId(oConvertUtils.getInt(TenantContext.getTenant(),0));
|
||||||
|
}
|
||||||
|
//------------------------------------------------------------------------------------------------
|
||||||
queryWrapper = QueryGenerator.initQueryWrapper(sysPosition, request.getParameterMap());
|
queryWrapper = QueryGenerator.initQueryWrapper(sysPosition, request.getParameterMap());
|
||||||
}
|
}
|
||||||
} catch (UnsupportedEncodingException e) {
|
} catch (UnsupportedEncodingException e) {
|
||||||
|
|||||||
@ -13,29 +13,24 @@ import java.util.Map;
|
|||||||
import javax.servlet.http.HttpServletRequest;
|
import javax.servlet.http.HttpServletRequest;
|
||||||
import javax.servlet.http.HttpServletResponse;
|
import javax.servlet.http.HttpServletResponse;
|
||||||
|
|
||||||
import org.apache.shiro.authz.annotation.RequiresRoles;
|
import com.baomidou.mybatisplus.extension.plugins.pagination.PageDTO;
|
||||||
|
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
||||||
import org.jeecg.common.api.vo.Result;
|
import org.jeecg.common.api.vo.Result;
|
||||||
import org.jeecg.common.constant.CacheConstant;
|
import org.jeecg.common.config.TenantContext;
|
||||||
import org.jeecg.common.constant.CommonConstant;
|
import org.jeecg.common.constant.CommonConstant;
|
||||||
import org.jeecg.common.system.query.QueryGenerator;
|
import org.jeecg.common.system.query.QueryGenerator;
|
||||||
import org.jeecg.common.util.PmsUtil;
|
|
||||||
import org.jeecg.common.util.oConvertUtils;
|
import org.jeecg.common.util.oConvertUtils;
|
||||||
import org.jeecg.modules.system.entity.SysPermission;
|
import org.jeecg.config.mybatis.MybatisPlusSaasConfig;
|
||||||
import org.jeecg.modules.system.entity.SysPermissionDataRule;
|
import org.jeecg.modules.system.entity.*;
|
||||||
import org.jeecg.modules.system.entity.SysRole;
|
|
||||||
import org.jeecg.modules.system.entity.SysRolePermission;
|
|
||||||
import org.jeecg.modules.system.model.TreeModel;
|
import org.jeecg.modules.system.model.TreeModel;
|
||||||
import org.jeecg.modules.system.service.ISysPermissionDataRuleService;
|
import org.jeecg.modules.system.service.*;
|
||||||
import org.jeecg.modules.system.service.ISysPermissionService;
|
import org.jeecg.modules.system.vo.SysUserRoleCountVo;
|
||||||
import org.jeecg.modules.system.service.ISysRolePermissionService;
|
|
||||||
import org.jeecg.modules.system.service.ISysRoleService;
|
|
||||||
import org.jeecgframework.poi.excel.ExcelImportUtil;
|
|
||||||
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
|
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
|
||||||
import org.jeecgframework.poi.excel.entity.ExportParams;
|
import org.jeecgframework.poi.excel.entity.ExportParams;
|
||||||
import org.jeecgframework.poi.excel.entity.ImportParams;
|
import org.jeecgframework.poi.excel.entity.ImportParams;
|
||||||
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
|
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
|
||||||
|
import org.springframework.beans.BeanUtils;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.cache.annotation.CacheEvict;
|
|
||||||
import org.springframework.web.bind.annotation.GetMapping;
|
import org.springframework.web.bind.annotation.GetMapping;
|
||||||
import org.springframework.web.bind.annotation.PathVariable;
|
import org.springframework.web.bind.annotation.PathVariable;
|
||||||
import org.springframework.web.bind.annotation.PostMapping;
|
import org.springframework.web.bind.annotation.PostMapping;
|
||||||
@ -81,14 +76,18 @@ public class SysRoleController {
|
|||||||
@Autowired
|
@Autowired
|
||||||
private ISysPermissionService sysPermissionService;
|
private ISysPermissionService sysPermissionService;
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private ISysUserRoleService sysUserRoleService;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 分页列表查询
|
* 分页列表查询 【系统角色，不做租户隔离】
|
||||||
* @param role
|
* @param role
|
||||||
* @param pageNo
|
* @param pageNo
|
||||||
* @param pageSize
|
* @param pageSize
|
||||||
* @param req
|
* @param req
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
|
//@RequiresPermissions("system:role:list")
|
||||||
@RequestMapping(value = "/list", method = RequestMethod.GET)
|
@RequestMapping(value = "/list", method = RequestMethod.GET)
|
||||||
public Result<IPage<SysRole>> queryPageList(SysRole role,
|
public Result<IPage<SysRole>> queryPageList(SysRole role,
|
||||||
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
||||||
@ -103,13 +102,41 @@ public class SysRoleController {
|
|||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 分页列表查询【租户角色，做租户隔离】
|
||||||
|
* @param role
|
||||||
|
* @param pageNo
|
||||||
|
* @param pageSize
|
||||||
|
* @param req
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
@RequestMapping(value = "/listByTenant", method = RequestMethod.GET)
|
||||||
|
public Result<IPage<SysRole>> listByTenant(SysRole role,
|
||||||
|
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
||||||
|
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
|
||||||
|
HttpServletRequest req) {
|
||||||
|
Result<IPage<SysRole>> result = new Result<IPage<SysRole>>();
|
||||||
|
//------------------------------------------------------------------------------------------------
|
||||||
|
//是否开启系统管理模块的多租户数据隔离【SAAS多租户模式】
|
||||||
|
if(MybatisPlusSaasConfig.OPEN_SYSTEM_TENANT_CONTROL){
|
||||||
|
role.setTenantId(oConvertUtils.getInt(TenantContext.getTenant(),0));
|
||||||
|
}
|
||||||
|
//------------------------------------------------------------------------------------------------
|
||||||
|
QueryWrapper<SysRole> queryWrapper = QueryGenerator.initQueryWrapper(role, req.getParameterMap());
|
||||||
|
Page<SysRole> page = new Page<SysRole>(pageNo, pageSize);
|
||||||
|
IPage<SysRole> pageList = sysRoleService.page(page, queryWrapper);
|
||||||
|
result.setSuccess(true);
|
||||||
|
result.setResult(pageList);
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 添加
|
* 添加
|
||||||
* @param role
|
* @param role
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@RequestMapping(value = "/add", method = RequestMethod.POST)
|
@RequestMapping(value = "/add", method = RequestMethod.POST)
|
||||||
//@RequiresRoles({"admin"})
|
//@RequiresPermissions("system:role:add")
|
||||||
public Result<SysRole> add(@RequestBody SysRole role) {
|
public Result<SysRole> add(@RequestBody SysRole role) {
|
||||||
Result<SysRole> result = new Result<SysRole>();
|
Result<SysRole> result = new Result<SysRole>();
|
||||||
try {
|
try {
|
||||||
@ -128,7 +155,7 @@ public class SysRoleController {
|
|||||||
* @param role
|
* @param role
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
//@RequiresRoles({"admin"})
|
//@RequiresPermissions("system:role:edit")
|
||||||
@RequestMapping(value = "/edit",method = {RequestMethod.PUT,RequestMethod.POST})
|
@RequestMapping(value = "/edit",method = {RequestMethod.PUT,RequestMethod.POST})
|
||||||
public Result<SysRole> edit(@RequestBody SysRole role) {
|
public Result<SysRole> edit(@RequestBody SysRole role) {
|
||||||
Result<SysRole> result = new Result<SysRole>();
|
Result<SysRole> result = new Result<SysRole>();
|
||||||
@ -152,7 +179,7 @@ public class SysRoleController {
|
|||||||
* @param id
|
* @param id
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
//@RequiresRoles({"admin"})
|
//@RequiresPermissions("system:role:delete")
|
||||||
@RequestMapping(value = "/delete", method = RequestMethod.DELETE)
|
@RequestMapping(value = "/delete", method = RequestMethod.DELETE)
|
||||||
public Result<?> delete(@RequestParam(name="id",required=true) String id) {
|
public Result<?> delete(@RequestParam(name="id",required=true) String id) {
|
||||||
sysRoleService.deleteRole(id);
|
sysRoleService.deleteRole(id);
|
||||||
@ -164,7 +191,7 @@ public class SysRoleController {
|
|||||||
* @param ids
|
* @param ids
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
//@RequiresRoles({"admin"})
|
//@RequiresPermissions("system:role:deleteBatch")
|
||||||
@RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE)
|
@RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE)
|
||||||
public Result<SysRole> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
|
public Result<SysRole> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
|
||||||
Result<SysRole> result = new Result<SysRole>();
|
Result<SysRole> result = new Result<SysRole>();
|
||||||
@ -194,11 +221,43 @@ public class SysRoleController {
|
|||||||
}
|
}
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 查询全部角色（参与租户隔离）
|
||||||
|
*
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
@RequestMapping(value = "/queryall", method = RequestMethod.GET)
|
@RequestMapping(value = "/queryall", method = RequestMethod.GET)
|
||||||
public Result<List<SysRole>> queryall() {
|
public Result<List<SysRole>> queryall() {
|
||||||
Result<List<SysRole>> result = new Result<>();
|
Result<List<SysRole>> result = new Result<>();
|
||||||
List<SysRole> list = sysRoleService.list();
|
LambdaQueryWrapper<SysRole> query = new LambdaQueryWrapper<SysRole>();
|
||||||
|
//------------------------------------------------------------------------------------------------
|
||||||
|
//是否开启系统管理模块的多租户数据隔离【SAAS多租户模式】
|
||||||
|
if(MybatisPlusSaasConfig.OPEN_SYSTEM_TENANT_CONTROL){
|
||||||
|
query.eq(SysRole::getTenantId, oConvertUtils.getInt(TenantContext.getTenant(), 0));
|
||||||
|
}
|
||||||
|
//------------------------------------------------------------------------------------------------
|
||||||
|
List<SysRole> list = sysRoleService.list(query);
|
||||||
|
if(list==null||list.size()<=0) {
|
||||||
|
result.error500("未找到角色信息");
|
||||||
|
}else {
|
||||||
|
result.setResult(list);
|
||||||
|
result.setSuccess(true);
|
||||||
|
}
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 查询全部系统角色（不做租户隔离）
|
||||||
|
*
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
//@RequiresPermissions("system:role:queryallNoByTenant")
|
||||||
|
@RequestMapping(value = "/queryallNoByTenant", method = RequestMethod.GET)
|
||||||
|
public Result<List<SysRole>> queryallNoByTenant() {
|
||||||
|
Result<List<SysRole>> result = new Result<>();
|
||||||
|
LambdaQueryWrapper<SysRole> query = new LambdaQueryWrapper<SysRole>();
|
||||||
|
List<SysRole> list = sysRoleService.list(query);
|
||||||
if(list==null||list.size()<=0) {
|
if(list==null||list.size()<=0) {
|
||||||
result.error500("未找到角色信息");
|
result.error500("未找到角色信息");
|
||||||
}else {
|
}else {
|
||||||
@ -253,6 +312,13 @@ public class SysRoleController {
|
|||||||
*/
|
*/
|
||||||
@RequestMapping(value = "/exportXls")
|
@RequestMapping(value = "/exportXls")
|
||||||
public ModelAndView exportXls(SysRole sysRole,HttpServletRequest request) {
|
public ModelAndView exportXls(SysRole sysRole,HttpServletRequest request) {
|
||||||
|
//------------------------------------------------------------------------------------------------
|
||||||
|
//是否开启系统管理模块的多租户数据隔离【SAAS多租户模式】
|
||||||
|
if(MybatisPlusSaasConfig.OPEN_SYSTEM_TENANT_CONTROL){
|
||||||
|
sysRole.setTenantId(oConvertUtils.getInt(TenantContext.getTenant(), 0));
|
||||||
|
}
|
||||||
|
//------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
// Step.1 组装查询条件
|
// Step.1 组装查询条件
|
||||||
QueryWrapper<SysRole> queryWrapper = QueryGenerator.initQueryWrapper(sysRole, request.getParameterMap());
|
QueryWrapper<SysRole> queryWrapper = QueryGenerator.initQueryWrapper(sysRole, request.getParameterMap());
|
||||||
//Step.2 AutoPoi 导出Excel
|
//Step.2 AutoPoi 导出Excel
|
||||||
@ -408,6 +474,5 @@ public class SysRoleController {
|
|||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -5,6 +5,8 @@ import javax.servlet.http.HttpServletRequest;
|
|||||||
import javax.servlet.http.HttpServletResponse;
|
import javax.servlet.http.HttpServletResponse;
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||||
|
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
||||||
|
import org.apache.shiro.authz.annotation.RequiresRoles;
|
||||||
import org.jeecg.common.api.vo.Result;
|
import org.jeecg.common.api.vo.Result;
|
||||||
import org.jeecg.common.system.query.QueryGenerator;
|
import org.jeecg.common.system.query.QueryGenerator;
|
||||||
import org.jeecg.common.aspect.annotation.AutoLog;
|
import org.jeecg.common.aspect.annotation.AutoLog;
|
||||||
@ -65,6 +67,7 @@ public class SysRoleIndexController extends JeecgController<SysRoleIndex, ISysRo
|
|||||||
* @param sysRoleIndex
|
* @param sysRoleIndex
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
|
//@RequiresPermissions("system:roleindex:add")
|
||||||
@AutoLog(value = "角色首页配置-添加")
|
@AutoLog(value = "角色首页配置-添加")
|
||||||
@ApiOperation(value = "角色首页配置-添加", notes = "角色首页配置-添加")
|
@ApiOperation(value = "角色首页配置-添加", notes = "角色首页配置-添加")
|
||||||
@PostMapping(value = "/add")
|
@PostMapping(value = "/add")
|
||||||
@ -80,6 +83,7 @@ public class SysRoleIndexController extends JeecgController<SysRoleIndex, ISysRo
|
|||||||
* @param sysRoleIndex
|
* @param sysRoleIndex
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
|
//@RequiresPermissions("system:roleindex:edit")
|
||||||
@AutoLog(value = "角色首页配置-编辑")
|
@AutoLog(value = "角色首页配置-编辑")
|
||||||
@ApiOperation(value = "角色首页配置-编辑", notes = "角色首页配置-编辑")
|
@ApiOperation(value = "角色首页配置-编辑", notes = "角色首页配置-编辑")
|
||||||
@RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
|
@RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
|
||||||
|
|||||||
@ -1,20 +1,36 @@
|
|||||||
package org.jeecg.modules.system.controller;
|
package org.jeecg.modules.system.controller;
|
||||||
|
|
||||||
|
|
||||||
|
import cn.hutool.core.util.RandomUtil;
|
||||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.apache.shiro.SecurityUtils;
|
import org.apache.shiro.SecurityUtils;
|
||||||
|
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
||||||
import org.jeecg.common.api.vo.Result;
|
import org.jeecg.common.api.vo.Result;
|
||||||
import org.jeecg.common.aspect.annotation.PermissionData;
|
import org.jeecg.common.aspect.annotation.PermissionData;
|
||||||
|
import org.jeecg.common.config.TenantContext;
|
||||||
|
import org.jeecg.common.constant.CommonConstant;
|
||||||
import org.jeecg.common.constant.SymbolConstant;
|
import org.jeecg.common.constant.SymbolConstant;
|
||||||
import org.jeecg.common.system.query.QueryGenerator;
|
import org.jeecg.common.system.query.QueryGenerator;
|
||||||
import org.jeecg.common.system.vo.LoginUser;
|
import org.jeecg.common.system.vo.LoginUser;
|
||||||
|
import org.jeecg.common.util.PasswordUtil;
|
||||||
|
import org.jeecg.common.util.TokenUtils;
|
||||||
import org.jeecg.common.util.oConvertUtils;
|
import org.jeecg.common.util.oConvertUtils;
|
||||||
import org.jeecg.modules.system.entity.SysTenant;
|
import org.jeecg.config.mybatis.MybatisPlusSaasConfig;
|
||||||
|
import org.jeecg.modules.base.service.BaseCommonService;
|
||||||
|
import org.jeecg.modules.system.entity.*;
|
||||||
|
import org.jeecg.modules.system.service.ISysTenantPackService;
|
||||||
import org.jeecg.modules.system.service.ISysTenantService;
|
import org.jeecg.modules.system.service.ISysTenantService;
|
||||||
|
import org.jeecg.modules.system.service.ISysUserService;
|
||||||
|
import org.jeecg.modules.system.service.ISysUserTenantService;
|
||||||
|
import org.jeecg.modules.system.vo.SysUserTenantVo;
|
||||||
|
import org.jeecg.modules.system.vo.tenant.TenantDepartAuthInfo;
|
||||||
|
import org.jeecg.modules.system.vo.tenant.TenantPackModel;
|
||||||
|
import org.jeecg.modules.system.vo.tenant.TenantPackUser;
|
||||||
|
import org.jeecg.modules.system.vo.tenant.TenantPackUserCount;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|
||||||
@ -33,6 +49,18 @@ public class SysTenantController {
|
|||||||
@Autowired
|
@Autowired
|
||||||
private ISysTenantService sysTenantService;
|
private ISysTenantService sysTenantService;
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private ISysUserService sysUserService;
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private ISysUserTenantService relationService;
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private ISysTenantPackService sysTenantPackService;
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private BaseCommonService baseCommonService;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 获取列表数据
|
* 获取列表数据
|
||||||
* @param sysTenant
|
* @param sysTenant
|
||||||
@ -41,10 +69,11 @@ public class SysTenantController {
|
|||||||
* @param req
|
* @param req
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
|
//@RequiresPermissions("system:tenant:list")
|
||||||
@PermissionData(pageComponent = "system/TenantList")
|
@PermissionData(pageComponent = "system/TenantList")
|
||||||
@RequestMapping(value = "/list", method = RequestMethod.GET)
|
@RequestMapping(value = "/list", method = RequestMethod.GET)
|
||||||
public Result<IPage<SysTenant>> queryPageList(SysTenant sysTenant,@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
public Result<IPage<SysTenant>> queryPageList(SysTenant sysTenant, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
||||||
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,HttpServletRequest req) {
|
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) {
|
||||||
Result<IPage<SysTenant>> result = new Result<IPage<SysTenant>>();
|
Result<IPage<SysTenant>> result = new Result<IPage<SysTenant>>();
|
||||||
//---author:zhangyafei---date:20210916-----for: 租户管理添加日期范围查询---
|
//---author:zhangyafei---date:20210916-----for: 租户管理添加日期范围查询---
|
||||||
Date beginDate=null;
|
Date beginDate=null;
|
||||||
@ -70,11 +99,32 @@ public class SysTenantController {
|
|||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 获取租户删除的列表
|
||||||
|
* @param sysTenant
|
||||||
|
* @param pageNo
|
||||||
|
* @param pageSize
|
||||||
|
* @param req
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
@GetMapping("/recycleBinPageList")
|
||||||
|
//@RequiresPermissions("system:tenant:recycleBinPageList")
|
||||||
|
public Result<IPage<SysTenant>> recycleBinPageList(SysTenant sysTenant, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
||||||
|
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req){
|
||||||
|
Result<IPage<SysTenant>> result = new Result<IPage<SysTenant>>();
|
||||||
|
Page<SysTenant> page = new Page<SysTenant>(pageNo, pageSize);
|
||||||
|
IPage<SysTenant> pageList = sysTenantService.getRecycleBinPageList(page, sysTenant);
|
||||||
|
result.setSuccess(true);
|
||||||
|
result.setResult(pageList);
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 添加
|
* 添加
|
||||||
* @param
|
* @param
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
|
//@RequiresPermissions("system:tenant:add")
|
||||||
@RequestMapping(value = "/add", method = RequestMethod.POST)
|
@RequestMapping(value = "/add", method = RequestMethod.POST)
|
||||||
public Result<SysTenant> add(@RequestBody SysTenant sysTenant) {
|
public Result<SysTenant> add(@RequestBody SysTenant sysTenant) {
|
||||||
Result<SysTenant> result = new Result();
|
Result<SysTenant> result = new Result();
|
||||||
@ -82,7 +132,7 @@ public class SysTenantController {
|
|||||||
return result.error500("该编号已存在!");
|
return result.error500("该编号已存在!");
|
||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
sysTenantService.save(sysTenant);
|
sysTenantService.saveTenant(sysTenant);
|
||||||
result.success("添加成功！");
|
result.success("添加成功！");
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
log.error(e.getMessage(), e);
|
log.error(e.getMessage(), e);
|
||||||
@ -96,6 +146,7 @@ public class SysTenantController {
|
|||||||
* @param
|
* @param
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
|
//@RequiresPermissions("system:tenant:edit")
|
||||||
@RequestMapping(value = "/edit", method ={RequestMethod.PUT, RequestMethod.POST})
|
@RequestMapping(value = "/edit", method ={RequestMethod.PUT, RequestMethod.POST})
|
||||||
public Result<SysTenant> edit(@RequestBody SysTenant tenant) {
|
public Result<SysTenant> edit(@RequestBody SysTenant tenant) {
|
||||||
Result<SysTenant> result = new Result();
|
Result<SysTenant> result = new Result();
|
||||||
@ -103,6 +154,9 @@ public class SysTenantController {
|
|||||||
if(sysTenant==null) {
|
if(sysTenant==null) {
|
||||||
return result.error500("未找到对应实体");
|
return result.error500("未找到对应实体");
|
||||||
}
|
}
|
||||||
|
if(oConvertUtils.isEmpty(sysTenant.getHouseNumber())){
|
||||||
|
tenant.setHouseNumber(RandomUtil.randomStringUpper(6));
|
||||||
|
}
|
||||||
boolean ok = sysTenantService.updateById(tenant);
|
boolean ok = sysTenantService.updateById(tenant);
|
||||||
if(ok) {
|
if(ok) {
|
||||||
result.success("修改成功!");
|
result.success("修改成功!");
|
||||||
@ -115,8 +169,25 @@ public class SysTenantController {
|
|||||||
* @param id
|
* @param id
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
|
//@RequiresPermissions("system:tenant:delete")
|
||||||
@RequestMapping(value = "/delete", method ={RequestMethod.DELETE, RequestMethod.POST})
|
@RequestMapping(value = "/delete", method ={RequestMethod.DELETE, RequestMethod.POST})
|
||||||
public Result<?> delete(@RequestParam(name="id",required=true) String id) {
|
public Result<?> delete(@RequestParam(name="id",required=true) String id) {
|
||||||
|
//------------------------------------------------------------------
|
||||||
|
//如果是saas隔离的情况下，判断当前租户id是否是当前租户下的
|
||||||
|
if (MybatisPlusSaasConfig.OPEN_SYSTEM_TENANT_CONTROL) {
|
||||||
|
//获取当前用户
|
||||||
|
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
||||||
|
SysTenant sysTenant = sysTenantService.getById(id);
|
||||||
|
|
||||||
|
String username = "admin";
|
||||||
|
String createdBy = sysUser.getUsername();
|
||||||
|
if (!sysTenant.getCreateBy().equals(createdBy) && !username.equals(createdBy)) {
|
||||||
|
baseCommonService.addLog("未经授权，不能删除非自己创建的租户，租户ID：" + id + "，操作人：" + sysUser.getUsername(), CommonConstant.LOG_TYPE_2, CommonConstant.OPERATE_TYPE_3);
|
||||||
|
return Result.error("删除租户失败,当前操作人不是租户的创建人！");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
//------------------------------------------------------------------
|
||||||
|
|
||||||
sysTenantService.removeTenantById(id);
|
sysTenantService.removeTenantById(id);
|
||||||
return Result.ok("删除成功");
|
return Result.ok("删除成功");
|
||||||
}
|
}
|
||||||
@ -126,6 +197,7 @@ public class SysTenantController {
|
|||||||
* @param ids
|
* @param ids
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
|
//@RequiresPermissions("system:tenant:deleteBatch")
|
||||||
@RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE)
|
@RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE)
|
||||||
public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
|
public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
|
||||||
Result<?> result = new Result<>();
|
Result<?> result = new Result<>();
|
||||||
@ -136,6 +208,22 @@ public class SysTenantController {
|
|||||||
// 过滤掉已被引用的租户
|
// 过滤掉已被引用的租户
|
||||||
List<Integer> idList = new ArrayList<>();
|
List<Integer> idList = new ArrayList<>();
|
||||||
for (String id : ls) {
|
for (String id : ls) {
|
||||||
|
//------------------------------------------------------------------
|
||||||
|
//如果是saas隔离的情况下，判断当前租户id是否是当前租户下的
|
||||||
|
if (MybatisPlusSaasConfig.OPEN_SYSTEM_TENANT_CONTROL) {
|
||||||
|
//获取当前用户
|
||||||
|
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
||||||
|
SysTenant sysTenant = sysTenantService.getById(id);
|
||||||
|
|
||||||
|
String username = "admin";
|
||||||
|
String createdBy = sysUser.getUsername();
|
||||||
|
if (!sysTenant.getCreateBy().equals(createdBy) && !username.equals(createdBy)) {
|
||||||
|
baseCommonService.addLog("未经授权，不能删除非自己创建的租户，租户ID：" + id + "，操作人：" + sysUser.getUsername(), CommonConstant.LOG_TYPE_2, CommonConstant.OPERATE_TYPE_3);
|
||||||
|
return Result.error("删除租户失败,当前操作人不是租户的创建人！");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
//------------------------------------------------------------------
|
||||||
|
|
||||||
Long userCount = sysTenantService.countUserLinkTenant(id);
|
Long userCount = sysTenantService.countUserLinkTenant(id);
|
||||||
if (userCount == 0) {
|
if (userCount == 0) {
|
||||||
idList.add(Integer.parseInt(id));
|
idList.add(Integer.parseInt(id));
|
||||||
@ -163,6 +251,21 @@ public class SysTenantController {
|
|||||||
@RequestMapping(value = "/queryById", method = RequestMethod.GET)
|
@RequestMapping(value = "/queryById", method = RequestMethod.GET)
|
||||||
public Result<SysTenant> queryById(@RequestParam(name="id",required=true) String id) {
|
public Result<SysTenant> queryById(@RequestParam(name="id",required=true) String id) {
|
||||||
Result<SysTenant> result = new Result<SysTenant>();
|
Result<SysTenant> result = new Result<SysTenant>();
|
||||||
|
if(oConvertUtils.isEmpty(id)){
|
||||||
|
result.error500("参数为空！");
|
||||||
|
}
|
||||||
|
//------------------------------------------------------------------------------------------------
|
||||||
|
//获取登录用户信息
|
||||||
|
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
||||||
|
//是否开启系统管理模块的多租户数据隔离【SAAS多租户模式】, admin给特权可以管理所有租户
|
||||||
|
if(MybatisPlusSaasConfig.OPEN_SYSTEM_TENANT_CONTROL && !"admin".equals(sysUser.getUsername())){
|
||||||
|
Integer loginSessionTenant = oConvertUtils.getInt(TenantContext.getTenant());
|
||||||
|
if(loginSessionTenant!=null && !loginSessionTenant.equals(Integer.valueOf(id))){
|
||||||
|
result.error500("无权限访问他人租户！");
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
//------------------------------------------------------------------------------------------------
|
||||||
SysTenant sysTenant = sysTenantService.getById(id);
|
SysTenant sysTenant = sysTenantService.getById(id);
|
||||||
if(sysTenant==null) {
|
if(sysTenant==null) {
|
||||||
result.error500("未找到对应实体");
|
result.error500("未找到对应实体");
|
||||||
@ -178,6 +281,7 @@ public class SysTenantController {
|
|||||||
* 查询有效的 租户数据
|
* 查询有效的 租户数据
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
|
//@RequiresPermissions("system:tenant:queryList")
|
||||||
@RequestMapping(value = "/queryList", method = RequestMethod.GET)
|
@RequestMapping(value = "/queryList", method = RequestMethod.GET)
|
||||||
public Result<List<SysTenant>> queryList(@RequestParam(name="ids",required=false) String ids) {
|
public Result<List<SysTenant>> queryList(@RequestParam(name="ids",required=false) String ids) {
|
||||||
Result<List<SysTenant>> result = new Result<List<SysTenant>>();
|
Result<List<SysTenant>> result = new Result<List<SysTenant>>();
|
||||||
@ -192,8 +296,76 @@ public class SysTenantController {
|
|||||||
result.setResult(ls);
|
result.setResult(ls);
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 查询当前用户的所有有效租户 【当前用于vue3版本】
|
* 产品包分页列表查询
|
||||||
|
*
|
||||||
|
* @param sysTenantPack
|
||||||
|
* @param pageNo
|
||||||
|
* @param pageSize
|
||||||
|
* @param req
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
@GetMapping(value = "/packList")
|
||||||
|
//@RequiresPermissions("system:tenant:packList")
|
||||||
|
public Result<IPage<SysTenantPack>> queryPackPageList(SysTenantPack sysTenantPack,
|
||||||
|
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
|
||||||
|
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
|
||||||
|
HttpServletRequest req) {
|
||||||
|
QueryWrapper<SysTenantPack> queryWrapper = QueryGenerator.initQueryWrapper(sysTenantPack, req.getParameterMap());
|
||||||
|
Page<SysTenantPack> page = new Page<SysTenantPack>(pageNo, pageSize);
|
||||||
|
IPage<SysTenantPack> pageList = sysTenantPackService.page(page, queryWrapper);
|
||||||
|
List<SysTenantPack> records = pageList.getRecords();
|
||||||
|
if (null != records && records.size() > 0) {
|
||||||
|
pageList.setRecords(sysTenantPackService.setPermissions(records));
|
||||||
|
}
|
||||||
|
return Result.OK(pageList);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 创建租户产品包
|
||||||
|
*
|
||||||
|
* @param sysTenantPack
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
@PostMapping(value = "/addPackPermission")
|
||||||
|
//@RequiresPermissions("system:tenant:add:pack")
|
||||||
|
public Result<String> addPackPermission(@RequestBody SysTenantPack sysTenantPack) {
|
||||||
|
sysTenantPackService.addPackPermission(sysTenantPack);
|
||||||
|
return Result.ok("创建租户产品包成功");
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 创建租户产品包
|
||||||
|
*
|
||||||
|
* @param sysTenantPack
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
@PutMapping(value = "/editPackPermission")
|
||||||
|
//@RequiresPermissions("system:tenant:edit:pack")
|
||||||
|
public Result<String> editPackPermission(@RequestBody SysTenantPack sysTenantPack) {
|
||||||
|
sysTenantPackService.editPackPermission(sysTenantPack);
|
||||||
|
return Result.ok("修改租户产品包成功");
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 批量删除用户菜单
|
||||||
|
*
|
||||||
|
* @param ids
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
@DeleteMapping("/deletePackPermissions")
|
||||||
|
//@RequiresPermissions("system:tenant:delete:pack")
|
||||||
|
public Result<String> deletePackPermissions(@RequestParam(value = "ids") String ids) {
|
||||||
|
sysTenantPackService.deletePackPermissions(ids);
|
||||||
|
return Result.ok("删除租户产品包成功");
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
//===========【低代码应用，前端专用接口 —— 加入限制只能维护和查看自己拥有的租户】==========================================================
|
||||||
|
/**
|
||||||
|
* 查询当前用户的所有有效租户【低代码应用专用接口】
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@RequestMapping(value = "/getCurrentUserTenant", method = RequestMethod.GET)
|
@RequestMapping(value = "/getCurrentUserTenant", method = RequestMethod.GET)
|
||||||
@ -201,13 +373,11 @@ public class SysTenantController {
|
|||||||
Result<Map<String,Object>> result = new Result<Map<String,Object>>();
|
Result<Map<String,Object>> result = new Result<Map<String,Object>>();
|
||||||
try {
|
try {
|
||||||
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
||||||
String tenantIds = sysUser.getRelTenantIds();
|
//update-begin---author:wangshuai ---date:20221223 for：[QQYUN-3371]租户逻辑改造，改成关系表------------
|
||||||
|
List<Integer> tenantIdList = relationService.getTenantIdsByUserId(sysUser.getId());
|
||||||
Map<String,Object> map = new HashMap(5);
|
Map<String,Object> map = new HashMap(5);
|
||||||
if (oConvertUtils.isNotEmpty(tenantIds)) {
|
if (null!=tenantIdList && tenantIdList.size()>0) {
|
||||||
List<Integer> tenantIdList = new ArrayList<>();
|
//update-end---author:wangshuai ---date:20221223 for：[QQYUN-3371]租户逻辑改造，改成关系表------------
|
||||||
for(String id: tenantIds.split(SymbolConstant.COMMA)){
|
|
||||||
tenantIdList.add(Integer.valueOf(id));
|
|
||||||
}
|
|
||||||
// 该方法仅查询有效的租户，如果返回0个就说明所有的租户均无效。
|
// 该方法仅查询有效的租户，如果返回0个就说明所有的租户均无效。
|
||||||
List<SysTenant> tenantList = sysTenantService.queryEffectiveTenant(tenantIdList);
|
List<SysTenant> tenantList = sysTenantService.queryEffectiveTenant(tenantIdList);
|
||||||
map.put("list", tenantList);
|
map.put("list", tenantList);
|
||||||
@ -220,4 +390,471 @@ public class SysTenantController {
|
|||||||
}
|
}
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 邀请用户【低代码应用专用接口】
|
||||||
|
* @param ids
|
||||||
|
* @param phone
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
@PutMapping("/invitationUserJoin")
|
||||||
|
//@RequiresPermissions("system:tenant:invitation:user")
|
||||||
|
public Result<String> invitationUserJoin(@RequestParam("ids") String ids, @RequestParam("phone") String phone){
|
||||||
|
sysTenantService.invitationUserJoin(ids,phone);
|
||||||
|
return Result.ok("邀请用户成功");
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 获取用户列表数据【低代码应用专用接口】
|
||||||
|
* @param user
|
||||||
|
* @param pageNo
|
||||||
|
* @param pageSize
|
||||||
|
* @param req
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
@RequestMapping(value = "/getTenantUserList", method = RequestMethod.GET)
|
||||||
|
//@RequiresPermissions("system:tenant:user:list")
|
||||||
|
public Result<IPage<SysUser>> getTenantUserList(SysUser user,
|
||||||
|
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
||||||
|
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
|
||||||
|
@RequestParam(name="userTenantId") String userTenantId,
|
||||||
|
HttpServletRequest req) {
|
||||||
|
Result<IPage<SysUser>> result = new Result<>();
|
||||||
|
Page<SysUser> page = new Page<>(pageNo, pageSize);
|
||||||
|
Page<SysUser> pageList = relationService.getPageUserList(page,Integer.valueOf(userTenantId),user);
|
||||||
|
result.setSuccess(true);
|
||||||
|
result.setResult(pageList);
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 请离用户租户【低代码应用专用接口】
|
||||||
|
* @param userIds
|
||||||
|
* @param tenantId
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
@PutMapping("/leaveTenant")
|
||||||
|
//@RequiresPermissions("system:tenant:leave")
|
||||||
|
public Result<String> leaveTenant(@RequestParam("userIds") String userIds,
|
||||||
|
@RequestParam("tenantId") String tenantId){
|
||||||
|
Result<String> result = new Result<>();
|
||||||
|
//是否开启系统管理模块的多租户数据隔离【SAAS多租户模式】
|
||||||
|
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
||||||
|
if(MybatisPlusSaasConfig.OPEN_SYSTEM_TENANT_CONTROL && !"admin".equals(sysUser.getUsername())){
|
||||||
|
Integer loginSessionTenant = oConvertUtils.getInt(TenantContext.getTenant());
|
||||||
|
if(loginSessionTenant!=null && !loginSessionTenant.equals(Integer.valueOf(tenantId))){
|
||||||
|
result.error500("无权限访问他人租户！");
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
sysTenantService.leaveTenant(userIds,tenantId);
|
||||||
|
return Result.ok("请离成功");
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 编辑（只允许修改自己拥有的租户）【低代码应用专用接口】
|
||||||
|
* @param
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
@RequestMapping(value = "/editOwnTenant", method ={RequestMethod.PUT, RequestMethod.POST})
|
||||||
|
public Result<SysTenant> editOwnTenant(@RequestBody SysTenant tenant, HttpServletRequest req) {
|
||||||
|
Result<SysTenant> result = new Result();
|
||||||
|
String tenantId = TokenUtils.getTenantIdByRequest(req);
|
||||||
|
if(!tenantId.equals(tenant.getId().toString())){
|
||||||
|
return result.error500("无权修改他人租户！");
|
||||||
|
}
|
||||||
|
|
||||||
|
SysTenant sysTenant = sysTenantService.getById(tenant.getId());
|
||||||
|
if(sysTenant==null) {
|
||||||
|
return result.error500("未找到对应实体");
|
||||||
|
}
|
||||||
|
if(oConvertUtils.isEmpty(sysTenant.getHouseNumber())){
|
||||||
|
tenant.setHouseNumber(RandomUtil.randomStringUpper(6));
|
||||||
|
}
|
||||||
|
boolean ok = sysTenantService.updateById(tenant);
|
||||||
|
if(ok) {
|
||||||
|
result.success("修改成功!");
|
||||||
|
}
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 创建租户并且将用户保存到中间表【低代码应用专用接口】
|
||||||
|
* @param sysTenant
|
||||||
|
*/
|
||||||
|
@PostMapping("/saveTenantJoinUser")
|
||||||
|
public Result<Integer> saveTenantJoinUser(@RequestBody SysTenant sysTenant){
|
||||||
|
Result<Integer> result = new Result<>();
|
||||||
|
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
||||||
|
//------------------------------------------------------------------------------------------------
|
||||||
|
//是否开启系统管理模块的多租户数据隔离【SAAS多租户模式】
|
||||||
|
if(MybatisPlusSaasConfig.OPEN_SYSTEM_TENANT_CONTROL){
|
||||||
|
//---author:scott---date:20220111-----for: 限制免费用户只能创建两个租户--
|
||||||
|
Integer count = sysTenantService.countCreateTenantNum(sysUser.getUsername());
|
||||||
|
if (count > 2) {
|
||||||
|
Set<String> roles = sysUserService.getUserRolesSet(sysUser.getUsername());
|
||||||
|
//创建一个付费角色 paymember
|
||||||
|
if (roles==null || (!roles.contains("paymember") && !roles.contains("admin"))) {
|
||||||
|
return result.error500("免费用户最多创建两个租户!");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
//---author:scott---date:20220111-----for: 限制免费用户只能创建两个租户--
|
||||||
|
}
|
||||||
|
//------------------------------------------------------------------------------------------------
|
||||||
|
Integer tenantId = sysTenantService.saveTenantJoinUser(sysTenant, sysUser.getId());
|
||||||
|
result.setSuccess(true);
|
||||||
|
result.setMessage("创建成功");
|
||||||
|
result.setResult(tenantId);
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 加入租户通过门牌号【低代码应用专用接口】
|
||||||
|
* @param sysTenant
|
||||||
|
*/
|
||||||
|
@PostMapping("/joinTenantByHouseNumber")
|
||||||
|
public Result<Integer> joinTenantByHouseNumber(@RequestBody SysTenant sysTenant){
|
||||||
|
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
||||||
|
Integer tenantId = sysTenantService.joinTenantByHouseNumber(sysTenant, sysUser.getId());
|
||||||
|
Result<Integer> result = new Result<>();
|
||||||
|
if(tenantId != 0){
|
||||||
|
result.setMessage("申请租户成功");
|
||||||
|
result.setSuccess(true);
|
||||||
|
result.setResult(tenantId);
|
||||||
|
return result;
|
||||||
|
}else{
|
||||||
|
result.setMessage("该门牌号不存在");
|
||||||
|
result.setSuccess(false);
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
//update-begin---author:wangshuai ---date:20230107 for：[QQYUN-3725]申请加入租户，审核中状态增加接口------------
|
||||||
|
/**
|
||||||
|
* 分页获取租户用户数据(vue3用户租户页面)【低代码应用专用接口】
|
||||||
|
*
|
||||||
|
* @param pageNo
|
||||||
|
* @param pageSize
|
||||||
|
* @param userTenantStatus
|
||||||
|
* @param type
|
||||||
|
* @param req
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
@GetMapping("/getUserTenantPageList")
|
||||||
|
//@RequiresPermissions("system:tenant:tenantPageList")
|
||||||
|
public Result<IPage<SysUserTenantVo>> getUserTenantPageList(@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
|
||||||
|
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
|
||||||
|
@RequestParam(name = "userTenantStatus") String userTenantStatus,
|
||||||
|
@RequestParam(name = "type", required = false) String type,
|
||||||
|
SysUser user,
|
||||||
|
HttpServletRequest req) {
|
||||||
|
Page<SysUserTenantVo> page = new Page<SysUserTenantVo>(pageNo, pageSize);
|
||||||
|
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
||||||
|
String tenantId = oConvertUtils.getString(TenantContext.getTenant(), "0");
|
||||||
|
IPage<SysUserTenantVo> list = relationService.getUserTenantPageList(page, Arrays.asList(userTenantStatus.split(SymbolConstant.COMMA)), user, Integer.valueOf(tenantId));
|
||||||
|
return Result.ok(list);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 通过用户id获取租户列表【低代码应用专用接口】
|
||||||
|
*
|
||||||
|
* @param userTenantStatus 关系表的状态
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
@GetMapping("/getTenantListByUserId")
|
||||||
|
//@RequiresPermissions("system:tenant:getTenantListByUserId")
|
||||||
|
public Result<List<SysUserTenantVo>> getTenantListByUserId(@RequestParam(name = "userTenantStatus", required = false) String userTenantStatus) {
|
||||||
|
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
||||||
|
List<String> list = null;
|
||||||
|
if (oConvertUtils.isNotEmpty(userTenantStatus)) {
|
||||||
|
list = Arrays.asList(userTenantStatus.split(SymbolConstant.COMMA));
|
||||||
|
}
|
||||||
|
//租户状态，用户id,租户用户关系状态
|
||||||
|
List<SysUserTenantVo> sysTenant = relationService.getTenantListByUserId(sysUser.getId(), list);
|
||||||
|
return Result.ok(sysTenant);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 更新用户租户关系状态【低代码应用专用接口】
|
||||||
|
*/
|
||||||
|
@PutMapping("/updateUserTenantStatus")
|
||||||
|
//@RequiresPermissions("system:tenant:updateUserTenantStatus")
|
||||||
|
public Result<String> updateUserTenantStatus(@RequestBody SysUserTenant userTenant) {
|
||||||
|
String tenantId = TenantContext.getTenant();
|
||||||
|
if (oConvertUtils.isEmpty(tenantId)) {
|
||||||
|
return Result.error("未找到当前租户信息");
|
||||||
|
}
|
||||||
|
relationService.updateUserTenantStatus(userTenant.getUserId(), tenantId, userTenant.getStatus());
|
||||||
|
return Result.ok("更新用户租户状态成功");
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 注销租户【低代码应用专用接口】
|
||||||
|
*
|
||||||
|
* @param sysTenant
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
@PutMapping("/cancelTenant")
|
||||||
|
//@RequiresPermissions("system:tenant:cancelTenant")
|
||||||
|
public Result<String> cancelTenant(@RequestBody SysTenant sysTenant, HttpServletRequest request) {
|
||||||
|
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
||||||
|
SysTenant tenant = sysTenantService.getById(sysTenant.getId());
|
||||||
|
if (null == tenant) {
|
||||||
|
return Result.error("未找到当前租户信息");
|
||||||
|
}
|
||||||
|
if (!sysUser.getUsername().equals(tenant.getCreateBy())) {
|
||||||
|
return Result.error("无权限，只能注销自己创建的租户！");
|
||||||
|
}
|
||||||
|
SysUser userById = sysUserService.getById(sysUser.getId());
|
||||||
|
String loginPassword = request.getParameter("loginPassword");
|
||||||
|
String passwordEncode = PasswordUtil.encrypt(sysUser.getUsername(),loginPassword, userById.getSalt());
|
||||||
|
if (!passwordEncode.equals(userById.getPassword())) {
|
||||||
|
return Result.error("密码不正确");
|
||||||
|
}
|
||||||
|
sysTenantService.removeById(sysTenant.getId());
|
||||||
|
return Result.ok("注销成功");
|
||||||
|
}
|
||||||
|
//update-end---author:wangshuai ---date:20230107 for：[QQYUN-3725]申请加入租户，审核中状态增加接口------------
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 获取租户用户不同状态下的数量【低代码应用专用接口】
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
@GetMapping("/getTenantStatusCount")
|
||||||
|
public Result<Long> getTenantStatusCount(@RequestParam(value = "status",defaultValue = "1") String status, HttpServletRequest req){
|
||||||
|
String tenantId = TokenUtils.getTenantIdByRequest(req);
|
||||||
|
if (null == tenantId) {
|
||||||
|
return Result.error("未找到当前租户信息");
|
||||||
|
}
|
||||||
|
LambdaQueryWrapper<SysUserTenant> query = new LambdaQueryWrapper<>();
|
||||||
|
query.eq(SysUserTenant::getTenantId,tenantId);
|
||||||
|
query.eq(SysUserTenant::getStatus,status);
|
||||||
|
long count = relationService.count(query);
|
||||||
|
return Result.ok(count);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 用户取消租户申请【低代码应用专用接口】
|
||||||
|
* @param tenantId
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
@PutMapping("/cancelApplyTenant")
|
||||||
|
public Result<String> cancelApplyTenant(@RequestParam("tenantId") String tenantId){
|
||||||
|
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
||||||
|
sysTenantService.leaveTenant(sysUser.getId(),tenantId);
|
||||||
|
return Result.ok("取消申请成功");
|
||||||
|
}
|
||||||
|
|
||||||
|
//===========【低代码应用，前端专用接口 —— 加入限制只能维护和查看自己拥有的租户】==========================================================
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 彻底删除租户
|
||||||
|
* @param ids
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
@DeleteMapping("/deleteLogicDeleted")
|
||||||
|
//@RequiresPermissions("system:tenant:deleteTenantLogic")
|
||||||
|
public Result<String> deleteTenantLogic(@RequestParam("ids") String ids){
|
||||||
|
sysTenantService.deleteTenantLogic(ids);
|
||||||
|
return Result.ok("彻底删除成功");
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 还原删除的租户
|
||||||
|
* @param ids
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
@PutMapping("/revertTenantLogic")
|
||||||
|
//@RequiresPermissions("system:tenant:revertTenantLogic")
|
||||||
|
public Result<String> revertTenantLogic(@RequestParam("ids") String ids){
|
||||||
|
sysTenantService.revertTenantLogic(ids);
|
||||||
|
return Result.ok("还原成功");
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 退出租户【低代码应用专用接口】
|
||||||
|
* @param sysTenant
|
||||||
|
* @param request
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
@DeleteMapping("/exitUserTenant")
|
||||||
|
public Result<String> exitUserTenant(@RequestBody SysTenant sysTenant, HttpServletRequest request){
|
||||||
|
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
||||||
|
//验证用户是否已存在
|
||||||
|
Integer count = relationService.userTenantIzExist(sysUser.getId(),sysTenant.getId());
|
||||||
|
if (count == 0) {
|
||||||
|
return Result.error("此租户下没有当前用户");
|
||||||
|
}
|
||||||
|
//验证密码
|
||||||
|
String loginPassword = request.getParameter("loginPassword");
|
||||||
|
SysUser userById = sysUserService.getById(sysUser.getId());
|
||||||
|
String passwordEncode = PasswordUtil.encrypt(sysUser.getUsername(),loginPassword, userById.getSalt());
|
||||||
|
if (!passwordEncode.equals(userById.getPassword())) {
|
||||||
|
return Result.error("密码不正确");
|
||||||
|
}
|
||||||
|
//退出登录
|
||||||
|
sysTenantService.exitUserTenant(sysUser.getId(),sysUser.getUsername(),String.valueOf(sysTenant.getId()));
|
||||||
|
return Result.ok("退出租户成功");
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 变更租户拥有者【低代码应用专用接口】
|
||||||
|
* @param userId
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
@PostMapping("/changeOwenUserTenant")
|
||||||
|
public Result<String> changeOwenUserTenant(@RequestParam("userId") String userId){
|
||||||
|
sysTenantService.changeOwenUserTenant(userId);
|
||||||
|
return Result.ok("退出租户成功");
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 邀请用户到租户,通过手机号匹配 【低代码应用专用接口】
|
||||||
|
* @param phone
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
@PostMapping("/invitationUser")
|
||||||
|
public Result<String> invitationUser(@RequestParam(name="phone") String phone){
|
||||||
|
return sysTenantService.invitationUser(phone);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 获取 租户产品包-3个默认admin的人员数量
|
||||||
|
* @param tenantId
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
@GetMapping("/loadAdminPackCount")
|
||||||
|
public Result<List<TenantPackUserCount>> loadAdminPackCount(@RequestParam("tenantId") Integer tenantId){
|
||||||
|
List<TenantPackUserCount> list = sysTenantService.queryTenantPackUserCount(tenantId);
|
||||||
|
return Result.ok(list);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 查询租户产品包信息
|
||||||
|
* @param packModel
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
@GetMapping("/getTenantPackInfo")
|
||||||
|
public Result<TenantPackModel> getTenantPackInfo(TenantPackModel packModel){
|
||||||
|
TenantPackModel tenantPackModel = sysTenantService.queryTenantPack(packModel);
|
||||||
|
return Result.ok(tenantPackModel);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 添加用户和产品包的关系数据
|
||||||
|
* @param sysTenantPackUser
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
@PostMapping("/addTenantPackUser")
|
||||||
|
public Result<?> addTenantPackUser(@RequestBody SysTenantPackUser sysTenantPackUser){
|
||||||
|
sysTenantService.addBatchTenantPackUser(sysTenantPackUser);
|
||||||
|
return Result.ok("操作成功！");
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 从产品包移除用户
|
||||||
|
* @param sysTenantPackUser
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
@PutMapping("/deleteTenantPackUser")
|
||||||
|
public Result<?> deleteTenantPackUser(@RequestBody SysTenantPackUser sysTenantPackUser){
|
||||||
|
sysTenantService.deleteTenantPackUser(sysTenantPackUser);
|
||||||
|
return Result.ok("操作成功！");
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 修改申请状态
|
||||||
|
* @param sysTenant
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
@PutMapping("/updateApplyStatus")
|
||||||
|
public Result<?> updateApplyStatus(@RequestBody SysTenant sysTenant){
|
||||||
|
SysTenant entity = this.sysTenantService.getById(sysTenant.getId());
|
||||||
|
if(entity==null){
|
||||||
|
return Result.error("租户不存在!");
|
||||||
|
}
|
||||||
|
entity.setApplyStatus(sysTenant.getApplyStatus());
|
||||||
|
sysTenantService.updateById(entity);
|
||||||
|
return Result.ok("");
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 获取产品包人员申请列表
|
||||||
|
* @param tenantId
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
@GetMapping("/getTenantPackApplyUsers")
|
||||||
|
public Result<?> getTenantPackApplyUsers(@RequestParam("tenantId") Integer tenantId){
|
||||||
|
List<TenantPackUser> list = sysTenantService.getTenantPackApplyUsers(tenantId);
|
||||||
|
return Result.ok(list);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 个人 申请成为管理员
|
||||||
|
* @param sysTenantPackUser
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
@PostMapping("/doApplyTenantPackUser")
|
||||||
|
public Result<?> doApplyTenantPackUser(@RequestBody SysTenantPackUser sysTenantPackUser){
|
||||||
|
sysTenantService.doApplyTenantPackUser(sysTenantPackUser);
|
||||||
|
return Result.ok("申请成功！");
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 申请通过 成为管理员
|
||||||
|
* @param sysTenantPackUser
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
@PutMapping("/passApply")
|
||||||
|
public Result<?> passApply(@RequestBody SysTenantPackUser sysTenantPackUser){
|
||||||
|
sysTenantService.passApply(sysTenantPackUser);
|
||||||
|
return Result.ok("操作成功！");
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 拒绝申请 成为管理员
|
||||||
|
* @param sysTenantPackUser
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
@PutMapping("/deleteApply")
|
||||||
|
public Result<?> deleteApply(@RequestBody SysTenantPackUser sysTenantPackUser){
|
||||||
|
sysTenantService.deleteApply(sysTenantPackUser);
|
||||||
|
return Result.ok("");
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 进入应用组织页面 查询租户信息及当前用户是否有 管理员的权限--
|
||||||
|
* @param id
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
@RequestMapping(value = "/queryTenantAuthInfo", method = RequestMethod.GET)
|
||||||
|
public Result<TenantDepartAuthInfo> queryTenantAuthInfo(@RequestParam(name="id",required=true) String id) {
|
||||||
|
TenantDepartAuthInfo info = sysTenantService.getTenantDepartAuthInfo(Integer.parseInt(id));
|
||||||
|
return Result.ok(info);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 获取产品包下的用户列表(分页)
|
||||||
|
* @param tenantId
|
||||||
|
* @param packId
|
||||||
|
* @param status
|
||||||
|
* @param pageNo
|
||||||
|
* @param pageSize
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
@GetMapping("/queryTenantPackUserList")
|
||||||
|
public Result<IPage<TenantPackUser>> queryTenantPackUserList(@RequestParam("tenantId") String tenantId,
|
||||||
|
@RequestParam("packId") String packId,
|
||||||
|
@RequestParam("status") Integer status,
|
||||||
|
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
||||||
|
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize){
|
||||||
|
Page<TenantPackUser> page = new Page<>(pageNo,pageSize);
|
||||||
|
IPage<TenantPackUser> pageList = sysTenantService.queryTenantPackUserList(tenantId,packId,status,page);
|
||||||
|
return Result.ok(pageList);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -17,9 +17,10 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
|
|||||||
import org.apache.shiro.authz.annotation.RequiresRoles;
|
import org.apache.shiro.authz.annotation.RequiresRoles;
|
||||||
import org.jeecg.common.api.vo.Result;
|
import org.jeecg.common.api.vo.Result;
|
||||||
import org.jeecg.common.aspect.annotation.PermissionData;
|
import org.jeecg.common.aspect.annotation.PermissionData;
|
||||||
|
import org.jeecg.common.config.TenantContext;
|
||||||
import org.jeecg.common.constant.CommonConstant;
|
import org.jeecg.common.constant.CommonConstant;
|
||||||
import org.jeecg.common.constant.SymbolConstant;
|
import org.jeecg.common.constant.SymbolConstant;
|
||||||
import org.jeecg.common.system.api.ISysBaseAPI;
|
import org.jeecg.config.mybatis.MybatisPlusSaasConfig;
|
||||||
import org.jeecg.modules.base.service.BaseCommonService;
|
import org.jeecg.modules.base.service.BaseCommonService;
|
||||||
import org.jeecg.common.system.query.QueryGenerator;
|
import org.jeecg.common.system.query.QueryGenerator;
|
||||||
import org.jeecg.common.system.util.JwtUtil;
|
import org.jeecg.common.system.util.JwtUtil;
|
||||||
@ -31,6 +32,8 @@ import org.jeecg.modules.system.model.SysUserSysDepartModel;
|
|||||||
import org.jeecg.modules.system.service.*;
|
import org.jeecg.modules.system.service.*;
|
||||||
import org.jeecg.modules.system.vo.SysDepartUsersVO;
|
import org.jeecg.modules.system.vo.SysDepartUsersVO;
|
||||||
import org.jeecg.modules.system.vo.SysUserRoleVO;
|
import org.jeecg.modules.system.vo.SysUserRoleVO;
|
||||||
|
import org.jeecg.modules.system.vo.lowapp.DepartAndUserInfo;
|
||||||
|
import org.jeecg.modules.system.vo.lowapp.UpdateDepartInfo;
|
||||||
import org.jeecgframework.poi.excel.ExcelImportUtil;
|
import org.jeecgframework.poi.excel.ExcelImportUtil;
|
||||||
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
|
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
|
||||||
import org.jeecgframework.poi.excel.entity.ExportParams;
|
import org.jeecgframework.poi.excel.entity.ExportParams;
|
||||||
@ -74,9 +77,6 @@ public class SysUserController {
|
|||||||
@Autowired
|
@Autowired
|
||||||
private ISysUserDepartService sysUserDepartService;
|
private ISysUserDepartService sysUserDepartService;
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private ISysUserRoleService userRoleService;
|
|
||||||
|
|
||||||
@Autowired
|
@Autowired
|
||||||
private ISysDepartRoleUserService departRoleUserService;
|
private ISysDepartRoleUserService departRoleUserService;
|
||||||
|
|
||||||
@ -92,8 +92,17 @@ public class SysUserController {
|
|||||||
@Autowired
|
@Autowired
|
||||||
private BaseCommonService baseCommonService;
|
private BaseCommonService baseCommonService;
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private ISysUserAgentService sysUserAgentService;
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private ISysPositionService sysPositionService;
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private ISysUserTenantService userTenantService;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 获取用户列表数据
|
* 获取租户下用户数据（支持租户隔离）
|
||||||
* @param user
|
* @param user
|
||||||
* @param pageNo
|
* @param pageNo
|
||||||
* @param pageSize
|
* @param pageSize
|
||||||
@ -104,63 +113,42 @@ public class SysUserController {
|
|||||||
@RequestMapping(value = "/list", method = RequestMethod.GET)
|
@RequestMapping(value = "/list", method = RequestMethod.GET)
|
||||||
public Result<IPage<SysUser>> queryPageList(SysUser user,@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
public Result<IPage<SysUser>> queryPageList(SysUser user,@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
||||||
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,HttpServletRequest req) {
|
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,HttpServletRequest req) {
|
||||||
Result<IPage<SysUser>> result = new Result<IPage<SysUser>>();
|
|
||||||
QueryWrapper<SysUser> queryWrapper = QueryGenerator.initQueryWrapper(user, req.getParameterMap());
|
QueryWrapper<SysUser> queryWrapper = QueryGenerator.initQueryWrapper(user, req.getParameterMap());
|
||||||
|
//------------------------------------------------------------------------------------------------
|
||||||
//update-begin-Author:wangshuai--Date:20211119--for:【vue3】通过部门id查询用户，通过code查询id
|
//是否开启系统管理模块的多租户数据隔离【SAAS多租户模式】
|
||||||
//部门ID
|
if (MybatisPlusSaasConfig.OPEN_SYSTEM_TENANT_CONTROL) {
|
||||||
String departId = req.getParameter("departId");
|
String tenantId = oConvertUtils.getString(TenantContext.getTenant(), "0");
|
||||||
if(oConvertUtils.isNotEmpty(departId)){
|
//update-begin---author:wangshuai ---date:20221223 for：[QQYUN-3371]租户逻辑改造，改成关系表------------
|
||||||
LambdaQueryWrapper<SysUserDepart> query = new LambdaQueryWrapper<>();
|
List<String> userIds = userTenantService.getUserIdsByTenantId(Integer.valueOf(tenantId));
|
||||||
query.eq(SysUserDepart::getDepId,departId);
|
if (oConvertUtils.listIsNotEmpty(userIds)) {
|
||||||
List<SysUserDepart> list = sysUserDepartService.list(query);
|
queryWrapper.in("id", userIds);
|
||||||
List<String> userIds = list.stream().map(SysUserDepart::getUserId).collect(Collectors.toList());
|
|
||||||
//update-begin---author:wangshuai ---date:20220322 for：[issues/I4XTYB]查询用户时，当部门id 下没有分配用户时接口报错------------
|
|
||||||
if(oConvertUtils.listIsNotEmpty(userIds)){
|
|
||||||
queryWrapper.in("id",userIds);
|
|
||||||
}else{
|
}else{
|
||||||
return Result.OK();
|
queryWrapper.eq("id", "通过租户查询不到任何用户");
|
||||||
}
|
}
|
||||||
//update-end---author:wangshuai ---date:20220322 for：[issues/I4XTYB]查询用户时，当部门id 下没有分配用户时接口报错------------
|
//update-end---author:wangshuai ---date:20221223 for：[QQYUN-3371]租户逻辑改造，改成关系表------------
|
||||||
}
|
}
|
||||||
//用户ID
|
//------------------------------------------------------------------------------------------------
|
||||||
String code = req.getParameter("code");
|
return sysUserService.queryPageList(req, queryWrapper, pageSize, pageNo);
|
||||||
if(oConvertUtils.isNotEmpty(code)){
|
|
||||||
queryWrapper.in("id",Arrays.asList(code.split(",")));
|
|
||||||
pageSize = code.split(",").length;
|
|
||||||
}
|
|
||||||
//update-end-Author:wangshuai--Date:20211119--for:【vue3】通过部门id查询用户，通过code查询id
|
|
||||||
|
|
||||||
//update-begin-author:taoyan--date:20220104--for: JTC-372 【用户冻结问题】 online授权、用户组件，选择用户都能看到被冻结的用户
|
|
||||||
String status = req.getParameter("status");
|
|
||||||
if(oConvertUtils.isNotEmpty(status)){
|
|
||||||
queryWrapper.eq("status", Integer.parseInt(status));
|
|
||||||
}
|
|
||||||
//update-end-author:taoyan--date:20220104--for: JTC-372 【用户冻结问题】 online授权、用户组件，选择用户都能看到被冻结的用户
|
|
||||||
|
|
||||||
//TODO 外部模拟登陆临时账号，列表不显示
|
|
||||||
queryWrapper.ne("username","_reserve_user_external");
|
|
||||||
Page<SysUser> page = new Page<SysUser>(pageNo, pageSize);
|
|
||||||
IPage<SysUser> pageList = sysUserService.page(page, queryWrapper);
|
|
||||||
|
|
||||||
//批量查询用户的所属部门
|
|
||||||
//step.1 先拿到全部的 useids
|
|
||||||
//step.2 通过 useids，一次性查询用户的所属部门名字
|
|
||||||
List<String> userIds = pageList.getRecords().stream().map(SysUser::getId).collect(Collectors.toList());
|
|
||||||
if(userIds!=null && userIds.size()>0){
|
|
||||||
Map<String,String> useDepNames = sysUserService.getDepNamesByUserIds(userIds);
|
|
||||||
pageList.getRecords().forEach(item->{
|
|
||||||
item.setOrgCodeTxt(useDepNames.get(item.getId()));
|
|
||||||
});
|
|
||||||
}
|
|
||||||
result.setSuccess(true);
|
|
||||||
result.setResult(pageList);
|
|
||||||
log.info(pageList.toString());
|
|
||||||
return result;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//@RequiresRoles({"admin"})
|
/**
|
||||||
//Permissions("system:user:add")
|
* 获取系统用户数据（查询全部用户，不做租户隔离）
|
||||||
|
*
|
||||||
|
* @param user
|
||||||
|
* @param pageNo
|
||||||
|
* @param pageSize
|
||||||
|
* @param req
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
//@RequiresPermissions("system:user:listAll")
|
||||||
|
@RequestMapping(value = "/listAll", method = RequestMethod.GET)
|
||||||
|
public Result<IPage<SysUser>> queryAllPageList(SysUser user, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
|
||||||
|
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
|
||||||
|
QueryWrapper<SysUser> queryWrapper = QueryGenerator.initQueryWrapper(user, req.getParameterMap());
|
||||||
|
return sysUserService.queryPageList(req, queryWrapper, pageSize, pageNo);
|
||||||
|
}
|
||||||
|
|
||||||
|
//@RequiresPermissions("system:user:add")
|
||||||
@RequestMapping(value = "/add", method = RequestMethod.POST)
|
@RequestMapping(value = "/add", method = RequestMethod.POST)
|
||||||
public Result<SysUser> add(@RequestBody JSONObject jsonObject) {
|
public Result<SysUser> add(@RequestBody JSONObject jsonObject) {
|
||||||
Result<SysUser> result = new Result<SysUser>();
|
Result<SysUser> result = new Result<SysUser>();
|
||||||
@ -178,7 +166,9 @@ public class SysUserController {
|
|||||||
//用户表字段org_code不能在这里设置他的值
|
//用户表字段org_code不能在这里设置他的值
|
||||||
user.setOrgCode(null);
|
user.setOrgCode(null);
|
||||||
// 保存用户走一个service 保证事务
|
// 保存用户走一个service 保证事务
|
||||||
sysUserService.saveUser(user, selectedRoles, selectedDeparts);
|
//获取租户ids
|
||||||
|
String relTenantIds = jsonObject.getString("relTenantIds");
|
||||||
|
sysUserService.saveUser(user, selectedRoles, selectedDeparts, relTenantIds);
|
||||||
baseCommonService.addLog("添加用户，username： " +user.getUsername() ,CommonConstant.LOG_TYPE_2, 2);
|
baseCommonService.addLog("添加用户，username： " +user.getUsername() ,CommonConstant.LOG_TYPE_2, 2);
|
||||||
result.success("添加成功！");
|
result.success("添加成功！");
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
@ -188,8 +178,7 @@ public class SysUserController {
|
|||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
//@RequiresRoles({"admin"})
|
//@RequiresPermissions("system:user:edit")
|
||||||
//Permissions("system:user:edit")
|
|
||||||
@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
|
@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
|
||||||
public Result<SysUser> edit(@RequestBody JSONObject jsonObject) {
|
public Result<SysUser> edit(@RequestBody JSONObject jsonObject) {
|
||||||
Result<SysUser> result = new Result<SysUser>();
|
Result<SysUser> result = new Result<SysUser>();
|
||||||
@ -212,7 +201,9 @@ public class SysUserController {
|
|||||||
//用户表字段org_code不能在这里设置他的值
|
//用户表字段org_code不能在这里设置他的值
|
||||||
user.setOrgCode(null);
|
user.setOrgCode(null);
|
||||||
// 修改用户走一个service 保证事务
|
// 修改用户走一个service 保证事务
|
||||||
sysUserService.editUser(user, roles, departs);
|
//获取租户ids
|
||||||
|
String relTenantIds = jsonObject.getString("relTenantIds");
|
||||||
|
sysUserService.editUser(user, roles, departs, relTenantIds);
|
||||||
result.success("修改成功!");
|
result.success("修改成功!");
|
||||||
}
|
}
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
@ -225,7 +216,7 @@ public class SysUserController {
|
|||||||
/**
|
/**
|
||||||
* 删除用户
|
* 删除用户
|
||||||
*/
|
*/
|
||||||
//@RequiresRoles({"admin"})
|
//@RequiresPermissions("system:user:delete")
|
||||||
@RequestMapping(value = "/delete", method = RequestMethod.DELETE)
|
@RequestMapping(value = "/delete", method = RequestMethod.DELETE)
|
||||||
public Result<?> delete(@RequestParam(name="id",required=true) String id) {
|
public Result<?> delete(@RequestParam(name="id",required=true) String id) {
|
||||||
baseCommonService.addLog("删除用户，id： " +id ,CommonConstant.LOG_TYPE_2, 3);
|
baseCommonService.addLog("删除用户，id： " +id ,CommonConstant.LOG_TYPE_2, 3);
|
||||||
@ -236,7 +227,7 @@ public class SysUserController {
|
|||||||
/**
|
/**
|
||||||
* 批量删除用户
|
* 批量删除用户
|
||||||
*/
|
*/
|
||||||
//@RequiresRoles({"admin"})
|
//@RequiresPermissions("system:user:deleteBatch")
|
||||||
@RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE)
|
@RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE)
|
||||||
public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
|
public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
|
||||||
baseCommonService.addLog("批量删除用户， ids： " +ids ,CommonConstant.LOG_TYPE_2, 3);
|
baseCommonService.addLog("批量删除用户， ids： " +ids ,CommonConstant.LOG_TYPE_2, 3);
|
||||||
@ -249,7 +240,7 @@ public class SysUserController {
|
|||||||
* @param jsonObject
|
* @param jsonObject
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
//@RequiresRoles({"admin"})
|
//@RequiresPermissions("system:user:frozenBatch")
|
||||||
@RequestMapping(value = "/frozenBatch", method = RequestMethod.PUT)
|
@RequestMapping(value = "/frozenBatch", method = RequestMethod.PUT)
|
||||||
public Result<SysUser> frozenBatch(@RequestBody JSONObject jsonObject) {
|
public Result<SysUser> frozenBatch(@RequestBody JSONObject jsonObject) {
|
||||||
Result<SysUser> result = new Result<SysUser>();
|
Result<SysUser> result = new Result<SysUser>();
|
||||||
@ -272,6 +263,7 @@ public class SysUserController {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//@RequiresPermissions("system:user:queryById")
|
||||||
@RequestMapping(value = "/queryById", method = RequestMethod.GET)
|
@RequestMapping(value = "/queryById", method = RequestMethod.GET)
|
||||||
public Result<SysUser> queryById(@RequestParam(name = "id", required = true) String id) {
|
public Result<SysUser> queryById(@RequestParam(name = "id", required = true) String id) {
|
||||||
Result<SysUser> result = new Result<SysUser>();
|
Result<SysUser> result = new Result<SysUser>();
|
||||||
@ -285,6 +277,7 @@ public class SysUserController {
|
|||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//@RequiresPermissions("system:user:queryUserRole")
|
||||||
@RequestMapping(value = "/queryUserRole", method = RequestMethod.GET)
|
@RequestMapping(value = "/queryUserRole", method = RequestMethod.GET)
|
||||||
public Result<List<String>> queryUserRole(@RequestParam(name = "userid", required = true) String userid) {
|
public Result<List<String>> queryUserRole(@RequestParam(name = "userid", required = true) String userid) {
|
||||||
Result<List<String>> result = new Result<>();
|
Result<List<String>> result = new Result<>();
|
||||||
@ -337,7 +330,7 @@ public class SysUserController {
|
|||||||
/**
|
/**
|
||||||
* 修改密码
|
* 修改密码
|
||||||
*/
|
*/
|
||||||
//@RequiresRoles({"admin"})
|
//@RequiresPermissions("system:user:changepwd")
|
||||||
@RequestMapping(value = "/changePassword", method = RequestMethod.PUT)
|
@RequestMapping(value = "/changePassword", method = RequestMethod.PUT)
|
||||||
public Result<?> changePassword(@RequestBody SysUser sysUser) {
|
public Result<?> changePassword(@RequestBody SysUser sysUser) {
|
||||||
SysUser u = this.sysUserService.getOne(new LambdaQueryWrapper<SysUser>().eq(SysUser::getUsername, sysUser.getUsername()));
|
SysUser u = this.sysUserService.getOne(new LambdaQueryWrapper<SysUser>().eq(SysUser::getUsername, sysUser.getUsername()));
|
||||||
@ -460,7 +453,6 @@ public class SysUserController {
|
|||||||
* @param request
|
* @param request
|
||||||
* @param sysUser
|
* @param sysUser
|
||||||
*/
|
*/
|
||||||
//@RequiresRoles({"admin"})
|
|
||||||
//@RequiresPermissions("system:user:export")
|
//@RequiresPermissions("system:user:export")
|
||||||
@RequestMapping(value = "/exportXls")
|
@RequestMapping(value = "/exportXls")
|
||||||
public ModelAndView exportXls(SysUser sysUser,HttpServletRequest request) {
|
public ModelAndView exportXls(SysUser sysUser,HttpServletRequest request) {
|
||||||
@ -494,8 +486,7 @@ public class SysUserController {
|
|||||||
* @param response
|
* @param response
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
//@RequiresRoles({"admin"})
|
//@RequiresPermissions("system:user:import")
|
||||||
//Permissions("system:user:import")
|
|
||||||
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
|
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
|
||||||
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response)throws IOException {
|
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response)throws IOException {
|
||||||
MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
|
MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
|
||||||
@ -588,10 +579,28 @@ public class SysUserController {
|
|||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @功能：根据id 批量查询
|
||||||
|
* @param userNames
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
@RequestMapping(value = "/queryByNames", method = RequestMethod.GET)
|
||||||
|
public Result<Collection<SysUser>> queryByNames(@RequestParam String userNames) {
|
||||||
|
Result<Collection<SysUser>> result = new Result<>();
|
||||||
|
String[] names = userNames.split(",");
|
||||||
|
QueryWrapper<SysUser> queryWrapper=new QueryWrapper();
|
||||||
|
queryWrapper.lambda().in(true,SysUser::getUsername,names);
|
||||||
|
Collection<SysUser> userRole = sysUserService.list(queryWrapper);
|
||||||
|
result.setSuccess(true);
|
||||||
|
result.setResult(userRole);
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 首页用户重置密码
|
* 首页用户重置密码
|
||||||
*/
|
*/
|
||||||
//@RequiresRoles({"admin"})
|
//@RequiresPermissions("system:user:updatepwd")
|
||||||
@RequestMapping(value = "/updatePassword", method = RequestMethod.PUT)
|
@RequestMapping(value = "/updatePassword", method = RequestMethod.PUT)
|
||||||
public Result<?> updatePassword(@RequestBody JSONObject json) {
|
public Result<?> updatePassword(@RequestBody JSONObject json) {
|
||||||
String username = json.getString("username");
|
String username = json.getString("username");
|
||||||
@ -632,7 +641,7 @@ public class SysUserController {
|
|||||||
* @param
|
* @param
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
//@RequiresRoles({"admin"})
|
//@RequiresPermissions("system:user:addUserRole")
|
||||||
@RequestMapping(value = "/addSysUserRole", method = RequestMethod.POST)
|
@RequestMapping(value = "/addSysUserRole", method = RequestMethod.POST)
|
||||||
public Result<String> addSysUserRole(@RequestBody SysUserRoleVO sysUserRoleVO) {
|
public Result<String> addSysUserRole(@RequestBody SysUserRoleVO sysUserRoleVO) {
|
||||||
Result<String> result = new Result<String>();
|
Result<String> result = new Result<String>();
|
||||||
@ -663,7 +672,7 @@ public class SysUserController {
|
|||||||
* @param
|
* @param
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
//@RequiresRoles({"admin"})
|
//@RequiresPermissions("system:user:deleteRole")
|
||||||
@RequestMapping(value = "/deleteUserRole", method = RequestMethod.DELETE)
|
@RequestMapping(value = "/deleteUserRole", method = RequestMethod.DELETE)
|
||||||
public Result<SysUserRole> deleteUserRole(@RequestParam(name="roleId") String roleId,
|
public Result<SysUserRole> deleteUserRole(@RequestParam(name="roleId") String roleId,
|
||||||
@RequestParam(name="userId",required=true) String userId
|
@RequestParam(name="userId",required=true) String userId
|
||||||
@ -687,7 +696,7 @@ public class SysUserController {
|
|||||||
* @param
|
* @param
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
//@RequiresRoles({"admin"})
|
//@RequiresPermissions("system:user:deleteRoleBatch")
|
||||||
@RequestMapping(value = "/deleteUserRoleBatch", method = RequestMethod.DELETE)
|
@RequestMapping(value = "/deleteUserRoleBatch", method = RequestMethod.DELETE)
|
||||||
public Result<SysUserRole> deleteUserRoleBatch(
|
public Result<SysUserRole> deleteUserRoleBatch(
|
||||||
@RequestParam(name="roleId") String roleId,
|
@RequestParam(name="roleId") String roleId,
|
||||||
@ -740,6 +749,10 @@ public class SysUserController {
|
|||||||
item.setOrgCode(useDepNames.get(item.getId()));
|
item.setOrgCode(useDepNames.get(item.getId()));
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
//update-begin---author:wangshuai ---date:20221223 for：[QQYUN-3371]租户逻辑改造，改成关系表------------
|
||||||
|
//设置租户id
|
||||||
|
page.setRecords(userTenantService.setUserTenantIds(page.getRecords()));
|
||||||
|
//update-end---author:wangshuai ---date:20221223 for：[QQYUN-3371]租户逻辑改造，改成关系表------------
|
||||||
result.setSuccess(true);
|
result.setSuccess(true);
|
||||||
result.setResult(pageList);
|
result.setResult(pageList);
|
||||||
}else{
|
}else{
|
||||||
@ -814,7 +827,7 @@ public class SysUserController {
|
|||||||
/**
|
/**
|
||||||
* 给指定部门添加对应的用户
|
* 给指定部门添加对应的用户
|
||||||
*/
|
*/
|
||||||
//@RequiresRoles({"admin"})
|
//@RequiresPermissions("system:user:editDepartWithUser")
|
||||||
@RequestMapping(value = "/editSysDepartWithUser", method = RequestMethod.POST)
|
@RequestMapping(value = "/editSysDepartWithUser", method = RequestMethod.POST)
|
||||||
public Result<String> editSysDepartWithUser(@RequestBody SysDepartUsersVO sysDepartUsersVO) {
|
public Result<String> editSysDepartWithUser(@RequestBody SysDepartUsersVO sysDepartUsersVO) {
|
||||||
Result<String> result = new Result<String>();
|
Result<String> result = new Result<String>();
|
||||||
@ -843,7 +856,7 @@ public class SysUserController {
|
|||||||
/**
|
/**
|
||||||
* 删除指定机构的用户关系
|
* 删除指定机构的用户关系
|
||||||
*/
|
*/
|
||||||
//@RequiresRoles({"admin"})
|
//@RequiresPermissions("system:user:deleteUserInDepart")
|
||||||
@RequestMapping(value = "/deleteUserInDepart", method = RequestMethod.DELETE)
|
@RequestMapping(value = "/deleteUserInDepart", method = RequestMethod.DELETE)
|
||||||
public Result<SysUserDepart> deleteUserInDepart(@RequestParam(name="depId") String depId,
|
public Result<SysUserDepart> deleteUserInDepart(@RequestParam(name="depId") String depId,
|
||||||
@RequestParam(name="userId",required=true) String userId
|
@RequestParam(name="userId",required=true) String userId
|
||||||
@ -875,7 +888,7 @@ public class SysUserController {
|
|||||||
/**
|
/**
|
||||||
* 批量删除指定机构的用户关系
|
* 批量删除指定机构的用户关系
|
||||||
*/
|
*/
|
||||||
//@RequiresRoles({"admin"})
|
//@RequiresPermissions("system:user:deleteUserInDepartBatch")
|
||||||
@RequestMapping(value = "/deleteUserInDepartBatch", method = RequestMethod.DELETE)
|
@RequestMapping(value = "/deleteUserInDepartBatch", method = RequestMethod.DELETE)
|
||||||
public Result<SysUserDepart> deleteUserInDepartBatch(
|
public Result<SysUserDepart> deleteUserInDepartBatch(
|
||||||
@RequestParam(name="depId") String depId,
|
@RequestParam(name="depId") String depId,
|
||||||
@ -982,20 +995,25 @@ public class SysUserController {
|
|||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
String realname = jsonObject.getString("realname");
|
||||||
|
if(oConvertUtils.isEmpty(realname)){
|
||||||
|
realname = username;
|
||||||
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
user.setCreateTime(new Date());// 设置创建时间
|
user.setCreateTime(new Date());// 设置创建时间
|
||||||
String salt = oConvertUtils.randomGen(8);
|
String salt = oConvertUtils.randomGen(8);
|
||||||
String passwordEncode = PasswordUtil.encrypt(username, password, salt);
|
String passwordEncode = PasswordUtil.encrypt(username, password, salt);
|
||||||
user.setSalt(salt);
|
user.setSalt(salt);
|
||||||
user.setUsername(username);
|
user.setUsername(username);
|
||||||
user.setRealname(username);
|
user.setRealname(realname);
|
||||||
user.setPassword(passwordEncode);
|
user.setPassword(passwordEncode);
|
||||||
user.setEmail(email);
|
user.setEmail(email);
|
||||||
user.setPhone(phone);
|
user.setPhone(phone);
|
||||||
user.setStatus(CommonConstant.USER_UNFREEZE);
|
user.setStatus(CommonConstant.USER_UNFREEZE);
|
||||||
user.setDelFlag(CommonConstant.DEL_FLAG_0);
|
user.setDelFlag(CommonConstant.DEL_FLAG_0);
|
||||||
user.setActivitiSync(CommonConstant.ACT_SYNC_0);
|
user.setActivitiSync(CommonConstant.ACT_SYNC_0);
|
||||||
sysUserService.addUserWithRole(user,"ee8626f80f7c2619917b6236f3a7f02b");//默认临时角色 test
|
sysUserService.addUserWithRole(user,null);
|
||||||
result.success("注册成功");
|
result.success("注册成功");
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
result.error500("注册失败");
|
result.error500("注册失败");
|
||||||
@ -1065,6 +1083,12 @@ public class SysUserController {
|
|||||||
SysUser user = sysUserService.getOne(query);
|
SysUser user = sysUserService.getOne(query);
|
||||||
Map<String,String> map = new HashMap(5);
|
Map<String,String> map = new HashMap(5);
|
||||||
map.put("smscode",smscode);
|
map.put("smscode",smscode);
|
||||||
|
if(null == user){
|
||||||
|
//前端根据文字做判断用户是否存在判断，不能修改
|
||||||
|
result.setMessage("用户信息不存在");
|
||||||
|
result.setSuccess(false);
|
||||||
|
return result;
|
||||||
|
}
|
||||||
map.put("username",user.getUsername());
|
map.put("username",user.getUsername());
|
||||||
result.setResult(map);
|
result.setResult(map);
|
||||||
result.setSuccess(true);
|
result.setSuccess(true);
|
||||||
@ -1239,7 +1263,7 @@ public class SysUserController {
|
|||||||
* @param userIds 被删除的用户ID，多个id用半角逗号分割
|
* @param userIds 被删除的用户ID，多个id用半角逗号分割
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
//@RequiresRoles({"admin"})
|
//@RequiresPermissions("system:user:deleteRecycleBin")
|
||||||
@RequestMapping(value = "/deleteRecycleBin", method = RequestMethod.DELETE)
|
@RequestMapping(value = "/deleteRecycleBin", method = RequestMethod.DELETE)
|
||||||
public Result deleteRecycleBin(@RequestParam("userIds") String userIds) {
|
public Result deleteRecycleBin(@RequestParam("userIds") String userIds) {
|
||||||
if (StringUtils.isNotBlank(userIds)) {
|
if (StringUtils.isNotBlank(userIds)) {
|
||||||
@ -1254,6 +1278,7 @@ public class SysUserController {
|
|||||||
* @param jsonObject
|
* @param jsonObject
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
|
@RequiresRoles({"admin"})
|
||||||
@RequestMapping(value = "/appEdit", method = {RequestMethod.PUT,RequestMethod.POST})
|
@RequestMapping(value = "/appEdit", method = {RequestMethod.PUT,RequestMethod.POST})
|
||||||
public Result<SysUser> appEdit(HttpServletRequest request,@RequestBody JSONObject jsonObject) {
|
public Result<SysUser> appEdit(HttpServletRequest request,@RequestBody JSONObject jsonObject) {
|
||||||
Result<SysUser> result = new Result<SysUser>();
|
Result<SysUser> result = new Result<SysUser>();
|
||||||
@ -1466,5 +1491,255 @@ public class SysUserController {
|
|||||||
}
|
}
|
||||||
return ls;
|
return ls;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 聊天 创建聊天组件专用 根据用户账号、用户姓名、部门id分页查询
|
||||||
|
* @param departId 部门id
|
||||||
|
* @param keyword 搜索值
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
@GetMapping(value = "/getUserInformation")
|
||||||
|
public Result<IPage<SysUser>> getUserInformation(
|
||||||
|
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
||||||
|
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
|
||||||
|
@RequestParam(name = "departId", required = false) String departId,
|
||||||
|
@RequestParam(name="keyword",required=false) String keyword) {
|
||||||
|
//------------------------------------------------------------------------------------------------
|
||||||
|
Integer tenantId = null;
|
||||||
|
//是否开启系统管理模块的多租户数据隔离【SAAS多租户模式】
|
||||||
|
if(MybatisPlusSaasConfig.OPEN_SYSTEM_TENANT_CONTROL){
|
||||||
|
tenantId = oConvertUtils.getInt(TenantContext.getTenant(),0);
|
||||||
|
}
|
||||||
|
//------------------------------------------------------------------------------------------------
|
||||||
|
IPage<SysUser> pageList = sysUserDepartService.getUserInformation(tenantId,departId, keyword, pageSize, pageNo);
|
||||||
|
return Result.OK(pageList);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 简版流程用户选择组件
|
||||||
|
* @param departId 部门id
|
||||||
|
* @param roleId 角色id
|
||||||
|
* @param keyword 搜索值
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
@GetMapping(value = "/selectUserList")
|
||||||
|
public Result<IPage<SysUser>> selectUserList(
|
||||||
|
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
||||||
|
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
|
||||||
|
@RequestParam(name = "departId", required = false) String departId,
|
||||||
|
@RequestParam(name = "roleId", required = false) String roleId,
|
||||||
|
@RequestParam(name="keyword",required=false) String keyword) {
|
||||||
|
//------------------------------------------------------------------------------------------------
|
||||||
|
Integer tenantId = null;
|
||||||
|
//是否开启系统管理模块的多租户数据隔离【SAAS多租户模式】
|
||||||
|
if(MybatisPlusSaasConfig.OPEN_SYSTEM_TENANT_CONTROL){
|
||||||
|
String tenantStr = TenantContext.getTenant();
|
||||||
|
if(oConvertUtils.isNotEmpty(tenantStr)){
|
||||||
|
tenantId = Integer.parseInt(tenantStr);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
//------------------------------------------------------------------------------------------------
|
||||||
|
IPage<SysUser> pageList = sysUserDepartService.getUserInformation(tenantId, departId,roleId, keyword, pageSize, pageNo);
|
||||||
|
return Result.OK(pageList);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 用户离职(新增代理人和用户状态变更操作)【低代码应用专用接口】
|
||||||
|
* @param sysUserAgent
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
@PutMapping("/userQuitAgent")
|
||||||
|
public Result<String> userQuitAgent(@RequestBody SysUserAgent sysUserAgent){
|
||||||
|
//判断id是否为空
|
||||||
|
if(oConvertUtils.isNotEmpty(sysUserAgent.getId())){
|
||||||
|
sysUserAgentService.updateById(sysUserAgent);
|
||||||
|
}else{
|
||||||
|
sysUserAgentService.save(sysUserAgent);
|
||||||
|
}
|
||||||
|
sysUserService.userQuit(sysUserAgent.getUserName());
|
||||||
|
return Result.ok("离职成功");
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 获取被逻辑删除的用户列表，无分页【低代码应用专用接口】
|
||||||
|
*
|
||||||
|
* @return List<SysUser>
|
||||||
|
*/
|
||||||
|
@GetMapping("/getQuitList")
|
||||||
|
public Result<List<SysUser>> getQuitList(HttpServletRequest req) {
|
||||||
|
Integer tenantId = oConvertUtils.getInt(TokenUtils.getTenantIdByRequest(req),0);
|
||||||
|
List<SysUser> quitList = sysUserService.getQuitList(tenantId);
|
||||||
|
if (null != quitList && quitList.size() > 0) {
|
||||||
|
// 批量查询用户的所属部门
|
||||||
|
// step.1 先拿到全部的 userIds
|
||||||
|
List<String> userIds = quitList.stream().map(SysUser::getId).collect(Collectors.toList());
|
||||||
|
// step.2 通过 userIds，一次性查询用户的所属部门名字
|
||||||
|
Map<String, String> useDepNames = sysUserService.getDepNamesByUserIds(userIds);
|
||||||
|
quitList.forEach(item -> item.setOrgCode(useDepNames.get(item.getId())));
|
||||||
|
}
|
||||||
|
return Result.ok(quitList);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 更新刪除状态和离职状态【低代码应用专用接口】
|
||||||
|
* @param jsonObject
|
||||||
|
* @return Result<String>
|
||||||
|
*/
|
||||||
|
@PutMapping("/putCancelQuit")
|
||||||
|
public Result<String> putCancelQuit(@RequestBody JSONObject jsonObject, HttpServletRequest request){
|
||||||
|
String userIds = jsonObject.getString("userIds");
|
||||||
|
String usernames = jsonObject.getString("usernames");
|
||||||
|
Integer tenantId = oConvertUtils.getInt(TokenUtils.getTenantIdByRequest(request),0);
|
||||||
|
//将状态改成未删除
|
||||||
|
if (StringUtils.isNotBlank(userIds)) {
|
||||||
|
userTenantService.putCancelQuit(Arrays.asList(userIds.split(SymbolConstant.COMMA)),tenantId);
|
||||||
|
}
|
||||||
|
if(StringUtils.isNotEmpty(usernames)){
|
||||||
|
//根据用户名删除代理人
|
||||||
|
LambdaQueryWrapper<SysUserAgent> query = new LambdaQueryWrapper<>();
|
||||||
|
query.in(SysUserAgent::getUserName,Arrays.asList(usernames.split(SymbolConstant.COMMA)));
|
||||||
|
sysUserAgentService.remove(query);
|
||||||
|
}
|
||||||
|
return Result.ok("取消离职成功");
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 获取用户信息(vue3用户设置专用)【低代码应用专用接口】
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
@GetMapping("/login/setting/getUserData")
|
||||||
|
public Result<SysUser> getUserData(HttpServletRequest request) {
|
||||||
|
String username = JwtUtil.getUserNameByToken(request);
|
||||||
|
SysUser user = sysUserService.getUserByName(username);
|
||||||
|
if(user==null) {
|
||||||
|
return Result.error("未找到该用户数据");
|
||||||
|
}
|
||||||
|
if(oConvertUtils.isNotEmpty(user.getPost())){
|
||||||
|
String post = user.getPost();
|
||||||
|
LambdaQueryWrapper<SysPosition> queryWrapper = new LambdaQueryWrapper<>();
|
||||||
|
queryWrapper.in(SysPosition::getCode,Arrays.asList(post.split(SymbolConstant.COMMA)));
|
||||||
|
queryWrapper.select(SysPosition::getName);
|
||||||
|
List<SysPosition> sysPositionList = sysPositionService.list(queryWrapper);
|
||||||
|
StringBuilder nameBuilder = new StringBuilder();
|
||||||
|
String verticalBar = " | ";
|
||||||
|
for (SysPosition sysPosition:sysPositionList){
|
||||||
|
nameBuilder.append(sysPosition.getName()).append(verticalBar);
|
||||||
|
}
|
||||||
|
String names = nameBuilder.toString();
|
||||||
|
if(oConvertUtils.isNotEmpty(names)){
|
||||||
|
names = names.substring(0,names.lastIndexOf(verticalBar));
|
||||||
|
user.setPostText(names);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return Result.ok(user);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 用户编辑(vue3用户设置专用)【低代码应用专用接口】
|
||||||
|
* @param sysUser
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
@PostMapping("/login/setting/userEdit")
|
||||||
|
//@RequiresPermissions("system:user:setting:edit")
|
||||||
|
public Result<String> userEdit(@RequestBody SysUser sysUser, HttpServletRequest request) {
|
||||||
|
String username = JwtUtil.getUserNameByToken(request);
|
||||||
|
SysUser user = sysUserService.getById(sysUser.getId());
|
||||||
|
if(user==null) {
|
||||||
|
return Result.error("未找到该用户数据");
|
||||||
|
}
|
||||||
|
if(!username.equals(user.getUsername())){
|
||||||
|
return Result.error("只能修改自己的数据");
|
||||||
|
}
|
||||||
|
sysUserService.updateById(sysUser);
|
||||||
|
return Result.ok("更新个人信息成功");
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 批量修改 【low-app】
|
||||||
|
* @param jsonObject
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
@PutMapping("/batchEditUsers")
|
||||||
|
public Result<SysUser> batchEditUsers(@RequestBody JSONObject jsonObject) {
|
||||||
|
Result<SysUser> result = new Result<SysUser>();
|
||||||
|
try {
|
||||||
|
sysUserService.batchEditUsers(jsonObject);
|
||||||
|
result.setSuccess(true);
|
||||||
|
result.setMessage("操作成功！");
|
||||||
|
} catch (Exception e) {
|
||||||
|
log.error(e.getMessage(), e);
|
||||||
|
result.error500("操作失败");
|
||||||
|
}
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 根据关键词搜索部门和用户【low-app】
|
||||||
|
* @param keyword
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
@GetMapping("/searchByKeyword")
|
||||||
|
public Result<DepartAndUserInfo> searchByKeyword(@RequestParam(name="keyword",required=false) String keyword) {
|
||||||
|
DepartAndUserInfo info = sysUserService.searchByKeyword(keyword);
|
||||||
|
return Result.ok(info);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 编辑部门前获取部门相关信息 【low-app】
|
||||||
|
* @param id
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
@GetMapping("/getUpdateDepartInfo")
|
||||||
|
public Result<UpdateDepartInfo> getUpdateDepartInfo(@RequestParam(name="id",required=false) String id) {
|
||||||
|
UpdateDepartInfo info = sysUserService.getUpdateDepartInfo(id);
|
||||||
|
return Result.ok(info);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 编辑部门 【low-app】
|
||||||
|
* @param updateDepartInfo
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
@PutMapping("/doUpdateDepartInfo")
|
||||||
|
public Result<?> doUpdateDepartInfo(@RequestBody UpdateDepartInfo updateDepartInfo) {
|
||||||
|
sysUserService.doUpdateDepartInfo(updateDepartInfo);
|
||||||
|
return Result.ok();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 设置负责人 取消负责人
|
||||||
|
* @param json
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
@PutMapping("/changeDepartChargePerson")
|
||||||
|
public Result<?> changeDepartChargePerson(@RequestBody JSONObject json) {
|
||||||
|
sysUserService.changeDepartChargePerson(json);
|
||||||
|
return Result.ok();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 修改租户下的用户【低代码应用专用接口】
|
||||||
|
* @param sysUser
|
||||||
|
* @param req
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
@RequestMapping(value = "/editTenantUser", method = {RequestMethod.PUT,RequestMethod.POST})
|
||||||
|
public Result<String> editTenantUser(@RequestBody SysUser sysUser,HttpServletRequest req){
|
||||||
|
Result<String> result = new Result<>();
|
||||||
|
String tenantId = TokenUtils.getTenantIdByRequest(req);
|
||||||
|
if(oConvertUtils.isEmpty(tenantId)){
|
||||||
|
return result.error500("无权修改他人信息！");
|
||||||
|
}
|
||||||
|
LambdaQueryWrapper<SysUserTenant> query = new LambdaQueryWrapper<>();
|
||||||
|
query.eq(SysUserTenant::getTenantId,Integer.valueOf(tenantId));
|
||||||
|
query.eq(SysUserTenant::getUserId,sysUser.getId());
|
||||||
|
SysUserTenant one = userTenantService.getOne(query);
|
||||||
|
if(null == one){
|
||||||
|
return result.error500("非当前租户下的用户，不允许修改！");
|
||||||
|
}
|
||||||
|
String departs = req.getParameter("selecteddeparts");
|
||||||
|
String roles = req.getParameter("selectedroles");
|
||||||
|
sysUserService.editTenantUser(sysUser,tenantId,departs,roles);
|
||||||
|
return Result.ok("修改成功");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,5 +1,6 @@
|
|||||||
package org.jeecg.modules.system.controller;
|
package org.jeecg.modules.system.controller;
|
||||||
|
|
||||||
|
import cn.hutool.core.util.RandomUtil;
|
||||||
import com.alibaba.fastjson.JSONObject;
|
import com.alibaba.fastjson.JSONObject;
|
||||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||||
import com.xkcoding.justauth.AuthRequestFactory;
|
import com.xkcoding.justauth.AuthRequestFactory;
|
||||||
@ -12,16 +13,14 @@ import me.zhyd.oauth.utils.AuthStateUtils;
|
|||||||
import org.jeecg.common.api.vo.Result;
|
import org.jeecg.common.api.vo.Result;
|
||||||
import org.jeecg.common.constant.CommonConstant;
|
import org.jeecg.common.constant.CommonConstant;
|
||||||
import org.jeecg.common.system.util.JwtUtil;
|
import org.jeecg.common.system.util.JwtUtil;
|
||||||
import org.jeecg.common.util.PasswordUtil;
|
import org.jeecg.common.util.*;
|
||||||
import org.jeecg.common.util.RedisUtil;
|
|
||||||
import org.jeecg.common.util.RestUtil;
|
|
||||||
import org.jeecg.common.util.oConvertUtils;
|
|
||||||
import org.jeecg.config.thirdapp.ThirdAppConfig;
|
import org.jeecg.config.thirdapp.ThirdAppConfig;
|
||||||
import org.jeecg.config.thirdapp.ThirdAppTypeItemVo;
|
import org.jeecg.config.thirdapp.ThirdAppTypeItemVo;
|
||||||
import org.jeecg.modules.base.service.BaseCommonService;
|
import org.jeecg.modules.base.service.BaseCommonService;
|
||||||
import org.jeecg.modules.system.entity.SysThirdAccount;
|
import org.jeecg.modules.system.entity.SysThirdAccount;
|
||||||
import org.jeecg.modules.system.entity.SysUser;
|
import org.jeecg.modules.system.entity.SysUser;
|
||||||
import org.jeecg.modules.system.model.ThirdLoginModel;
|
import org.jeecg.modules.system.model.ThirdLoginModel;
|
||||||
|
import org.jeecg.modules.system.service.ISysDictService;
|
||||||
import org.jeecg.modules.system.service.ISysThirdAccountService;
|
import org.jeecg.modules.system.service.ISysThirdAccountService;
|
||||||
import org.jeecg.modules.system.service.ISysUserService;
|
import org.jeecg.modules.system.service.ISysUserService;
|
||||||
import org.jeecg.modules.system.service.impl.ThirdAppDingtalkServiceImpl;
|
import org.jeecg.modules.system.service.impl.ThirdAppDingtalkServiceImpl;
|
||||||
@ -31,10 +30,12 @@ import org.springframework.stereotype.Controller;
|
|||||||
import org.springframework.ui.ModelMap;
|
import org.springframework.ui.ModelMap;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|
||||||
|
import javax.servlet.http.HttpServletRequest;
|
||||||
import javax.servlet.http.HttpServletResponse;
|
import javax.servlet.http.HttpServletResponse;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.io.UnsupportedEncodingException;
|
import java.io.UnsupportedEncodingException;
|
||||||
import java.net.URLEncoder;
|
import java.net.URLEncoder;
|
||||||
|
import java.util.Date;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -49,7 +50,8 @@ public class ThirdLoginController {
|
|||||||
private ISysUserService sysUserService;
|
private ISysUserService sysUserService;
|
||||||
@Autowired
|
@Autowired
|
||||||
private ISysThirdAccountService sysThirdAccountService;
|
private ISysThirdAccountService sysThirdAccountService;
|
||||||
|
@Autowired
|
||||||
|
private ISysDictService sysDictService;
|
||||||
@Autowired
|
@Autowired
|
||||||
private BaseCommonService baseCommonService;
|
private BaseCommonService baseCommonService;
|
||||||
@Autowired
|
@Autowired
|
||||||
@ -91,8 +93,8 @@ public class ThirdLoginController {
|
|||||||
//判断有没有这个人
|
//判断有没有这个人
|
||||||
//update-begin-author:wangshuai date:20201118 for:修改成查询第三方账户表
|
//update-begin-author:wangshuai date:20201118 for:修改成查询第三方账户表
|
||||||
LambdaQueryWrapper<SysThirdAccount> query = new LambdaQueryWrapper<SysThirdAccount>();
|
LambdaQueryWrapper<SysThirdAccount> query = new LambdaQueryWrapper<SysThirdAccount>();
|
||||||
query.eq(SysThirdAccount::getThirdUserUuid, uuid);
|
|
||||||
query.eq(SysThirdAccount::getThirdType, source);
|
query.eq(SysThirdAccount::getThirdType, source);
|
||||||
|
query.and(q -> q.eq(SysThirdAccount::getThirdUserUuid, uuid).or().eq(SysThirdAccount::getThirdUserId, uuid));
|
||||||
List<SysThirdAccount> thridList = sysThirdAccountService.list(query);
|
List<SysThirdAccount> thridList = sysThirdAccountService.list(query);
|
||||||
SysThirdAccount user = null;
|
SysThirdAccount user = null;
|
||||||
if(thridList==null || thridList.size()==0) {
|
if(thridList==null || thridList.size()==0) {
|
||||||
@ -235,8 +237,12 @@ public class ThirdLoginController {
|
|||||||
}
|
}
|
||||||
//update-end-author:wangshuai date:20201118 for:如果真实姓名和头像不存在就取第三方登录的
|
//update-end-author:wangshuai date:20201118 for:如果真实姓名和头像不存在就取第三方登录的
|
||||||
JSONObject obj = new JSONObject();
|
JSONObject obj = new JSONObject();
|
||||||
|
//TODO 第三方登确定登录租户和部门逻辑
|
||||||
|
|
||||||
//用户登录信息
|
//用户登录信息
|
||||||
obj.put("userInfo", sysUser);
|
obj.put("userInfo", sysUser);
|
||||||
|
//获取字典缓存【解决 #jeecg-boot/issues/3998】
|
||||||
|
obj.put("sysAllDictItems", sysDictService.queryAllDictItems());
|
||||||
//token 信息
|
//token 信息
|
||||||
obj.put("token", token);
|
obj.put("token", token);
|
||||||
result.setResult(obj);
|
result.setResult(obj);
|
||||||
@ -293,7 +299,7 @@ public class ThirdLoginController {
|
|||||||
*/
|
*/
|
||||||
@ResponseBody
|
@ResponseBody
|
||||||
@GetMapping("/oauth2/{source}/login")
|
@GetMapping("/oauth2/{source}/login")
|
||||||
public String oauth2LoginCallback(@PathVariable("source") String source, @RequestParam("state") String state, HttpServletResponse response) throws Exception {
|
public String oauth2LoginCallback(@PathVariable("source") String source, @RequestParam("state") String state, HttpServletRequest request, HttpServletResponse response) throws Exception {
|
||||||
String url;
|
String url;
|
||||||
if (ThirdAppConfig.WECHAT_ENTERPRISE.equalsIgnoreCase(source)) {
|
if (ThirdAppConfig.WECHAT_ENTERPRISE.equalsIgnoreCase(source)) {
|
||||||
ThirdAppTypeItemVo config = thirdAppConfig.getWechatEnterprise();
|
ThirdAppTypeItemVo config = thirdAppConfig.getWechatEnterprise();
|
||||||
@ -303,7 +309,7 @@ public class ThirdLoginController {
|
|||||||
// 企业的CorpID
|
// 企业的CorpID
|
||||||
builder.append("?appid=").append(config.getClientId());
|
builder.append("?appid=").append(config.getClientId());
|
||||||
// 授权后重定向的回调链接地址，请使用urlencode对链接进行处理
|
// 授权后重定向的回调链接地址，请使用urlencode对链接进行处理
|
||||||
String redirectUri = RestUtil.getBaseUrl() + "/sys/thirdLogin/oauth2/wechat_enterprise/callback";
|
String redirectUri = CommonUtils.getBaseUrl(request) + "/sys/thirdLogin/oauth2/wechat_enterprise/callback";
|
||||||
builder.append("&redirect_uri=").append(URLEncoder.encode(redirectUri, "UTF-8"));
|
builder.append("&redirect_uri=").append(URLEncoder.encode(redirectUri, "UTF-8"));
|
||||||
// 返回类型，此时固定为：code
|
// 返回类型，此时固定为：code
|
||||||
builder.append("&response_type=code");
|
builder.append("&response_type=code");
|
||||||
@ -322,7 +328,7 @@ public class ThirdLoginController {
|
|||||||
builder.append("https://login.dingtalk.com/oauth2/auth");
|
builder.append("https://login.dingtalk.com/oauth2/auth");
|
||||||
// 授权通过/拒绝后回调地址。
|
// 授权通过/拒绝后回调地址。
|
||||||
// 注意 需要与注册应用时登记的域名保持一致。
|
// 注意 需要与注册应用时登记的域名保持一致。
|
||||||
String redirectUri = RestUtil.getBaseUrl() + "/sys/thirdLogin/oauth2/dingtalk/callback";
|
String redirectUri = CommonUtils.getBaseUrl(request) + "/sys/thirdLogin/oauth2/dingtalk/callback";
|
||||||
builder.append("?redirect_uri=").append(URLEncoder.encode(redirectUri, "UTF-8"));
|
builder.append("?redirect_uri=").append(URLEncoder.encode(redirectUri, "UTF-8"));
|
||||||
// 固定值为code。
|
// 固定值为code。
|
||||||
// 授权通过后返回authCode。
|
// 授权通过后返回authCode。
|
||||||
|
|||||||
@ -162,4 +162,7 @@ public class SysAnnouncement implements Serializable {
|
|||||||
* 发送记录ID
|
* 发送记录ID
|
||||||
*/
|
*/
|
||||||
private transient String sendId;
|
private transient String sendId;
|
||||||
|
|
||||||
|
/**租户ID*/
|
||||||
|
private java.lang.Integer tenantId;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -50,6 +50,9 @@ public class SysCategory implements Serializable,Comparable<SysCategory>{
|
|||||||
@Excel(name = "是否有子节点(1:有)", width = 15)
|
@Excel(name = "是否有子节点(1:有)", width = 15)
|
||||||
private java.lang.String hasChild;
|
private java.lang.String hasChild;
|
||||||
|
|
||||||
|
/**租户ID*/
|
||||||
|
private java.lang.Integer tenantId;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int compareTo(SysCategory o) {
|
public int compareTo(SysCategory o) {
|
||||||
//比较条件我们定的是按照code的长度升序
|
//比较条件我们定的是按照code的长度升序
|
||||||
|
|||||||
@ -117,4 +117,8 @@ public class SysDataSource {
|
|||||||
@Excel(name = "所属部门", width = 15)
|
@Excel(name = "所属部门", width = 15)
|
||||||
@ApiModelProperty(value = "所属部门")
|
@ApiModelProperty(value = "所属部门")
|
||||||
private java.lang.String sysOrgCode;
|
private java.lang.String sysOrgCode;
|
||||||
|
|
||||||
|
/**租户ID*/
|
||||||
|
@ApiModelProperty(value = "租户ID")
|
||||||
|
private java.lang.Integer tenantId;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -86,6 +86,11 @@ public class SysDepart implements Serializable {
|
|||||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
|
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||||
private Date updateTime;
|
private Date updateTime;
|
||||||
|
/**租户ID*/
|
||||||
|
private java.lang.Integer tenantId;
|
||||||
|
|
||||||
|
/**是否有叶子节点: 1是0否*/
|
||||||
|
private Integer izLeaf;
|
||||||
|
|
||||||
//update-begin---author:wangshuai ---date:20200308 for：[JTC-119]在部门管理菜单下设置部门负责人，新增字段负责人ids和旧的负责人ids
|
//update-begin---author:wangshuai ---date:20200308 for：[JTC-119]在部门管理菜单下设置部门负责人，新增字段负责人ids和旧的负责人ids
|
||||||
/**部门负责人的ids*/
|
/**部门负责人的ids*/
|
||||||
@ -130,6 +135,7 @@ public class SysDepart implements Serializable {
|
|||||||
Objects.equals(createBy, depart.createBy) &&
|
Objects.equals(createBy, depart.createBy) &&
|
||||||
Objects.equals(createTime, depart.createTime) &&
|
Objects.equals(createTime, depart.createTime) &&
|
||||||
Objects.equals(updateBy, depart.updateBy) &&
|
Objects.equals(updateBy, depart.updateBy) &&
|
||||||
|
Objects.equals(tenantId, depart.tenantId) &&
|
||||||
Objects.equals(updateTime, depart.updateTime);
|
Objects.equals(updateTime, depart.updateTime);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -138,10 +144,9 @@ public class SysDepart implements Serializable {
|
|||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public int hashCode() {
|
public int hashCode() {
|
||||||
|
|
||||||
return Objects.hash(super.hashCode(), id, parentId, departName,
|
return Objects.hash(super.hashCode(), id, parentId, departName,
|
||||||
departNameEn, departNameAbbr, departOrder, description,orgCategory,
|
departNameEn, departNameAbbr, departOrder, description,orgCategory,
|
||||||
orgType, orgCode, mobile, fax, address, memo, status,
|
orgType, orgCode, mobile, fax, address, memo, status,
|
||||||
delFlag, createBy, createTime, updateBy, updateTime);
|
delFlag, createBy, createTime, updateBy, updateTime, tenantId);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -81,5 +81,10 @@ public class SysDict implements Serializable {
|
|||||||
*/
|
*/
|
||||||
private Date updateTime;
|
private Date updateTime;
|
||||||
|
|
||||||
|
/**租户ID*/
|
||||||
|
private java.lang.Integer tenantId;
|
||||||
|
|
||||||
|
/** 关联的低代码应用ID */
|
||||||
|
private java.lang.String lowAppId;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user