Conflicts:
	pom.xml
v1.4.1
薛佳琪 6 years ago
commit 058fb2bb0d

@ -1,339 +1,201 @@
GNU GENERAL PUBLIC LICENSE Apache License
Version 2, June 1991 Version 2.0, January 2004
http://www.apache.org/licenses/
Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed. 1. Definitions.
Preamble "License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.
The licenses for most software are designed to take away your
freedom to share and change it. By contrast, the GNU General Public "Licensor" shall mean the copyright owner or entity authorized by
License is intended to guarantee your freedom to share and change free the copyright owner that is granting the License.
software--to make sure the software is free for all its users. This
General Public License applies to most of the Free Software "Legal Entity" shall mean the union of the acting entity and all
Foundation's software and to any other program whose authors commit to other entities that control, are controlled by, or are under common
using it. (Some other Free Software Foundation software is covered by control with that entity. For the purposes of this definition,
the GNU Lesser General Public License instead.) You can apply it to "control" means (i) the power, direct or indirect, to cause the
your programs, too. direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
When we speak of free software, we are referring to freedom, not outstanding shares, or (iii) beneficial ownership of such entity.
price. Our General Public Licenses are designed to make sure that you
have the freedom to distribute copies of free software (and charge for "You" (or "Your") shall mean an individual or Legal Entity
this service if you wish), that you receive source code or can get it exercising permissions granted by this License.
if you want it, that you can change the software or use pieces of it
in new free programs; and that you know you can do these things. "Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
To protect your rights, we need to make restrictions that forbid source, and configuration files.
anyone to deny you these rights or to ask you to surrender the rights.
These restrictions translate to certain responsibilities for you if you "Object" form shall mean any form resulting from mechanical
distribute copies of the software, or if you modify it. transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
For example, if you distribute copies of such a program, whether and conversions to other media types.
gratis or for a fee, you must give the recipients all the rights that
you have. You must make sure that they, too, receive or can get the "Work" shall mean the work of authorship, whether in Source or
source code. And you must show them these terms so they know their Object form, made available under the License, as indicated by a
rights. copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).
We protect your rights with two steps: (1) copyright the software, and
(2) offer you this license which gives you legal permission to copy, "Derivative Works" shall mean any work, whether in Source or Object
distribute and/or modify the software. form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
Also, for each author's protection and ours, we want to make certain represent, as a whole, an original work of authorship. For the purposes
that everyone understands that there is no warranty for this free of this License, Derivative Works shall not include works that remain
software. If the software is modified by someone else and passed on, we separable from, or merely link (or bind by name) to the interfaces of,
want its recipients to know that what they have is not the original, so the Work and Derivative Works thereof.
that any problems introduced by others will not reflect on the original
authors' reputations. "Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
Finally, any free program is threatened constantly by software to that Work or Derivative Works thereof, that is intentionally
patents. We wish to avoid the danger that redistributors of a free submitted to Licensor for inclusion in the Work by the copyright owner
program will individually obtain patent licenses, in effect making the or by an individual or Legal Entity authorized to submit on behalf of
program proprietary. To prevent this, we have made it clear that any the copyright owner. For the purposes of this definition, "submitted"
patent must be licensed for everyone's free use or not licensed at all. means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
The precise terms and conditions for copying, distribution and communication on electronic mailing lists, source code control systems,
modification follow. and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
GNU GENERAL PUBLIC LICENSE excluding communication that is conspicuously marked or otherwise
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION designated in writing by the copyright owner as "Not a Contribution."
0. This License applies to any program or other work which contains "Contributor" shall mean Licensor and any individual or Legal Entity
a notice placed by the copyright holder saying it may be distributed on behalf of whom a Contribution has been received by Licensor and
under the terms of this General Public License. The "Program", below, subsequently incorporated within the Work.
refers to any such program or work, and a "work based on the Program"
means either the Program or any derivative work under copyright law: 2. Grant of Copyright License. Subject to the terms and conditions of
that is to say, a work containing the Program or a portion of it, this License, each Contributor hereby grants to You a perpetual,
either verbatim or with modifications and/or translated into another worldwide, non-exclusive, no-charge, royalty-free, irrevocable
language. (Hereinafter, translation is included without limitation in copyright license to reproduce, prepare Derivative Works of,
the term "modification".) Each licensee is addressed as "you". publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.
Activities other than copying, distribution and modification are not
covered by this License; they are outside its scope. The act of 3. Grant of Patent License. Subject to the terms and conditions of
running the Program is not restricted, and the output from the Program this License, each Contributor hereby grants to You a perpetual,
is covered only if its contents constitute a work based on the worldwide, non-exclusive, no-charge, royalty-free, irrevocable
Program (independent of having been made by running the Program). (except as stated in this section) patent license to make, have made,
Whether that is true depends on what the Program does. use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
1. You may copy and distribute verbatim copies of the Program's by such Contributor that are necessarily infringed by their
source code as you receive it, in any medium, provided that you Contribution(s) alone or by combination of their Contribution(s)
conspicuously and appropriately publish on each copy an appropriate with the Work to which such Contribution(s) was submitted. If You
copyright notice and disclaimer of warranty; keep intact all the institute patent litigation against any entity (including a
notices that refer to this License and to the absence of any warranty; cross-claim or counterclaim in a lawsuit) alleging that the Work
and give any other recipients of the Program a copy of this License or a Contribution incorporated within the Work constitutes direct
along with the Program. or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
You may charge a fee for the physical act of transferring a copy, and as of the date such litigation is filed.
you may at your option offer warranty protection in exchange for a fee.
4. Redistribution. You may reproduce and distribute copies of the
2. You may modify your copy or copies of the Program or any portion Work or Derivative Works thereof in any medium, with or without
of it, thus forming a work based on the Program, and copy and modifications, and in Source or Object form, provided that You
distribute such modifications or work under the terms of Section 1 meet the following conditions:
above, provided that you also meet all of these conditions:
(a) You must give any other recipients of the Work or
a) You must cause the modified files to carry prominent notices Derivative Works a copy of this License; and
stating that you changed the files and the date of any change.
(b) You must cause any modified files to carry prominent notices
b) You must cause any work that you distribute or publish, that in stating that You changed the files; and
whole or in part contains or is derived from the Program or any
part thereof, to be licensed as a whole at no charge to all third (c) You must retain, in the Source form of any Derivative Works
parties under the terms of this License. that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
c) If the modified program normally reads commands interactively excluding those notices that do not pertain to any part of
when run, you must cause it, when started running for such the Derivative Works; and
interactive use in the most ordinary way, to print or display an
announcement including an appropriate copyright notice and a (d) If the Work includes a "NOTICE" text file as part of its
notice that there is no warranty (or else, saying that you provide distribution, then any Derivative Works that You distribute must
a warranty) and that users may redistribute the program under include a readable copy of the attribution notices contained
these conditions, and telling the user how to view a copy of this within such NOTICE file, excluding those notices that do not
License. (Exception: if the Program itself is interactive but pertain to any part of the Derivative Works, in at least one
does not normally print such an announcement, your work based on of the following places: within a NOTICE text file distributed
the Program is not required to print an announcement.) as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
These requirements apply to the modified work as a whole. If within a display generated by the Derivative Works, if and
identifiable sections of that work are not derived from the Program, wherever such third-party notices normally appear. The contents
and can be reasonably considered independent and separate works in of the NOTICE file are for informational purposes only and
themselves, then this License, and its terms, do not apply to those do not modify the License. You may add Your own attribution
sections when you distribute them as separate works. But when you notices within Derivative Works that You distribute, alongside
distribute the same sections as part of a whole which is a work based or as an addendum to the NOTICE text from the Work, provided
on the Program, the distribution of the whole must be on the terms of that such additional attribution notices cannot be construed
this License, whose permissions for other licensees extend to the as modifying the License.
entire whole, and thus to each and every part regardless of who wrote it.
You may add Your own copyright statement to Your modifications and
Thus, it is not the intent of this section to claim rights or contest may provide additional or different license terms and conditions
your rights to work written entirely by you; rather, the intent is to for use, reproduction, or distribution of Your modifications, or
exercise the right to control the distribution of derivative or for any such Derivative Works as a whole, provided Your use,
collective works based on the Program. reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.
In addition, mere aggregation of another work not based on the Program
with the Program (or with a work based on the Program) on a volume of 5. Submission of Contributions. Unless You explicitly state otherwise,
a storage or distribution medium does not bring the other work under any Contribution intentionally submitted for inclusion in the Work
the scope of this License. by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
3. You may copy and distribute the Program (or a work based on it, Notwithstanding the above, nothing herein shall supersede or modify
under Section 2) in object code or executable form under the terms of the terms of any separate license agreement you may have executed
Sections 1 and 2 above provided that you also do one of the following: with Licensor regarding such Contributions.
a) Accompany it with the complete corresponding machine-readable 6. Trademarks. This License does not grant permission to use the trade
source code, which must be distributed under the terms of Sections names, trademarks, service marks, or product names of the Licensor,
1 and 2 above on a medium customarily used for software interchange; or, except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.
b) Accompany it with a written offer, valid for at least three
years, to give any third party, for a charge no more than your 7. Disclaimer of Warranty. Unless required by applicable law or
cost of physically performing source distribution, a complete agreed to in writing, Licensor provides the Work (and each
machine-readable copy of the corresponding source code, to be Contributor provides its Contributions) on an "AS IS" BASIS,
distributed under the terms of Sections 1 and 2 above on a medium WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
customarily used for software interchange; or, implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
c) Accompany it with the information you received as to the offer PARTICULAR PURPOSE. You are solely responsible for determining the
to distribute corresponding source code. (This alternative is appropriateness of using or redistributing the Work and assume any
allowed only for noncommercial distribution and only if you risks associated with Your exercise of permissions under this License.
received the program in object code or executable form with such
an offer, in accord with Subsection b above.) 8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
The source code for a work means the preferred form of the work for unless required by applicable law (such as deliberate and grossly
making modifications to it. For an executable work, complete source negligent acts) or agreed to in writing, shall any Contributor be
code means all the source code for all modules it contains, plus any liable to You for damages, including any direct, indirect, special,
associated interface definition files, plus the scripts used to incidental, or consequential damages of any character arising as a
control compilation and installation of the executable. However, as a result of this License or out of the use or inability to use the
special exception, the source code distributed need not include Work (including but not limited to damages for loss of goodwill,
anything that is normally distributed (in either source or binary work stoppage, computer failure or malfunction, or any and all
form) with the major components (compiler, kernel, and so on) of the other commercial damages or losses), even if such Contributor
operating system on which the executable runs, unless that component has been advised of the possibility of such damages.
itself accompanies the executable.
9. Accepting Warranty or Additional Liability. While redistributing
If distribution of executable or object code is made by offering the Work or Derivative Works thereof, You may choose to offer,
access to copy from a designated place, then offering equivalent and charge a fee for, acceptance of support, warranty, indemnity,
access to copy the source code from the same place counts as or other liability obligations and/or rights consistent with this
distribution of the source code, even though third parties are not License. However, in accepting such obligations, You may act only
compelled to copy the source along with the object code. on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
4. You may not copy, modify, sublicense, or distribute the Program defend, and hold each Contributor harmless for any liability
except as expressly provided under this License. Any attempt incurred by, or claims asserted against, such Contributor by reason
otherwise to copy, modify, sublicense or distribute the Program is of your accepting any such warranty or additional liability.
void, and will automatically terminate your rights under this License.
However, parties who have received copies, or rights, from you under END OF TERMS AND CONDITIONS
this License will not have their licenses terminated so long as such
parties remain in full compliance. APPENDIX: How to apply the Apache License to your work.
5. You are not required to accept this License, since you have not To apply the Apache License to your work, attach the following
signed it. However, nothing else grants you permission to modify or boilerplate notice, with the fields enclosed by brackets "[]"
distribute the Program or its derivative works. These actions are replaced with your own identifying information. (Don't include
prohibited by law if you do not accept this License. Therefore, by the brackets!) The text should be enclosed in the appropriate
modifying or distributing the Program (or any work based on the comment syntax for the file format. We also recommend that a
Program), you indicate your acceptance of this License to do so, and file or class name and description of purpose be included on the
all its terms and conditions for copying, distributing or modifying same "printed page" as the copyright notice for easier
the Program or works based on it. identification within third-party archives.
6. Each time you redistribute the Program (or any work based on the Copyright [yyyy] [name of copyright owner]
Program), the recipient automatically receives a license from the
original licensor to copy, distribute or modify the Program subject to Licensed under the Apache License, Version 2.0 (the "License");
these terms and conditions. You may not impose any further you may not use this file except in compliance with the License.
restrictions on the recipients' exercise of the rights granted herein. You may obtain a copy of the License at
You are not responsible for enforcing compliance by third parties to
this License. http://www.apache.org/licenses/LICENSE-2.0
7. If, as a consequence of a court judgment or allegation of patent Unless required by applicable law or agreed to in writing, software
infringement or for any other reason (not limited to patent issues), distributed under the License is distributed on an "AS IS" BASIS,
conditions are imposed on you (whether by court order, agreement or WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
otherwise) that contradict the conditions of this License, they do not See the License for the specific language governing permissions and
excuse you from the conditions of this License. If you cannot limitations under the License.
distribute so as to satisfy simultaneously your obligations under this
License and any other pertinent obligations, then as a consequence you
may not distribute the Program at all. For example, if a patent
license would not permit royalty-free redistribution of the Program by
all those who receive copies directly or indirectly through you, then
the only way you could satisfy both it and this License would be to
refrain entirely from distribution of the Program.
If any portion of this section is held invalid or unenforceable under
any particular circumstance, the balance of the section is intended to
apply and the section as a whole is intended to apply in other
circumstances.
It is not the purpose of this section to induce you to infringe any
patents or other property right claims or to contest validity of any
such claims; this section has the sole purpose of protecting the
integrity of the free software distribution system, which is
implemented by public license practices. Many people have made
generous contributions to the wide range of software distributed
through that system in reliance on consistent application of that
system; it is up to the author/donor to decide if he or she is willing
to distribute software through any other system and a licensee cannot
impose that choice.
This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License.
8. If the distribution and/or use of the Program is restricted in
certain countries either by patents or by copyrighted interfaces, the
original copyright holder who places the Program under this License
may add an explicit geographical distribution limitation excluding
those countries, so that distribution is permitted only in or among
countries not thus excluded. In such case, this License incorporates
the limitation as if written in the body of this License.
9. The Free Software Foundation may publish revised and/or new versions
of the General Public License from time to time. Such new versions will
be similar in spirit to the present version, but may differ in detail to
address new problems or concerns.
Each version is given a distinguishing version number. If the Program
specifies a version number of this License which applies to it and "any
later version", you have the option of following the terms and conditions
either of that version or of any later version published by the Free
Software Foundation. If the Program does not specify a version number of
this License, you may choose any version ever published by the Free Software
Foundation.
10. If you wish to incorporate parts of the Program into other free
programs whose distribution conditions are different, write to the author
to ask for permission. For software which is copyrighted by the Free
Software Foundation, write to the Free Software Foundation; we sometimes
make exceptions for this. Our decision will be guided by the two goals
of preserving the free status of all derivatives of our free software and
of promoting the sharing and reuse of software generally.
NO WARRANTY
11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
REPAIR OR CORRECTION.
12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
POSSIBILITY OF SUCH DAMAGES.
END OF TERMS AND CONDITIONS
How to Apply These Terms to Your New Programs
If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
free software which everyone can redistribute and change under these terms.
To do so, attach the following notices to the program. It is safest
to attach them to the start of each source file to most effectively
convey the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.
<one line to give the program's name and a brief idea of what it does.>
Copyright (C) <year> <name of author>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License along
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
Also add information on how to contact you by electronic and paper mail.
If the program is interactive, make it output a short notice like this
when it starts in an interactive mode:
Gnomovision version 69, Copyright (C) year name of author
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
The hypothetical commands `show w' and `show c' should show the appropriate
parts of the General Public License. Of course, the commands you use may
be called something other than `show w' and `show c'; they could even be
mouse-clicks or menu items--whatever suits your program.
You should also get your employer (if you work as a programmer) or your
school, if any, to sign a "copyright disclaimer" for the program, if
necessary. Here is a sample; alter the names:
Yoyodyne, Inc., hereby disclaims all copyright interest in the program
`Gnomovision' (which makes passes at compilers) written by James Hacker.
<signature of Ty Coon>, 1 April 1989
Ty Coon, President of Vice
This General Public License does not permit incorporating your program into
proprietary programs. If your program is a subroutine library, you may
consider it more useful to permit linking proprietary applications with the
library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License.

@ -37,7 +37,7 @@
| shiro-redis版本 | ^3.3.1 | | jwt版本 | ^3.10.3 | | shiro-redis版本 | ^3.3.1 | | jwt版本 | ^3.10.3 |
| ehcache版本 | ^3.9.0 | | easyexcel版本 | ^2.2.6 | | ehcache版本 | ^3.9.0 | | easyexcel版本 | ^2.2.6 |
| kaptcha版本 | ^0.0.9 | | guava版本 | ^29.0-jre | | kaptcha版本 | ^0.0.9 | | guava版本 | ^29.0-jre |
| enjoy版本 | ^4.9.03 | | hutool版本 | ^5.4.2 | | enjoy版本 | ^4.9.03 | | hutool版本 | ^5.5.5 |
## 在线演示 ## 在线演示

File diff suppressed because it is too large Load Diff

@ -0,0 +1,150 @@
### 改动不大
修改 sys_user 表索引为
### 1. 先删除 原有老索引
alter table sys_user drop index unique_username ;
### 2. 增加新索引
alter table sys_user add index `sys_user_index` (`username`,`real_name`);
### 3. 增加表
-- ----------------------------
-- Table structure for test_car
-- ----------------------------
DROP TABLE IF EXISTS `test_car`;
CREATE TABLE `test_car` (
`id` bigint(19) NOT NULL COMMENT '主键',
`car_name` varchar(20) COLLATE utf8mb4_general_ci NOT NULL COMMENT '汽车名称',
`car_type` varchar(20) COLLATE utf8mb4_general_ci NOT NULL COMMENT '汽车类型',
`car_brand` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '汽车品牌',
`produce_data` date NOT NULL COMMENT '生产日期',
`iz_usable` char(1) COLLATE utf8mb4_general_ci NOT NULL COMMENT '是否启用',
`tenant_id` bigint(19) DEFAULT NULL COMMENT '多租户ID',
`deleted` char(1) COLLATE utf8mb4_general_ci NOT NULL COMMENT '删除标记:0未删除,1删除',
`version` int(10) NOT NULL COMMENT '版本号(乐观锁)',
`create_by` bigint(19) NOT NULL COMMENT '创建用户',
`create_time` datetime NOT NULL COMMENT '创建日期',
`update_by` bigint(19) NOT NULL COMMENT '修改用户',
`update_time` datetime NOT NULL COMMENT '修改日期',
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='测试汽车';
-- ----------------------------
-- Records of test_car
-- ----------------------------
BEGIN;
INSERT INTO `test_car` VALUES (1340634224709677058, '奔驰GXX', 'Gxx', '奔驰', '2020-12-20', '1', 1, '0', 0, 1313694379541635074, '2020-12-20 20:24:42', 1313694379541635074, '2020-12-20 20:24:42');
INSERT INTO `test_car` VALUES (1340634337075081217, '北汽绅宝', '电动', '绅宝', '2020-12-13', '1', 1, '0', 0, 1313694379541635074, '2020-12-20 20:25:08', 1313694379541635074, '2020-12-20 20:25:08');
INSERT INTO `test_car` VALUES (1340634432696823810, '宝马7系', '烧油', '宝马', '2020-12-20', '0', 1, '0', 0, 1313694379541635074, '2020-12-20 20:25:31', 1313694379541635074, '2020-12-20 20:25:31');
INSERT INTO `test_car` VALUES (1340634485616357378, '测试', '123', '123', '2020-12-07', '0', 1, '1', 0, 1313694379541635074, '2020-12-20 20:25:44', 1313694379541635074, '2020-12-20 20:25:44');
INSERT INTO `test_car` VALUES (1340635288087375874, '宝马7系', '烧油', '宝马', '2020-12-20', '0', 1, '0', 0, 1313694379541635074, '2020-12-20 20:28:55', 1313694379541635074, '2020-12-20 20:28:55');
INSERT INTO `test_car` VALUES (1340635288095764482, '北汽绅宝', '电动', '绅宝', '2020-12-13', '1', 1, '0', 0, 1313694379541635074, '2020-12-20 20:28:55', 1313694379541635074, '2020-12-20 20:28:55');
INSERT INTO `test_car` VALUES (1340635288099958786, '奔驰GXX', 'Gxx', '奔驰', '2020-12-20', '1', 1, '0', 0, 1313694379541635074, '2020-12-20 20:28:55', 1313694379541635074, '2020-12-20 20:28:55');
COMMIT;
-- ----------------------------
-- Table structure for test_car_copy1
-- ----------------------------
DROP TABLE IF EXISTS `test_car_copy1`;
CREATE TABLE `test_car_copy1` (
`id` bigint(19) NOT NULL COMMENT '主键',
`car_name` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '汽车名称',
`car_type` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '汽车类型',
`car_brand` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '汽车品牌',
`produce_data` date NOT NULL COMMENT '生产日期',
`iz_usable` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '是否启用',
`tenant_id` bigint(19) DEFAULT NULL COMMENT '多租户ID',
`deleted` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '删除标记:0未删除,1删除',
`version` int(10) NOT NULL COMMENT '版本号(乐观锁)',
`create_by` bigint(19) NOT NULL COMMENT '创建用户',
`create_time` datetime NOT NULL COMMENT '创建日期',
`update_by` bigint(19) NOT NULL COMMENT '修改用户',
`update_time` datetime NOT NULL COMMENT '修改日期',
PRIMARY KEY (`id`) USING BTREE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='测试';
-- ----------------------------
-- Table structure for test_car_copy2
-- ----------------------------
DROP TABLE IF EXISTS `test_car_copy2`;
CREATE TABLE `test_car_copy2` (
`id` bigint(19) NOT NULL COMMENT '主键',
`car_name` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '汽车名称',
`car_type` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '汽车类型',
`car_brand` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '汽车品牌',
`produce_data` date NOT NULL COMMENT '生产日期',
`iz_usable` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '是否启用',
`tenant_id` bigint(19) DEFAULT NULL COMMENT '多租户ID',
`deleted` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '删除标记:0未删除,1删除',
`version` int(10) NOT NULL COMMENT '版本号(乐观锁)',
`create_by` bigint(19) NOT NULL COMMENT '创建用户',
`create_time` datetime NOT NULL COMMENT '创建日期',
`update_by` bigint(19) NOT NULL COMMENT '修改用户',
`update_time` datetime NOT NULL COMMENT '修改日期',
PRIMARY KEY (`id`) USING BTREE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='测试';
-- ----------------------------
-- Table structure for test_car_copy3
-- ----------------------------
DROP TABLE IF EXISTS `test_car_copy3`;
CREATE TABLE `test_car_copy3` (
`id` bigint(19) NOT NULL COMMENT '主键',
`car_name` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '汽车名称',
`car_type` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '汽车类型',
`car_brand` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '汽车品牌',
`produce_data` date NOT NULL COMMENT '生产日期',
`iz_usable` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '是否启用',
`tenant_id` bigint(19) DEFAULT NULL COMMENT '多租户ID',
`deleted` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '删除标记:0未删除,1删除',
`version` int(10) NOT NULL COMMENT '版本号(乐观锁)',
`create_by` bigint(19) NOT NULL COMMENT '创建用户',
`create_time` datetime NOT NULL COMMENT '创建日期',
`update_by` bigint(19) NOT NULL COMMENT '修改用户',
`update_time` datetime NOT NULL COMMENT '修改日期',
PRIMARY KEY (`id`) USING BTREE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='测试';
-- ----------------------------
-- Table structure for test_car_copy4
-- ----------------------------
DROP TABLE IF EXISTS `test_car_copy4`;
CREATE TABLE `test_car_copy4` (
`id` bigint(19) NOT NULL COMMENT '主键',
`car_name` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '汽车名称',
`car_type` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '汽车类型',
`car_brand` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '汽车品牌',
`produce_data` date NOT NULL COMMENT '生产日期',
`iz_usable` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '是否启用',
`tenant_id` bigint(19) DEFAULT NULL COMMENT '多租户ID',
`deleted` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '删除标记:0未删除,1删除',
`version` int(10) NOT NULL COMMENT '版本号(乐观锁)',
`create_by` bigint(19) NOT NULL COMMENT '创建用户',
`create_time` datetime NOT NULL COMMENT '创建日期',
`update_by` bigint(19) NOT NULL COMMENT '修改用户',
`update_time` datetime NOT NULL COMMENT '修改日期',
PRIMARY KEY (`id`) USING BTREE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='测试';
-- ----------------------------
-- Table structure for test_car_copy5
-- ----------------------------
DROP TABLE IF EXISTS `test_car_copy5`;
CREATE TABLE `test_car_copy5` (
`id` bigint(19) NOT NULL COMMENT '主键',
`car_name` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '汽车名称',
`car_type` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '汽车类型',
`car_brand` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '汽车品牌',
`produce_data` date NOT NULL COMMENT '生产日期',
`iz_usable` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '是否启用',
`tenant_id` bigint(19) DEFAULT NULL COMMENT '多租户ID',
`deleted` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '删除标记:0未删除,1删除',
`version` int(10) NOT NULL COMMENT '版本号(乐观锁)',
`create_by` bigint(19) NOT NULL COMMENT '创建用户',
`create_time` datetime NOT NULL COMMENT '创建日期',
`update_by` bigint(19) NOT NULL COMMENT '修改用户',
`update_time` datetime NOT NULL COMMENT '修改日期',
PRIMARY KEY (`id`) USING BTREE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='测试';

@ -110,10 +110,12 @@ public abstract class ApiWrapper implements Serializable {
/** 是否是内部Api调用 */ /** 是否是内部Api调用 */
@JsonIgnore @JsonIgnore
@TableField(exist = false) @TableField(exist = false)
@ExcelIgnore
private Boolean izApi = false; private Boolean izApi = false;
/** 是否 手动操控 (如果为true 则可以手动指定创建人和修改人 如果为空则默认) */ /** 是否 手动操控 (如果为true 则可以手动指定创建人和修改人 如果为空则默认) */
@JsonIgnore @JsonIgnore
@TableField(exist = false) @TableField(exist = false)
@ExcelIgnore
private Boolean izManual = false; private Boolean izManual = false;
} }

@ -70,9 +70,9 @@ public enum ValidationMsg implements BaseMsg {
; ;
private static final String PREFIX = "参数验证错误: "; private static final String PREFIX = "参数验证错误: ";
private int code; private final int code;
private final String message;
private String fieldName; private String fieldName;
private String message;
ValidationMsg(int code, String message){ ValidationMsg(int code, String message){
this.code = code; this.code = code;

@ -15,6 +15,7 @@
*/ */
package org.opsli.api.utils; package org.opsli.api.utils;
import cn.hutool.core.convert.Convert;
import cn.hutool.core.lang.Validator; import cn.hutool.core.lang.Validator;
import cn.hutool.core.util.ReflectUtil; import cn.hutool.core.util.ReflectUtil;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
@ -29,6 +30,7 @@ import org.opsli.common.enums.ValiArgsType;
import org.opsli.common.exception.ServiceException; import org.opsli.common.exception.ServiceException;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.nio.charset.StandardCharsets;
/** /**
* @BelongsProject: opsli-boot * @BelongsProject: opsli-boot
@ -40,12 +42,6 @@ import java.lang.reflect.Field;
@Slf4j @Slf4j
public final class ValidationUtil { public final class ValidationUtil {
/** 编码格式 */
private static final String CHARSET_NAME = "utf-8";
/** NULL */
private static final String NULL = "null";
/** /**
* 验证对象 * 验证对象
* @param obj * @param obj
@ -56,11 +52,10 @@ public final class ValidationUtil {
} }
Field[] fields = ReflectUtil.getFields(obj.getClass()); Field[] fields = ReflectUtil.getFields(obj.getClass());
for (int i = 0; i < fields.length; i++) { for (Field field : fields) {
Field field = fields[i];
// 获得 统一验证 注解 // 获得 统一验证 注解
ValidationArgs validationArgs = field.getAnnotation(ValidationArgs.class); ValidationArgs validationArgs = field.getAnnotation(ValidationArgs.class);
if(validationArgs != null){ if (validationArgs != null) {
ValiArgsType[] types = validationArgs.value(); ValiArgsType[] types = validationArgs.value();
Object fieldValue = ReflectUtil.getFieldValue(obj, field); Object fieldValue = ReflectUtil.getFieldValue(obj, field);
ValidationUtil.check(field, types, fieldValue); ValidationUtil.check(field, types, fieldValue);
@ -68,7 +63,7 @@ public final class ValidationUtil {
// 获得 最大长度 注解 // 获得 最大长度 注解
ValidationArgsLenMax validationArgsMax = field.getAnnotation(ValidationArgsLenMax.class); ValidationArgsLenMax validationArgsMax = field.getAnnotation(ValidationArgsLenMax.class);
if(validationArgsMax != null){ if (validationArgsMax != null) {
int maxLength = validationArgsMax.value(); int maxLength = validationArgsMax.value();
Object fieldValue = ReflectUtil.getFieldValue(obj, field); Object fieldValue = ReflectUtil.getFieldValue(obj, field);
ValidationUtil.checkMax(field, maxLength, fieldValue); ValidationUtil.checkMax(field, maxLength, fieldValue);
@ -76,7 +71,7 @@ public final class ValidationUtil {
// 获得 最小长度 注解 // 获得 最小长度 注解
ValidationArgsLenMin validationArgsMin = field.getAnnotation(ValidationArgsLenMin.class); ValidationArgsLenMin validationArgsMin = field.getAnnotation(ValidationArgsLenMin.class);
if(validationArgsMin != null){ if (validationArgsMin != null) {
int minLength = validationArgsMin.value(); int minLength = validationArgsMin.value();
Object fieldValue = ReflectUtil.getFieldValue(obj, field); Object fieldValue = ReflectUtil.getFieldValue(obj, field);
ValidationUtil.checkMin(field, minLength, fieldValue); ValidationUtil.checkMin(field, minLength, fieldValue);
@ -98,7 +93,7 @@ public final class ValidationUtil {
fieldName = annotation.value(); fieldName = annotation.value();
} }
String value = String.valueOf(fieldValue); String value = Convert.toStr(fieldValue);
// 循环验证 // 循环验证
for (ValiArgsType type : types) { for (ValiArgsType type : types) {
@ -115,7 +110,7 @@ public final class ValidationUtil {
break; break;
// 字母,数字和下划线 // 字母,数字和下划线
case IS_GENERAL: case IS_GENERAL:
if(StringUtils.isEmpty(value) || NULL.equals(value)) { if(StringUtils.isEmpty(value)) {
break; break;
} }
boolean general = Validator.isGeneral(value); boolean general = Validator.isGeneral(value);
@ -127,7 +122,7 @@ public final class ValidationUtil {
break; break;
// 数字 // 数字
case IS_NUMBER: case IS_NUMBER:
if(StringUtils.isEmpty(value) || NULL.equals(value)){ if(StringUtils.isEmpty(value)){
break; break;
} }
boolean number = Validator.isNumber(value); boolean number = Validator.isNumber(value);
@ -139,7 +134,7 @@ public final class ValidationUtil {
break; break;
// 纯字母 // 纯字母
case IS_LETTER: case IS_LETTER:
if(StringUtils.isEmpty(value) || NULL.equals(value)){ if(StringUtils.isEmpty(value)){
break; break;
} }
boolean letter = Validator.isLetter(value); boolean letter = Validator.isLetter(value);
@ -151,7 +146,7 @@ public final class ValidationUtil {
break; break;
// 大写 // 大写
case IS_UPPER_CASE: case IS_UPPER_CASE:
if(StringUtils.isEmpty(value) || NULL.equals(value)){ if(StringUtils.isEmpty(value)){
break; break;
} }
boolean upperCase = Validator.isUpperCase(value); boolean upperCase = Validator.isUpperCase(value);
@ -163,7 +158,7 @@ public final class ValidationUtil {
break; break;
// 小写 // 小写
case IS_LOWER_CASE: case IS_LOWER_CASE:
if(StringUtils.isEmpty(value) || NULL.equals(value)){ if(StringUtils.isEmpty(value)){
break; break;
} }
boolean lowerCase = Validator.isLowerCase(value); boolean lowerCase = Validator.isLowerCase(value);
@ -175,7 +170,7 @@ public final class ValidationUtil {
break; break;
// IPV4 // IPV4
case IS_IPV4: case IS_IPV4:
if(StringUtils.isEmpty(value) || NULL.equals(value)){ if(StringUtils.isEmpty(value)){
break; break;
} }
boolean ipv4 = Validator.isIpv4(value); boolean ipv4 = Validator.isIpv4(value);
@ -187,7 +182,7 @@ public final class ValidationUtil {
break; break;
// 金额 // 金额
case IS_MONEY: case IS_MONEY:
if(StringUtils.isEmpty(value) || NULL.equals(value)){ if(StringUtils.isEmpty(value)){
break; break;
} }
boolean money = Validator.isMoney(value); boolean money = Validator.isMoney(value);
@ -199,7 +194,7 @@ public final class ValidationUtil {
break; break;
// 邮箱 // 邮箱
case IS_EMAIL: case IS_EMAIL:
if(StringUtils.isEmpty(value) || NULL.equals(value)){ if(StringUtils.isEmpty(value)){
break; break;
} }
boolean email = Validator.isEmail(value); boolean email = Validator.isEmail(value);
@ -211,7 +206,7 @@ public final class ValidationUtil {
break; break;
// 手机号 // 手机号
case IS_MOBILE: case IS_MOBILE:
if(StringUtils.isEmpty(value) || NULL.equals(value)){ if(StringUtils.isEmpty(value)){
break; break;
} }
boolean mobile = Validator.isMobile(value); boolean mobile = Validator.isMobile(value);
@ -223,7 +218,7 @@ public final class ValidationUtil {
break; break;
// 18位身份证 // 18位身份证
case IS_CITIZENID: case IS_CITIZENID:
if(StringUtils.isEmpty(value) || NULL.equals(value)){ if(StringUtils.isEmpty(value)){
break; break;
} }
boolean citizenId = Validator.isCitizenId(value); boolean citizenId = Validator.isCitizenId(value);
@ -235,7 +230,7 @@ public final class ValidationUtil {
break; break;
// 邮编 // 邮编
case IS_ZIPCODE: case IS_ZIPCODE:
if(StringUtils.isEmpty(value) || NULL.equals(value)){ if(StringUtils.isEmpty(value)){
break; break;
} }
boolean zipCode = Validator.isZipCode(value); boolean zipCode = Validator.isZipCode(value);
@ -247,7 +242,7 @@ public final class ValidationUtil {
break; break;
// URL // URL
case IS_URL: case IS_URL:
if(StringUtils.isEmpty(value) || NULL.equals(value)){ if(StringUtils.isEmpty(value)){
break; break;
} }
boolean url = Validator.isUrl(value); boolean url = Validator.isUrl(value);
@ -259,7 +254,7 @@ public final class ValidationUtil {
break; break;
// 汉字 // 汉字
case IS_CHINESE: case IS_CHINESE:
if(StringUtils.isEmpty(value) || NULL.equals(value)){ if(StringUtils.isEmpty(value)){
break; break;
} }
boolean chinese = Validator.isChinese(value); boolean chinese = Validator.isChinese(value);
@ -271,7 +266,7 @@ public final class ValidationUtil {
break; break;
// 汉字,字母,数字和下划线 // 汉字,字母,数字和下划线
case IS_GENERAL_WITH_CHINESE: case IS_GENERAL_WITH_CHINESE:
if(StringUtils.isEmpty(value) || NULL.equals(value)){ if(StringUtils.isEmpty(value)){
break; break;
} }
boolean generalWithChinese = Validator.isGeneralWithChinese(value); boolean generalWithChinese = Validator.isGeneralWithChinese(value);
@ -283,7 +278,7 @@ public final class ValidationUtil {
break; break;
// MAC地址 // MAC地址
case IS_MAC: case IS_MAC:
if(StringUtils.isEmpty(value) || NULL.equals(value)){ if(StringUtils.isEmpty(value)){
break; break;
} }
boolean mac = Validator.isMac(value); boolean mac = Validator.isMac(value);
@ -295,7 +290,7 @@ public final class ValidationUtil {
break; break;
// 中国车牌 // 中国车牌
case IS_PLATE_NUMBER: case IS_PLATE_NUMBER:
if(StringUtils.isEmpty(value) || NULL.equals(value)){ if(StringUtils.isEmpty(value)){
break; break;
} }
boolean plateNumber = Validator.isPlateNumber(value); boolean plateNumber = Validator.isPlateNumber(value);
@ -333,10 +328,10 @@ public final class ValidationUtil {
// 循环验证 // 循环验证
try { try {
String value = String.valueOf(fieldValue); String value = Convert.toStr(fieldValue);
if(value != null && !NULL.equals(value)){ if(StringUtils.isNotEmpty(value)){
// 转换为 数据库真实 长度 // 转换为 数据库真实 长度
int strLength = value.getBytes(CHARSET_NAME).length; int strLength = value.getBytes(StandardCharsets.UTF_8).length;
if(strLength > maxLength){ if(strLength > maxLength){
ValidationMsg msg = ValidationMsg.EXCEPTION_IS_MAX; ValidationMsg msg = ValidationMsg.EXCEPTION_IS_MAX;
msg.setFieldName(fieldName); msg.setFieldName(fieldName);
@ -366,10 +361,10 @@ public final class ValidationUtil {
// 循环验证 // 循环验证
try { try {
String value = String.valueOf(fieldValue); String value = Convert.toStr(fieldValue);
if(value != null && !NULL.equals(value)){ if(StringUtils.isNotEmpty(value)){
// 转换为 数据库真实 长度 // 转换为 数据库真实 长度
int strLength = value.getBytes(CHARSET_NAME).length; int strLength = value.getBytes(StandardCharsets.UTF_8).length;
if(strLength < minLength){ if(strLength < minLength){
ValidationMsg msg = ValidationMsg.EXCEPTION_IS_MIN; ValidationMsg msg = ValidationMsg.EXCEPTION_IS_MIN;
msg.setFieldName(fieldName); msg.setFieldName(fieldName);
@ -388,12 +383,14 @@ public final class ValidationUtil {
dictModel.setTypeCode("asdsa"); dictModel.setTypeCode("asdsa");
dictModel.setTypeName("阿哈哈哈哈"); dictModel.setTypeName("阿哈哈哈哈");
dictModel.setRemark("测试11232131231231223123"); dictModel.setRemark("测试11232131231231223123");
dictModel.setIzLock('1'); dictModel.setIzLock("1");
ValidationUtil.verify(dictModel); ValidationUtil.verify(dictModel);
} }
// ================ // ================
private ValidationUtil(){} private ValidationUtil(){}
} }

@ -0,0 +1,136 @@
/**
* Copyright 2020 OPSLI 快速开发平台 https://www.opsli.com
* <p>
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
* <p>
* http://www.apache.org/licenses/LICENSE-2.0
* <p>
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations under
* the License.
*/
package org.opsli.api.web.gentest.carinfo;
import org.opsli.api.base.result.ResultVo;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.opsli.api.wrapper.gentest.carinfo.TestCarModel;
/**
* @BelongsProject: opsli-boot
* @BelongsPackage: org.opsli.api.web.gentest.carinfo
* @Author: Parker
* @CreateTime: 2020-12-20 20:12:57
* @Description: 汽车信息
*
* 对外 API 直接 暴露 @GetMapping 或者 @PostMapping
* 对内也推荐 单机版 不需要设置 Mapping 但是调用方法得从Controller写起
*
* 这样写法虽然比较绕,但是当单体项目想要改造微服务架构时 时非常容易的
*
*
*/
public interface TestCarRestApi {
/** 标题 */
String TITLE = "汽车信息";
/**
* 汽车信息 查一条
* @param model 模型
* @return ResultVo
*/
@GetMapping("/get")
ResultVo<TestCarModel> get(TestCarModel model);
/**
* 汽车信息 查询分页
* @param pageNo 当前页
* @param pageSize 每页条数
* @param request request
* @return ResultVo
*/
@GetMapping("/findPage")
ResultVo<?> findPage(
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest request
);
/**
* 汽车信息 新增
* @param model 模型
* @return ResultVo
*/
@PostMapping("/insert")
ResultVo<?> insert(@RequestBody TestCarModel model);
/**
* 汽车信息 修改
* @param model 模型
* @return ResultVo
*/
@PostMapping("/update")
ResultVo<?> update(@RequestBody TestCarModel model);
/**
* 汽车信息 删除
* @param id ID
* @return ResultVo
*/
@PostMapping("/del")
ResultVo<?> del(String id);
/**
* 汽车信息 批量删除
* @param ids ID 数组
* @return ResultVo
*/
@PostMapping("/delAll")
ResultVo<?> delAll(String ids);
/**
* 汽车信息 Excel 导出
*
* 导出时,Token认证和方法权限认证 全部都由自定义完成
* 因为在 导出不成功时,需要推送错误信息,
* 前端直接走下载流,当失败时无法获得失败信息,即使前后端换一种方式后端推送二进制文件前端再次解析也是最少2倍的耗时
* ,且如果数据量过大,前端进行渲染时直接会把浏览器卡死
* 而直接开启socket接口推送显然是太过浪费资源了,所以目前采用Java最原始的手段
* response 推送 javascript代码 alert 提示报错信息
*
* @param request request
* @param response response
* @return ResultVo
*/
@GetMapping("/exportExcel")
void exportExcel(HttpServletRequest request, HttpServletResponse response);
/**
* 汽车信息 Excel 导入
* @param request 文件流 request
* @return ResultVo
*/
@PostMapping("/importExcel")
ResultVo<?> importExcel(MultipartHttpServletRequest request);
/**
* 汽车信息 Excel 下载导入模版
* @param response response
* @return ResultVo
*/
@GetMapping("/importExcel/template")
void importTemplate(HttpServletResponse response);
}

@ -98,7 +98,7 @@ public interface TestUserRestApi {
* @return ResultVo * @return ResultVo
*/ */
@PostMapping("/delAll") @PostMapping("/delAll")
ResultVo<?> delAll(String[] ids); ResultVo<?> delAll(String ids);
/** /**
* 某系统用户 Excel 导出 * 某系统用户 Excel 导出
@ -107,22 +107,22 @@ public interface TestUserRestApi {
* @return ResultVo * @return ResultVo
*/ */
@GetMapping("/exportExcel") @GetMapping("/exportExcel")
ResultVo<?> exportExcel(HttpServletRequest request, HttpServletResponse response); void exportExcel(HttpServletRequest request, HttpServletResponse response);
/** /**
* 某系统用户 Excel 导入 * 某系统用户 Excel 导入
* @param request 文件流 request * @param request 文件流 request
* @return ResultVo * @return ResultVo
*/ */
@GetMapping("/exportImport") @PostMapping("/importExcel")
ResultVo<?> excelImport(MultipartHttpServletRequest request); ResultVo<?> importExcel(MultipartHttpServletRequest request);
/** /**
* 某系统用户 Excel 下载导入模版 * 某系统用户 Excel 下载导入模版
* @param response response * @param response response
* @return ResultVo * @return ResultVo
*/ */
@GetMapping("/exportImport/template") @GetMapping("/importExcel/template")
ResultVo<?> importTemplate(HttpServletResponse response); void importTemplate(HttpServletResponse response);
} }

@ -91,7 +91,7 @@ public interface SysAreaRestApi {
* @return ResultVo * @return ResultVo
*/ */
@PostMapping("/delAll") @PostMapping("/delAll")
ResultVo<?> delAll(String[] ids); ResultVo<?> delAll(String ids);
/** /**
* 组织机构表 Excel 导出 * 组织机构表 Excel 导出
@ -100,22 +100,22 @@ public interface SysAreaRestApi {
* @return ResultVo * @return ResultVo
*/ */
@GetMapping("/exportExcel") @GetMapping("/exportExcel")
ResultVo<?> exportExcel(HttpServletRequest request, HttpServletResponse response); void exportExcel(HttpServletRequest request, HttpServletResponse response);
/** /**
* 组织机构表 Excel 导入 * 组织机构表 Excel 导入
* @param request 文件流 request * @param request 文件流 request
* @return ResultVo * @return ResultVo
*/ */
@GetMapping("/exportImport") @PostMapping("/importExcel")
ResultVo<?> excelImport(MultipartHttpServletRequest request); ResultVo<?> importExcel(MultipartHttpServletRequest request);
/** /**
* 组织机构表 Excel 下载导入模版 * 组织机构表 Excel 下载导入模版
* @param response response * @param response response
* @return ResultVo * @return ResultVo
*/ */
@GetMapping("/exportImport/template") @GetMapping("/importExcel/template")
ResultVo<?> importTemplate(HttpServletResponse response); void importTemplate(HttpServletResponse response);
} }

@ -98,7 +98,7 @@ public interface DictApi {
* @return ResultVo * @return ResultVo
*/ */
@PostMapping("/delAll") @PostMapping("/delAll")
ResultVo<?> delAll(String[] ids); ResultVo<?> delAll(String ids);
/** /**
* 数据字典 Excel 导出 * 数据字典 Excel 导出
@ -107,23 +107,23 @@ public interface DictApi {
* @return ResultVo * @return ResultVo
*/ */
@GetMapping("/exportExcel") @GetMapping("/exportExcel")
ResultVo<?> exportExcel(HttpServletRequest request, HttpServletResponse response); void exportExcel(HttpServletRequest request, HttpServletResponse response);
/** /**
* 数据字典 Excel 导入 * 数据字典 Excel 导入
* @param request 文件流 request * @param request 文件流 request
* @return ResultVo * @return ResultVo
*/ */
@GetMapping("/exportImport") @PostMapping("/importExcel")
ResultVo<?> excelImport(MultipartHttpServletRequest request); ResultVo<?> importExcel(MultipartHttpServletRequest request);
/** /**
* 数据字典 Excel 下载导入模版 * 数据字典 Excel 下载导入模版
* @param response response * @param response response
* @return ResultVo * @return ResultVo
*/ */
@GetMapping("/exportImport/template") @GetMapping("/importExcel/template")
ResultVo<?> importTemplate(HttpServletResponse response); void importTemplate(HttpServletResponse response);
/** /**

@ -98,7 +98,7 @@ public interface DictDetailApi {
* @return ResultVo * @return ResultVo
*/ */
@PostMapping("/delAll") @PostMapping("/delAll")
ResultVo<?> delAll(String[] ids); ResultVo<?> delAll(String ids);
/** /**
* 数据字典 Excel 导出 * 数据字典 Excel 导出
@ -107,23 +107,23 @@ public interface DictDetailApi {
* @return ResultVo * @return ResultVo
*/ */
@GetMapping("/exportExcel") @GetMapping("/exportExcel")
ResultVo<?> exportExcel(HttpServletRequest request, HttpServletResponse response); void exportExcel(HttpServletRequest request, HttpServletResponse response);
/** /**
* 数据字典 Excel 导入 * 数据字典 Excel 导入
* @param request 文件流 request * @param request 文件流 request
* @return ResultVo * @return ResultVo
*/ */
@GetMapping("/exportImport") @PostMapping("/importExcel")
ResultVo<?> excelImport(MultipartHttpServletRequest request); ResultVo<?> importExcel(MultipartHttpServletRequest request);
/** /**
* 数据字典 Excel 下载导入模版 * 数据字典 Excel 下载导入模版
* @param response response * @param response response
* @return ResultVo * @return ResultVo
*/ */
@GetMapping("/exportImport/template") @GetMapping("/importExcel/template")
ResultVo<?> importTemplate(HttpServletResponse response); void importTemplate(HttpServletResponse response);
// ================================ // ================================

@ -130,7 +130,7 @@ public interface MenuApi {
* @return ResultVo * @return ResultVo
*/ */
@PostMapping("/delAll") @PostMapping("/delAll")
ResultVo<?> delAll(String[] ids); ResultVo<?> delAll(String ids);
/** /**
* 菜单 Excel 导出 * 菜单 Excel 导出
@ -139,23 +139,23 @@ public interface MenuApi {
* @return ResultVo * @return ResultVo
*/ */
@GetMapping("/exportExcel") @GetMapping("/exportExcel")
ResultVo<?> exportExcel(HttpServletRequest request, HttpServletResponse response); void exportExcel(HttpServletRequest request, HttpServletResponse response);
/** /**
* 菜单 Excel 导入 * 菜单 Excel 导入
* @param request 文件流 request * @param request 文件流 request
* @return ResultVo * @return ResultVo
*/ */
@GetMapping("/exportImport") @PostMapping("/importExcel")
ResultVo<?> excelImport(MultipartHttpServletRequest request); ResultVo<?> importExcel(MultipartHttpServletRequest request);
/** /**
* 菜单 Excel 下载导入模版 * 菜单 Excel 下载导入模版
* @param response response * @param response response
* @return ResultVo * @return ResultVo
*/ */
@GetMapping("/exportImport/template") @GetMapping("/importExcel/template")
ResultVo<?> importTemplate(HttpServletResponse response); void importTemplate(HttpServletResponse response);

@ -104,7 +104,7 @@ public interface SysOrgRestApi {
* @return ResultVo * @return ResultVo
*/ */
@PostMapping("/delAll") @PostMapping("/delAll")
ResultVo<?> delAll(String[] ids); ResultVo<?> delAll(String ids);
/** /**
* 组织机构表 Excel 导出 * 组织机构表 Excel 导出
@ -113,22 +113,22 @@ public interface SysOrgRestApi {
* @return ResultVo * @return ResultVo
*/ */
@GetMapping("/exportExcel") @GetMapping("/exportExcel")
ResultVo<?> exportExcel(HttpServletRequest request, HttpServletResponse response); void exportExcel(HttpServletRequest request, HttpServletResponse response);
/** /**
* 组织机构表 Excel 导入 * 组织机构表 Excel 导入
* @param request 文件流 request * @param request 文件流 request
* @return ResultVo * @return ResultVo
*/ */
@GetMapping("/exportImport") @PostMapping("/importExcel")
ResultVo<?> excelImport(MultipartHttpServletRequest request); ResultVo<?> importExcel(MultipartHttpServletRequest request);
/** /**
* 组织机构表 Excel 下载导入模版 * 组织机构表 Excel 下载导入模版
* @param response response * @param response response
* @return ResultVo * @return ResultVo
*/ */
@GetMapping("/exportImport/template") @GetMapping("/importExcel/template")
ResultVo<?> importTemplate(HttpServletResponse response); void importTemplate(HttpServletResponse response);
} }

@ -98,7 +98,7 @@ public interface RoleApi {
* @return ResultVo * @return ResultVo
*/ */
@PostMapping("/delAll") @PostMapping("/delAll")
ResultVo<?> delAll(String[] ids); ResultVo<?> delAll(String ids);
/** /**
* 角色 Excel 导出 * 角色 Excel 导出
@ -107,22 +107,22 @@ public interface RoleApi {
* @return ResultVo * @return ResultVo
*/ */
@GetMapping("/exportExcel") @GetMapping("/exportExcel")
ResultVo<?> exportExcel(HttpServletRequest request, HttpServletResponse response); void exportExcel(HttpServletRequest request, HttpServletResponse response);
/** /**
* 角色 Excel 导入 * 角色 Excel 导入
* @param request 文件流 request * @param request 文件流 request
* @return ResultVo * @return ResultVo
*/ */
@GetMapping("/exportImport") @PostMapping("/importExcel")
ResultVo<?> excelImport(MultipartHttpServletRequest request); ResultVo<?> importExcel(MultipartHttpServletRequest request);
/** /**
* 角色 Excel 下载导入模版 * 角色 Excel 下载导入模版
* @param response response * @param response response
* @return ResultVo * @return ResultVo
*/ */
@GetMapping("/exportImport/template") @GetMapping("/importExcel/template")
ResultVo<?> importTemplate(HttpServletResponse response); void importTemplate(HttpServletResponse response);
} }

@ -98,7 +98,7 @@ public interface TenantApi {
* @return ResultVo * @return ResultVo
*/ */
@PostMapping("/delAll") @PostMapping("/delAll")
ResultVo<?> delAll(String[] ids); ResultVo<?> delAll(String ids);
/** /**
* 租户 Excel 导出 * 租户 Excel 导出
@ -107,22 +107,31 @@ public interface TenantApi {
* @return ResultVo * @return ResultVo
*/ */
@GetMapping("/exportExcel") @GetMapping("/exportExcel")
ResultVo<?> exportExcel(HttpServletRequest request, HttpServletResponse response); void exportExcel(HttpServletRequest request, HttpServletResponse response);
/** /**
* 租户 Excel 导入 * 租户 Excel 导入
* @param request 文件流 request * @param request 文件流 request
* @return ResultVo * @return ResultVo
*/ */
@GetMapping("/exportImport") @PostMapping("/importExcel")
ResultVo<?> excelImport(MultipartHttpServletRequest request); ResultVo<?> importExcel(MultipartHttpServletRequest request);
/** /**
* 租户 Excel 下载导入模版 * 租户 Excel 下载导入模版
* @param response response * @param response response
* @return ResultVo * @return ResultVo
*/ */
@GetMapping("/exportImport/template") @GetMapping("/importExcel/template")
ResultVo<?> importTemplate(HttpServletResponse response); void importTemplate(HttpServletResponse response);
// =========================
/**
* 获得已启用租户 查一条
* @param tenantId 模型
* @return ResultVo
*/
@GetMapping("/getTenantByUsable")
ResultVo<TenantModel> getTenantByUsable(String tenantId);
} }

@ -102,6 +102,13 @@ public interface UserApi {
@PostMapping("/updatePasswordById") @PostMapping("/updatePasswordById")
ResultVo<?> updatePasswordById(@RequestBody UserPassword userPassword); ResultVo<?> updatePasswordById(@RequestBody UserPassword userPassword);
/**
* 重置密码 ID
* @return ResultVo
*/
@PostMapping("/resetPasswordById")
ResultVo<?> resetPasswordById(String userId);
/** /**
* 上传头像 * 上传头像
@ -165,7 +172,7 @@ public interface UserApi {
* @return ResultVo * @return ResultVo
*/ */
@PostMapping("/delAll") @PostMapping("/delAll")
ResultVo<?> delAll(String[] ids); ResultVo<?> delAll(String ids);
/** /**
* 用户信息 Excel 导出 * 用户信息 Excel 导出
@ -174,15 +181,15 @@ public interface UserApi {
* @return ResultVo * @return ResultVo
*/ */
@GetMapping("/exportExcel") @GetMapping("/exportExcel")
ResultVo<?> exportExcel(HttpServletRequest request, HttpServletResponse response); void exportExcel(HttpServletRequest request, HttpServletResponse response);
/** /**
* 用户信息 Excel 导入 * 用户信息 Excel 导入
* @param request 文件流 request * @param request 文件流 request
* @return ResultVo * @return ResultVo
*/ */
@GetMapping("/exportImport") @PostMapping("/importExcel")
ResultVo<?> excelImport(MultipartHttpServletRequest request); ResultVo<?> importExcel(MultipartHttpServletRequest request);
/** /**
@ -190,8 +197,8 @@ public interface UserApi {
* @param response response * @param response response
* @return ResultVo * @return ResultVo
*/ */
@GetMapping("/exportImport/template") @GetMapping("/importExcel/template")
ResultVo<?> importTemplate(HttpServletResponse response); void importTemplate(HttpServletResponse response);
/** /**

@ -4,6 +4,7 @@ import io.swagger.annotations.ApiOperation;
import org.opsli.api.base.result.ResultVo; import org.opsli.api.base.result.ResultVo;
import org.opsli.api.wrapper.test.TestModel; import org.opsli.api.wrapper.test.TestModel;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.multipart.MultipartHttpServletRequest;
@ -128,20 +129,20 @@ public interface TestApi {
* @return * @return
*/ */
@GetMapping("/exportExcel") @GetMapping("/exportExcel")
ResultVo<?> exportExcel(HttpServletRequest request, HttpServletResponse response); void exportExcel(HttpServletRequest request, HttpServletResponse response);
/** /**
* Excel 导入 * Excel 导入
* @return * @return
*/ */
@GetMapping("/exportImport") @PostMapping("/importExcel")
ResultVo<?> excelImport(MultipartHttpServletRequest request); ResultVo<?> importExcel(MultipartHttpServletRequest request);
/** /**
* Excel 下载导入模版 * Excel 下载导入模版
* @return * @return
*/ */
@GetMapping("/exportImport/template") @GetMapping("/importExcel/template")
ResultVo<?> importTemplate(HttpServletResponse response); void importTemplate(HttpServletResponse response);
} }

@ -98,7 +98,7 @@ public interface TestRestApi {
* @return ResultVo * @return ResultVo
*/ */
@PostMapping("/delAll") @PostMapping("/delAll")
ResultVo<?> delAll(String[] ids); ResultVo<?> delAll(String ids);
/** /**
* 测试 Excel 导出 * 测试 Excel 导出
@ -107,22 +107,22 @@ public interface TestRestApi {
* @return ResultVo * @return ResultVo
*/ */
@GetMapping("/exportExcel") @GetMapping("/exportExcel")
ResultVo<?> exportExcel(HttpServletRequest request, HttpServletResponse response); void exportExcel(HttpServletRequest request, HttpServletResponse response);
/** /**
* 测试 Excel 导入 * 测试 Excel 导入
* @param request 文件流 request * @param request 文件流 request
* @return ResultVo * @return ResultVo
*/ */
@GetMapping("/exportImport") @PostMapping("/importExcel")
ResultVo<?> excelImport(MultipartHttpServletRequest request); ResultVo<?> importExcel(MultipartHttpServletRequest request);
/** /**
* 测试 Excel 下载导入模版 * 测试 Excel 下载导入模版
* @param response response * @param response response
* @return ResultVo * @return ResultVo
*/ */
@GetMapping("/exportImport/template") @GetMapping("/importExcel/template")
ResultVo<?> importTemplate(HttpServletResponse response); void importTemplate(HttpServletResponse response);
} }

@ -0,0 +1,88 @@
/**
* Copyright 2020 OPSLI 快速开发平台 https://www.opsli.com
* <p>
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
* <p>
* http://www.apache.org/licenses/LICENSE-2.0
* <p>
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations under
* the License.
*/
package org.opsli.api.wrapper.gentest.carinfo;
import java.util.Date;
import com.alibaba.excel.annotation.ExcelProperty;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.opsli.api.base.warpper.ApiWrapper;
import org.opsli.common.annotation.validation.ValidationArgs;
import org.opsli.common.annotation.validation.ValidationArgsLenMax;
import org.opsli.common.enums.ValiArgsType;
import org.opsli.plugins.excel.annotation.ExcelInfo;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
/**
* @BelongsProject: opsli-boot
* @BelongsPackage: org.opsli.api.wrapper.gentest.carinfo
* @Author: Parker
* @CreateTime: 2020-12-20 20:12:57
* @Description: 汽车信息
*/
@Data
@EqualsAndHashCode(callSuper = false)
public class TestCarModel extends ApiWrapper {
/** 汽车名称 */
@ApiModelProperty(value = "汽车名称")
@ExcelProperty(value = "汽车名称", order = 1)
@ExcelInfo
// 验证器
@ValidationArgs({ValiArgsType.IS_NOT_NULL, ValiArgsType.IS_GENERAL_WITH_CHINESE})
@ValidationArgsLenMax(20)
private String carName;
/** 汽车类型 */
@ApiModelProperty(value = "汽车类型")
@ExcelProperty(value = "汽车类型", order = 2)
@ExcelInfo
// 验证器
@ValidationArgs({ValiArgsType.IS_NOT_NULL, ValiArgsType.IS_GENERAL_WITH_CHINESE})
@ValidationArgsLenMax(20)
private String carType;
/** 汽车品牌 */
@ApiModelProperty(value = "汽车品牌")
@ExcelProperty(value = "汽车品牌", order = 3)
@ExcelInfo
// 验证器
@ValidationArgs({ValiArgsType.IS_GENERAL_WITH_CHINESE})
@ValidationArgsLenMax(50)
private String carBrand;
/** 生产日期 */
@ApiModelProperty(value = "生产日期")
@ExcelProperty(value = "生产日期", order = 4)
@ExcelInfo
// 验证器
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date produceData;
/** 是否启用 */
@ApiModelProperty(value = "是否启用")
@ExcelProperty(value = "是否启用", order = 5)
@ExcelInfo( dictType = "no_yes" )
// 验证器
@ValidationArgsLenMax(1)
private String izUsable;
}

@ -84,7 +84,7 @@ public class TestUserModel extends ApiWrapper {
// 验证器 // 验证器
@ValidationArgs({ValiArgsType.IS_NOT_NULL, }) @ValidationArgs({ValiArgsType.IS_NOT_NULL, })
@ValidationArgsLenMax(1) @ValidationArgsLenMax(1)
private Character izUsable; private String izUsable;

@ -77,7 +77,7 @@ public class DictDetailModel extends ApiWrapper {
// 验证器 // 验证器
@ValidationArgs({ValiArgsType.IS_NOT_NULL}) @ValidationArgs({ValiArgsType.IS_NOT_NULL})
@ValidationArgsLenMax(1) @ValidationArgsLenMax(1)
private Character izLock; private String izLock;
/** 排序 */ /** 排序 */
@ApiModelProperty(value = "排序") @ApiModelProperty(value = "排序")

@ -63,7 +63,7 @@ public class DictModel extends ApiWrapper {
// 验证器 // 验证器
@ValidationArgs(ValiArgsType.IS_NOT_NULL) @ValidationArgs(ValiArgsType.IS_NOT_NULL)
@ValidationArgsLenMax(1) @ValidationArgsLenMax(1)
private Character izLock; private String izLock;
/** 备注 */ /** 备注 */
@ApiModelProperty(value = "备注") @ApiModelProperty(value = "备注")

@ -38,6 +38,9 @@ public class DictWrapper {
/** 字典值 */ /** 字典值 */
private String dictValue; private String dictValue;
/** 排序 */
private Integer dictSort;
/** 消息 */ /** 消息 */
private DictDetailModel model; private DictDetailModel model;

@ -60,11 +60,11 @@ public class RoleModel extends ApiWrapper {
/** 是否内置数据 0是 1否*/ /** 是否内置数据 0是 1否*/
@ApiModelProperty(value = "是否内置数据 0是 1否") @ApiModelProperty(value = "是否内置数据 0是 1否")
@ExcelProperty(value = "是否内置数据", order = 3) @ExcelProperty(value = "是否内置数据", order = 3)
@ExcelInfo(dictType = "yes_no") @ExcelInfo(dictType = "no_yes")
// 验证器 // 验证器
@ValidationArgs({ValiArgsType.IS_NOT_NULL}) @ValidationArgs({ValiArgsType.IS_NOT_NULL})
@ValidationArgsLenMax(1) @ValidationArgsLenMax(1)
private Character izLock; private String izLock;
/** 备注 */ /** 备注 */
@ApiModelProperty(value = "备注") @ApiModelProperty(value = "备注")

@ -53,7 +53,7 @@ public class TenantModel extends ApiWrapper {
// 验证器 // 验证器
@ValidationArgs({ValiArgsType.IS_NOT_NULL}) @ValidationArgs({ValiArgsType.IS_NOT_NULL})
@ValidationArgsLenMax(1) @ValidationArgsLenMax(1)
private Character izUsable; private String izUsable;
/** 备注 */ /** 备注 */
@ApiModelProperty(value = "备注") @ApiModelProperty(value = "备注")

@ -66,7 +66,7 @@ public class UserAndOrgModel extends ApiWrapper {
// 验证器 // 验证器
@ValidationArgs({ValiArgsType.IS_NOT_NULL}) @ValidationArgs({ValiArgsType.IS_NOT_NULL})
@ValidationArgsLenMax(1) @ValidationArgsLenMax(1)
private Character locked; private String locked;
/** 真实姓名 */ /** 真实姓名 */
@ApiModelProperty(value = "真实姓名") @ApiModelProperty(value = "真实姓名")

@ -66,7 +66,7 @@ public class UserModel extends ApiWrapper {
// 验证器 // 验证器
@ValidationArgs({ValiArgsType.IS_NOT_NULL}) @ValidationArgs({ValiArgsType.IS_NOT_NULL})
@ValidationArgsLenMax(1) @ValidationArgsLenMax(1)
private Character locked; private String locked;
/** 真实姓名 */ /** 真实姓名 */
@ApiModelProperty(value = "真实姓名") @ApiModelProperty(value = "真实姓名")

@ -0,0 +1,88 @@
/**
* Copyright 2020 OPSLI 快速开发平台 https://www.opsli.com
* <p>
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
* <p>
* http://www.apache.org/licenses/LICENSE-2.0
* <p>
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations under
* the License.
*/
package org.opsli.api.wrapper.testt;
import java.util.Date;
import com.alibaba.excel.annotation.ExcelProperty;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.opsli.api.base.warpper.ApiWrapper;
import org.opsli.common.annotation.validation.ValidationArgs;
import org.opsli.common.annotation.validation.ValidationArgsLenMax;
import org.opsli.common.enums.ValiArgsType;
import org.opsli.plugins.excel.annotation.ExcelInfo;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
/**
* @BelongsProject: opsli-boot
* @BelongsPackage: org.opsli.api.wrapper.testt
* @Author: parker
* @CreateTime: 2020-12-20 18:27:04
* @Description: 测试3
*/
@Data
@EqualsAndHashCode(callSuper = false)
public class Test3Model extends ApiWrapper {
/** 金钱 */
@ApiModelProperty(value = "金钱")
@ExcelProperty(value = "金钱", order = 1)
@ExcelInfo
// 验证器
@ValidationArgs({ValiArgsType.IS_NOT_NULL, ValiArgsType.IS_MONEY})
@ValidationArgsLenMax(10)
private Double money;
/** 年龄 */
@ApiModelProperty(value = "年龄")
@ExcelProperty(value = "年龄", order = 2)
@ExcelInfo
// 验证器
@ValidationArgs({ValiArgsType.IS_NOT_NULL, ValiArgsType.IS_NUMBER})
@ValidationArgsLenMax(3)
private Integer age;
/** 名称 */
@ApiModelProperty(value = "名称")
@ExcelProperty(value = "名称", order = 3)
@ExcelInfo
// 验证器
@ValidationArgs({ValiArgsType.IS_CHINESE})
@ValidationArgsLenMax(50)
private String name;
/** 生日 */
@ApiModelProperty(value = "生日")
@ExcelProperty(value = "生日", order = 4)
@ExcelInfo
// 验证器
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date birth;
/** 是否启用 */
@ApiModelProperty(value = "是否启用")
@ExcelProperty(value = "是否启用", order = 5)
@ExcelInfo( dictType = "no_yes" )
// 验证器
@ValidationArgsLenMax(1)
private String izUsable;
}

@ -0,0 +1,24 @@
package org.opsli.common.annotation;
import org.opsli.common.enums.AlertType;
import org.opsli.common.utils.RateLimiterUtil;
import java.lang.annotation.*;
/**
* Java 限流器
* @author Parker
*/
@Target(ElementType.METHOD)
@Retention(RetentionPolicy.RUNTIME)
@Documented
public @interface Limiter {
/** QPS */
double qps() default RateLimiterUtil.DEFAULT_QPS;
/** 提醒方式 */
AlertType alertType() default AlertType.JSON;
}

@ -0,0 +1,19 @@
package org.opsli.common.annotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
/**
* @author Parker
*
* 自定义权限验证
*/
@Target({ElementType.TYPE, ElementType.METHOD})
@Retention(RetentionPolicy.RUNTIME)
public @interface RequiresPermissionsCus {
String[] value();
}

@ -0,0 +1,29 @@
package org.opsli.common.annotation;
import java.lang.annotation.*;
/**
* 搜索历史注解
*
* 默认按照当前用户 key, 搜索记录排行最高
*
* @author Parker
*/
@Target(ElementType.METHOD)
@Retention(RetentionPolicy.RUNTIME)
@Documented
public @interface SearchHis {
/**
* 搜索 key,即 url 参数key
*
* http://127.0.0.1/opsli-boot?username=123
*
* username 就是 key
*
* 如果使用条件构造器, 比如 username_EQ key需要一致
*
*/
String[] keys();
}

@ -40,6 +40,6 @@ public class TokenThreadLocal {
public static void remove() { public static void remove() {
try { try {
TOKEN_DATA.remove(); TOKEN_DATA.remove();
}catch (Exception e){} }catch (Exception ignored){}
} }
} }

@ -29,9 +29,9 @@ public final class MyBatisConstants {
/** 逻辑删除值 */ /** 逻辑删除值 */
public static final char LOGIC_DELETE_VALUE; public static final String LOGIC_DELETE_VALUE;
/** 逻辑不删除值 */ /** 逻辑不删除值 */
public static final char LOGIC_NOT_DELETE_VALUE; public static final String LOGIC_NOT_DELETE_VALUE;
/** ID */ /** ID */
@ -56,8 +56,8 @@ public final class MyBatisConstants {
static { static {
Props props = new Props("application.yaml"); Props props = new Props("application.yaml");
LOGIC_DELETE_VALUE = props.getChar("mybatis-plus.global-config.db-config.logic-delete-value",'1'); LOGIC_DELETE_VALUE = props.getStr("mybatis-plus.global-config.db-config.logic-delete-value","1");
LOGIC_NOT_DELETE_VALUE = props.getChar("mybatis-plus.global-config.db-config.logic-not-delete-value",'0'); LOGIC_NOT_DELETE_VALUE = props.getStr("mybatis-plus.global-config.db-config.logic-not-delete-value","0");
} }
private MyBatisConstants(){} private MyBatisConstants(){}

@ -25,6 +25,9 @@ public interface OrderConstants {
/** Util 加载顺序 */ /** Util 加载顺序 */
int UTIL_ORDER = 140; int UTIL_ORDER = 140;
/** 限流器 */
int LIMITER_AOP_SORT = 149;
/** token */ /** token */
int TOKEN_AOP_SORT = 150; int TOKEN_AOP_SORT = 150;
@ -34,6 +37,9 @@ public interface OrderConstants {
/** 参数非法验证顺序 */ /** 参数非法验证顺序 */
int PARAM_VALIDATE_AOP_SORT = 185; int PARAM_VALIDATE_AOP_SORT = 185;
/** 搜索历史 */
int SEARCH_HIS_AOP_SORT = 186;
/** SQL 切面执行顺序 */ /** SQL 切面执行顺序 */
int SQL_ORDER = 190; int SQL_ORDER = 190;

@ -1,24 +1,7 @@
/**
* Copyright 2020 OPSLI 快速开发平台 https://www.opsli.com
* <p>
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
* <p>
* http://www.apache.org/licenses/LICENSE-2.0
* <p>
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations under
* the License.
*/
package org.opsli.common.constants; package org.opsli.common.constants;
/** /**
* @BelongsProject: opsli-boot * @Author: 周鹏程
* @BelongsPackage: org.opsli.common.constants
* @Author: Parker
* @CreateTime: 2020-09-16 17:42 * @CreateTime: 2020-09-16 17:42
* @Description: 签名 * @Description: 签名
*/ */
@ -33,4 +16,10 @@ public interface SignConstants {
/** 时间戳 */ /** 时间戳 */
String TIMESTAMP = "timestamp"; String TIMESTAMP = "timestamp";
/** 其他信息 */
String OTHER = "other";
/** 签名 类型 */
String TYPE = "type";
} }

@ -0,0 +1,16 @@
package org.opsli.common.constants;
/**
* @Author: 周鹏程
* @CreateTime: 2020-09-16 17:42
* @Description: Token类型
*/
public interface TokenTypeConstants {
/** 系统内部TOKEN */
String TYPE_SYSTEM = "system";
/** 外部TOKEN */
String TYPE_EXTERNAL = "external";
}

@ -0,0 +1,17 @@
package org.opsli.common.enums;
/**
* @Author: Parker
* @CreateTime: 2020-09-17 23:40
* @Description: 字典
*/
public enum AlertType {
/** alert 弹出 */
ALERT(),
/** JSON 回推*/
JSON,
;
}

@ -14,7 +14,7 @@ public enum DictType {
; ;
private String code; private final String code;
DictType(String code){ DictType(String code){
this.code = code; this.code = code;

@ -29,7 +29,7 @@ public enum SystemInfo {
/** 实例 */ /** 实例 */
INSTANCE; INSTANCE;
private String systemID; private final String systemID;
SystemInfo(){ SystemInfo(){
// 生成系统ID // 生成系统ID

@ -30,12 +30,14 @@ public enum CommonMsg implements BaseMsg {
/** Controller 参数默认序列化 */ /** Controller 参数默认序列化 */
EXCEPTION_CONTROLLER_MODEL(10100,"序列化对象失败!"), EXCEPTION_CONTROLLER_MODEL(10100,"序列化对象失败!"),
/** 创建文件失败 */
EXCEPTION_CREATE_FILE_ERROR(10101,"创建文件失败!"),
; ;
private int code; private final int code;
private String message; private final String message;
CommonMsg(int code, String message){ CommonMsg(int code, String message){
this.code = code; this.code = code;

@ -64,25 +64,25 @@ public class AsyncProcessorReFuse {
// 关闭事件的挂钩 // 关闭事件的挂钩
Runtime.getRuntime().addShutdownHook(new Thread(() -> { Runtime.getRuntime().addShutdownHook(new Thread(() -> {
log.info("AsyncProcessor shutting down."); log.info("AsyncProcessorReFuse 异步处理器关闭");
EXECUTOR.shutdown(); EXECUTOR.shutdown();
try { try {
// 等待1秒执行关闭 // 等待1秒执行关闭
if (!EXECUTOR.awaitTermination(DEFAULT_WAIT_TIME, TimeUnit.SECONDS)) { if (!EXECUTOR.awaitTermination(DEFAULT_WAIT_TIME, TimeUnit.SECONDS)) {
log.error("AsyncProcessor shutdown immediately due to wait timeout."); log.error("AsyncProcessorReFuse 由于等待超时,异步处理器立即关闭");
EXECUTOR.shutdownNow(); EXECUTOR.shutdownNow();
} }
} catch (InterruptedException e) { } catch (InterruptedException e) {
log.error("AsyncProcessor shutdown interrupted."); log.error("AsyncProcessorReFuse 异步处理器关闭中断");
EXECUTOR.shutdownNow(); EXECUTOR.shutdownNow();
} }
log.info("AsyncProcessor shutdown complete."); log.info("AsyncProcessorReFuse 异步处理器关闭完成");
})); }));
} catch (Exception e) { } catch (Exception e) {
log.error("AsyncProcessor init error.", e); log.error("AsyncProcessorReFuse 异步处理器初始化错误", e);
throw new ExceptionInInitializerError(e); throw new ExceptionInInitializerError(e);
} }
} }
@ -104,7 +104,7 @@ public class AsyncProcessorReFuse {
try { try {
EXECUTOR.execute(task); EXECUTOR.execute(task);
} catch (RejectedExecutionException e) { } catch (RejectedExecutionException e) {
log.error("Task executing was rejected.", e); log.error("AsyncProcessorReFuse 执行任务被拒绝", e);
return false; return false;
} }
return true; return true;
@ -121,8 +121,8 @@ public class AsyncProcessorReFuse {
try { try {
return EXECUTOR.submit(task); return EXECUTOR.submit(task);
} catch (RejectedExecutionException e) { } catch (RejectedExecutionException e) {
log.error("Task executing was rejected.", e); log.error("AsyncProcessorReFuse 执行任务被拒绝", e);
throw new UnsupportedOperationException("Unable to submit the task, rejected.", e); throw new UnsupportedOperationException("AsyncProcessorReFuse 无法提交任务,已被拒绝", e);
} }
} }
} }

@ -64,25 +64,25 @@ public class AsyncProcessorWait {
// 这里不会自动关闭线程, 当线程超过阈值时 抛异常 // 这里不会自动关闭线程, 当线程超过阈值时 抛异常
// 关闭事件的挂钩 // 关闭事件的挂钩
Runtime.getRuntime().addShutdownHook(new Thread(() -> { Runtime.getRuntime().addShutdownHook(new Thread(() -> {
log.info("AsyncProcessor shutting down."); log.info("AsyncProcessorWait 异步处理器关闭");
EXECUTOR.shutdown(); EXECUTOR.shutdown();
try { try {
// 等待1秒执行关闭 // 等待1秒执行关闭
if (!EXECUTOR.awaitTermination(DEFAULT_WAIT_TIME, TimeUnit.SECONDS)) { if (!EXECUTOR.awaitTermination(DEFAULT_WAIT_TIME, TimeUnit.SECONDS)) {
log.error("AsyncProcessor shutdown immediately due to wait timeout."); log.error("AsyncProcessorWait 由于等待超时,异步处理器立即关闭");
EXECUTOR.shutdownNow(); EXECUTOR.shutdownNow();
} }
} catch (InterruptedException e) { } catch (InterruptedException e) {
log.error("AsyncProcessor shutdown interrupted."); log.error("AsyncProcessorWait 异步处理器关闭中断");
EXECUTOR.shutdownNow(); EXECUTOR.shutdownNow();
} }
log.info("AsyncProcessor shutdown complete."); log.info("AsyncProcessorWait 异步处理器关闭完成");
})); }));
} catch (Exception e) { } catch (Exception e) {
log.error("AsyncProcessor init error.", e); log.error("AsyncProcessorWait 异步处理器初始化错误", e);
throw new ExceptionInInitializerError(e); throw new ExceptionInInitializerError(e);
} }
} }
@ -104,7 +104,7 @@ public class AsyncProcessorWait {
try { try {
EXECUTOR.execute(task); EXECUTOR.execute(task);
} catch (RejectedExecutionException e) { } catch (RejectedExecutionException e) {
log.error("Task executing was rejected.", e); log.error("AsyncProcessorWait 执行任务被拒绝", e);
return false; return false;
} }
return true; return true;
@ -121,8 +121,8 @@ public class AsyncProcessorWait {
try { try {
return EXECUTOR.submit(task); return EXECUTOR.submit(task);
} catch (RejectedExecutionException e) { } catch (RejectedExecutionException e) {
log.error("Task executing was rejected.", e); log.error("AsyncProcessorWait 执行任务被拒绝", e);
throw new UnsupportedOperationException("Unable to submit the task, rejected.", e); throw new UnsupportedOperationException("AsyncProcessorWait 无法提交任务,已被拒绝", e);
} }
} }
} }

@ -64,7 +64,8 @@ public final class HumpUtil {
public static String humpToUnderline(String para) { public static String humpToUnderline(String para) {
StringBuilder sb = new StringBuilder(para); StringBuilder sb = new StringBuilder(para);
int temp = 0;//定位 //定位
int temp = 0;
if (!para.contains(UNDERLINE)) { if (!para.contains(UNDERLINE)) {
for (int i = 0; i < para.length(); i++) { for (int i = 0; i < para.length(); i++) {
if (Character.isUpperCase(para.charAt(i))) { if (Character.isUpperCase(para.charAt(i))) {

@ -0,0 +1,63 @@
package org.opsli.common.utils;
import cn.hutool.core.io.IoUtil;
import lombok.extern.slf4j.Slf4j;
import org.opsli.common.exception.ServiceException;
import org.opsli.common.msg.CommonMsg;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.OutputStream;
import java.io.PrintWriter;
import java.nio.charset.StandardCharsets;
/**
* @BelongsProject: think-bboss-parent
* @BelongsPackage: com.think.bboss.common.utils
* @Author: Parker
* @CreateTime: 2021-01-05 14:26
* @Description: 周鹏程
*/
@Slf4j
public final class OutputStreamUtil {
/**
* 导出文件时为Writer生成OutputStream
*/
public static OutputStream getOutputStream(String fileName, HttpServletResponse response)
throws ServiceException {
try {
fileName = new String(fileName.getBytes(), StandardCharsets.ISO_8859_1);
response.setHeader("Content-Disposition", "attachment; filename=" + fileName);
response.setHeader("Cache-Control", "no-store, no-cache");
return response.getOutputStream();
} catch (IOException e) {
// 创建文件失败
throw new ServiceException(CommonMsg.EXCEPTION_CREATE_FILE_ERROR);
}
}
/**
* 返回异常值
*/
public static void exceptionResponse(String msg, HttpServletResponse response){
try {
response.setCharacterEncoding("utf-8");
response.setContentType("text/html;charset=utf-8;");
PrintWriter writer = response.getWriter();
writer.write(
"<script type=\"text/javascript\">alert('"+msg+"');</script>");
writer.flush();
// 关闭流
IoUtil.close(writer);
}catch (Exception e){
log.error(e.getMessage(), e);
}
}
// ==========================
private OutputStreamUtil(){}
}

@ -166,11 +166,7 @@ public class Props {
// 获得对象 // 获得对象
Object obj = this.getObject(keys); Object obj = this.getObject(keys);
if(obj != null){ return Convert.toStr(obj, def);
def = "";
def = Convert.convert(String.class, obj);
}
return def;
} }
/** /**
@ -195,10 +191,7 @@ public class Props {
// 获得对象 // 获得对象
Object obj = this.getObject(keys); Object obj = this.getObject(keys);
if(obj != null){ return Convert.toInt(obj, def);
def = Convert.convert(Integer.class, obj);
}
return def;
} }
/** /**
@ -223,10 +216,7 @@ public class Props {
// 获得对象 // 获得对象
Object obj = this.getObject(keys); Object obj = this.getObject(keys);
if(obj != null){ return Convert.toLong(obj, def);
def = Convert.convert(Long.class, obj);
}
return def;
} }
@ -252,10 +242,7 @@ public class Props {
// 获得对象 // 获得对象
Object obj = this.getObject(keys); Object obj = this.getObject(keys);
if(obj != null){ return Convert.toDouble(obj, def);
def = Convert.convert(Double.class, obj);
}
return def;
} }
@ -282,10 +269,7 @@ public class Props {
// 获得对象 // 获得对象
Object obj = this.getObject(keys); Object obj = this.getObject(keys);
if(obj != null){ return Convert.toFloat(obj, def);
def = Convert.convert(Float.class, obj);
}
return def;
} }
@ -311,10 +295,7 @@ public class Props {
// 获得对象 // 获得对象
Object obj = this.getObject(keys); Object obj = this.getObject(keys);
if(obj != null){ return Convert.toChar(obj, def);
def = Convert.convert(Character.class, obj);
}
return def;
} }
/** /**
@ -339,10 +320,7 @@ public class Props {
// 获得对象 // 获得对象
Object obj = this.getObject(keys); Object obj = this.getObject(keys);
if(obj != null){ return Convert.toBool(obj, def);
def = Convert.convert(Boolean.class, obj);
}
return def;
} }
/** /**
@ -386,7 +364,8 @@ public class Props {
if(obj == null){ if(obj == null){
obj = temp.get(k); obj = temp.get(k);
} else if(obj instanceof LinkedHashMap){ } else if(obj instanceof LinkedHashMap){
obj = ((LinkedHashMap) obj).get(k); //Convert
obj = Convert.convert(LinkedHashMap.class, obj).get(k);
} }
} }
return obj; return obj;

@ -0,0 +1,185 @@
package org.opsli.common.utils;
import com.google.common.cache.Cache;
import com.google.common.cache.CacheBuilder;
import com.google.common.collect.Maps;
import com.google.common.util.concurrent.RateLimiter;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
import org.opsli.common.thread.refuse.AsyncProcessQueueReFuse;
import javax.servlet.http.HttpServletRequest;
import java.time.Duration;
import java.util.Map;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
/**
* @BelongsProject: think-bboss-parent
* @BelongsPackage: com.think.bboss.common.utils
* @Author: Parker
* @CreateTime: 2021-01-05 16:06
* @Description: 单机限流
*/
@Slf4j
public final class RateLimiterUtil {
/** 默认QPS */
public static final double DEFAULT_QPS = 10d;
/** 默认缓存个数 超出后流量自动清理 */
private static final int DEFAULT_CACHE_COUNT = 10_0000;
/** 默认缓存时效 超出后自动清理 */
private static final int DEFAULT_CACHE_TIME = 5;
/** 默认等待时长 */
private static final int DEFAULT_WAIT = 5000;
/** 限流器单机缓存 */
private static final Cache<String, Map<String, RateLimiterInner> > LFU_CACHE;
static{
LFU_CACHE = CacheBuilder
.newBuilder().maximumSize(DEFAULT_CACHE_COUNT)
.expireAfterWrite(DEFAULT_CACHE_TIME, TimeUnit.MINUTES).build();
}
/**
* 删除IP
* @param ip
*/
public static void removeIp(String ip) {
LFU_CACHE.invalidate(ip);
}
/**
* 方法进入
* @param request
* @return
*/
public static boolean enter(HttpServletRequest request) {
// 获得IP
String clientIpAddress = IPUtil.getClientIpAddress(request);
// 获得URI
String clientUri = request.getRequestURI();
return RateLimiterUtil.enter(clientIpAddress, clientUri);
}
/**
* 方法进入
* @param request
* @return
*/
public static boolean enter(HttpServletRequest request, Double dfQps) {
// 获得IP
String clientIpAddress = IPUtil.getClientIpAddress(request);
// 获得URI
String clientUri = request.getRequestURI();
return RateLimiterUtil.enter(clientIpAddress, clientUri, dfQps);
}
/**
* 方法进入
* @param clientIpAddress IP
* @return
*/
public static boolean enter(String clientIpAddress, String resource) {
return RateLimiterUtil.enter(clientIpAddress, resource, null);
}
/**
* 方法进入
* @param clientIpAddress IP
* @param dfQps 手动指派QPS
* @return
*/
public static boolean enter(String clientIpAddress, String resource, Double dfQps) {
// 计时器
long t1 = System.currentTimeMillis();
Map<String, RateLimiterInner> rateLimiterInnerMap;
try {
rateLimiterInnerMap = LFU_CACHE.get(clientIpAddress, ()->{
// 当缓存取不到时 重新加载缓存
Map<String, RateLimiterInner> tmpMap = Maps.newConcurrentMap();
// 设置限流器
RateLimiterInner rateLimiterInner = new RateLimiterInner();
rateLimiterInner.setQps(dfQps);
rateLimiterInner.setRateLimiter(RateLimiter.create(dfQps));
tmpMap.put(resource, rateLimiterInner);
return tmpMap;
});
}catch (ExecutionException e){
log.error(e.getMessage(), e);
return false;
}
RateLimiterInner rateLimiterObj;
Double qps = dfQps;
// 初始化过程
RateLimiterInner rateLimiterInner = rateLimiterInnerMap.get(resource);
// 如果为空 则创建一个新的限流器
if(rateLimiterInner == null){
System.out.println(456);
rateLimiterInner = new RateLimiterInner();
rateLimiterInner.setQps(dfQps);
rateLimiterInner.setRateLimiter(RateLimiter.create(dfQps));
rateLimiterInnerMap.put(resource, rateLimiterInner);
}else{
qps = rateLimiterInner.getQps();
}
rateLimiterObj = rateLimiterInner;
//不限流
if (qps == null || qps == 0.0) {
return true;
}
RateLimiter rateLimiter = rateLimiterObj.getRateLimiter();
//非阻塞
if (!rateLimiter.tryAcquire(Duration.ofMillis(DEFAULT_WAIT))) {
//限速中,提示用户
log.error("限流器 - 访问频繁 耗时: "+ (System.currentTimeMillis() - t1) + "ms, IP地址: " + clientIpAddress + ", URI: " + resource);
return false;
} else {
// 正常访问
return true;
}
}
// ==============
public static void main(String[] args) {
RateLimiterUtil.removeIp("127.0.0.1");
for (int i = 0; i < 500; i++) {
int j = i;
AsyncProcessQueueReFuse.execute(()->{
boolean enter = RateLimiterUtil.enter("127.0.0.1","/api/v1", 2d);
System.out.println(enter);
});
}
}
}
/**
* 限流器
*/
@Data
class RateLimiterInner {
/** qps */
private Double qps;
/** 限流器 */
private RateLimiter rateLimiter;
}

@ -91,16 +91,14 @@ public class ZipUtils {
public static void main(String[] args) throws Exception { public static void main(String[] args) throws Exception {
List<Map<String, String>> list = new ArrayList<>(); List<Map<String, String>> list = new ArrayList<>();
OutputStream outputStream = new FileOutputStream(new File("/Users/system/Documents/脚本/opsli/test.zip")); OutputStream outputStream = new FileOutputStream(new File("/Users/system/Documents/脚本/opsli/test.zip"));
Map<String,String> m1 = new HashMap(){{put("path","/f1/f2/f3/");put("name","1.txt");put("data","abcdefg");}}; Map<String,String> m1 = new HashMap<String,String>(){{put("path","/f1/f2/f3/");put("name","1.txt");put("data","abcdefg");}};
Map<String,String> m2 = new HashMap(){{put("path","/f1/f2/f3/f4/");put("name","2.txt");put("data","abcdefg");}}; Map<String,String> m2 = new HashMap<String,String>(){{put("path","/f1/f2/f3/f4/");put("name","2.txt");put("data","abcdefg");}};
Map<String,String> m3 = new HashMap(){{put("path","");put("name","3.txt");put("data","abcdefg");}}; Map<String,String> m3 = new HashMap<String,String>(){{put("path","");put("name","3.txt");put("data","abcdefg");}};
list.add(m1); list.add(m1);
list.add(m2); list.add(m2);
list.add(m3); list.add(m3);
toZip(list, outputStream); toZip(list, outputStream);
if (outputStream != null) { outputStream.close();
outputStream.close();
}
} }
} }

@ -0,0 +1,101 @@
/**
* Copyright 2020 OPSLI 快速开发平台 https://www.opsli.com
* <p>
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
* <p>
* http://www.apache.org/licenses/LICENSE-2.0
* <p>
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations under
* the License.
*/
package org.opsli.core.aspect;
import lombok.extern.slf4j.Slf4j;
import org.aspectj.lang.JoinPoint;
import org.aspectj.lang.annotation.Aspect;
import org.aspectj.lang.annotation.Before;
import org.aspectj.lang.annotation.Pointcut;
import org.aspectj.lang.reflect.MethodSignature;
import org.opsli.common.annotation.Limiter;
import org.opsli.common.enums.AlertType;
import org.opsli.common.exception.ServiceException;
import org.opsli.common.utils.OutputStreamUtil;
import org.opsli.common.utils.RateLimiterUtil;
import org.opsli.core.msg.CoreMsg;
import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Component;
import org.springframework.web.context.request.RequestAttributes;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.lang.reflect.Method;
import static org.opsli.common.constants.OrderConstants.LIMITER_AOP_SORT;
/**
* 限流器
*
* @author 周鹏程
* @date 2020-09-16
*/
@Slf4j
@Order(LIMITER_AOP_SORT)
@Aspect
@Component
public class LimiterAop {
@Pointcut("@annotation(org.opsli.common.annotation.Limiter)")
public void requestMapping() {
}
/**
* 限流
* @param point
*/
@Before("requestMapping()")
public void limiterHandle(JoinPoint point){
try {
RequestAttributes ra = RequestContextHolder.getRequestAttributes();
ServletRequestAttributes sra = (ServletRequestAttributes) ra;
MethodSignature signature = (MethodSignature) point.getSignature();
Method method = signature.getMethod();
if(sra != null) {
HttpServletRequest request = sra.getRequest();
HttpServletResponse response = sra.getResponse();
Limiter limiter = method.getAnnotation(Limiter.class);
if(limiter != null){
AlertType alertType = limiter.alertType();
double qps = limiter.qps();
// 限流
boolean enterFlag = RateLimiterUtil.enter(request, qps);
if(!enterFlag){
// alert 弹出
if(AlertType.ALERT == alertType){
OutputStreamUtil.exceptionResponse(
CoreMsg.OTHER_EXCEPTION_LIMITER.getMessage(),
response
);
}else {
// 异常返回
throw new ServiceException(CoreMsg.OTHER_EXCEPTION_LIMITER);
}
}
}
}
}catch (ServiceException e){
throw e;
}catch (Exception e){
log.error(e.getMessage(),e);
}
}
}

@ -51,7 +51,7 @@ public class SQLDataAop {
} }
@AfterReturning(returning = "ret", pointcut = "insert()") @AfterReturning(returning = "ret", pointcut = "insert()")
public void insertHadnler(Object ret){ public void insertHandler(Object ret){
try { try {
if(ret == null){ if(ret == null){
throw new ServiceException(CoreMsg.SQL_EXCEPTION_INSERT); throw new ServiceException(CoreMsg.SQL_EXCEPTION_INSERT);
@ -64,7 +64,7 @@ public class SQLDataAop {
} }
@AfterReturning(returning = "ret", pointcut = "update()") @AfterReturning(returning = "ret", pointcut = "update()")
public void updateHadnler(Object ret){ public void updateHandler(Object ret){
try { try {
if(ret == null){ if(ret == null){
throw new ServiceException(CoreMsg.SQL_EXCEPTION_UPDATE); throw new ServiceException(CoreMsg.SQL_EXCEPTION_UPDATE);
@ -77,7 +77,7 @@ public class SQLDataAop {
} }
@AfterReturning(returning = "ret", pointcut = "delete()") @AfterReturning(returning = "ret", pointcut = "delete()")
public void deleteHadnler(Object ret){ public void deleteHandler(Object ret){
try { try {
if(ret != null){ if(ret != null){
Boolean retFlag = (Boolean) ret; Boolean retFlag = (Boolean) ret;

@ -0,0 +1,81 @@
/**
* Copyright 2020 OPSLI 快速开发平台 https://www.opsli.com
* <p>
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
* <p>
* http://www.apache.org/licenses/LICENSE-2.0
* <p>
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations under
* the License.
*/
package org.opsli.core.aspect;
import cn.hutool.core.convert.Convert;
import lombok.extern.slf4j.Slf4j;
import org.aspectj.lang.JoinPoint;
import org.aspectj.lang.annotation.Aspect;
import org.aspectj.lang.annotation.Before;
import org.aspectj.lang.annotation.Pointcut;
import org.aspectj.lang.reflect.MethodSignature;
import org.opsli.common.annotation.SearchHis;
import org.opsli.core.utils.SearchHisUtil;
import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Component;
import org.springframework.web.context.request.RequestAttributes;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
import javax.servlet.http.HttpServletRequest;
import java.lang.reflect.Method;
import static org.opsli.common.constants.OrderConstants.SEARCH_HIS_AOP_SORT;
/**
* 搜索历史 AOP
*
* @author 周鹏程
* @date 2020-09-16
*/
@Slf4j
@Order(SEARCH_HIS_AOP_SORT)
@Aspect
@Component
public class SearchHisAop {
@Pointcut("@annotation(org.opsli.common.annotation.SearchHis)")
public void requestMapping() {
}
/**
* 限流
* @param point
*/
@Before("requestMapping()")
public void limiterHandle(JoinPoint point){
try {
RequestAttributes ra = RequestContextHolder.getRequestAttributes();
ServletRequestAttributes sra = (ServletRequestAttributes) ra;
MethodSignature signature = (MethodSignature) point.getSignature();
Method method = signature.getMethod();
if(sra != null) {
HttpServletRequest request = sra.getRequest();
SearchHis searchHis = method.getAnnotation(SearchHis.class);
if(searchHis != null){
String[] keys = searchHis.keys();
// 存入缓存
SearchHisUtil.putSearchHis(request, Convert.toList(String.class, keys));
}
}
}catch (Exception e){
log.error(e.getMessage(),e);
}
}
}

@ -50,7 +50,7 @@ import static org.opsli.common.constants.OrderConstants.TOKEN_AOP_SORT;
public class TokenAop { public class TokenAop {
@Pointcut("execution(public * org.opsli.modulars*..*.*Controller*.*(..))") @Pointcut("execution(public * org.opsli..*.*Controller*.*(..))")
public void requestMapping() { public void requestMapping() {
} }

@ -53,9 +53,8 @@ public class UserCachingOperationNameGenerator {
private String startingWith(String prefix) { private String startingWith(String prefix) {
if (generated.containsKey(prefix)) { if (generated.containsKey(prefix)) {
generated.put(prefix, generated.get(prefix) + 1); generated.put(prefix, generated.get(prefix) + 1);
String nextUniqueOperationName = String.format("%s_%s", prefix, generated.get(prefix));
//log.warn("组件中存在相同的方法名称,自动生成组件方法唯一名称进行替换: {}", nextUniqueOperationName); //log.warn("组件中存在相同的方法名称,自动生成组件方法唯一名称进行替换: {}", nextUniqueOperationName);
return nextUniqueOperationName; return String.format("%s_%s", prefix, generated.get(prefix));
} else { } else {
generated.put(prefix, 0); generated.put(prefix, 0);
return prefix; return prefix;

@ -16,6 +16,7 @@
package org.opsli.core.base.concroller; package org.opsli.core.base.concroller;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.DateUtil;
import cn.hutool.core.date.TimeInterval; import cn.hutool.core.date.TimeInterval;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
@ -29,14 +30,19 @@ import org.apache.commons.lang3.StringUtils;
import org.opsli.api.base.result.ResultVo; import org.opsli.api.base.result.ResultVo;
import org.opsli.api.base.warpper.ApiWrapper; import org.opsli.api.base.warpper.ApiWrapper;
import org.opsli.api.wrapper.system.user.UserModel; import org.opsli.api.wrapper.system.user.UserModel;
import org.opsli.common.annotation.RequiresPermissionsCus;
import org.opsli.common.annotation.hotdata.EnableHotData; import org.opsli.common.annotation.hotdata.EnableHotData;
import org.opsli.common.exception.ServiceException; import org.opsli.common.exception.ServiceException;
import org.opsli.common.exception.TokenException;
import org.opsli.common.msg.CommonMsg; import org.opsli.common.msg.CommonMsg;
import org.opsli.common.utils.OutputStreamUtil;
import org.opsli.common.utils.WrapperUtil; import org.opsli.common.utils.WrapperUtil;
import org.opsli.core.base.entity.BaseEntity; import org.opsli.core.base.entity.BaseEntity;
import org.opsli.core.base.service.interfaces.CrudServiceInterface; import org.opsli.core.base.service.interfaces.CrudServiceInterface;
import org.opsli.core.cache.local.CacheUtil; import org.opsli.core.cache.local.CacheUtil;
import org.opsli.core.msg.CoreMsg; import org.opsli.core.msg.CoreMsg;
import org.opsli.core.msg.TokenMsg;
import org.opsli.core.security.shiro.realm.JwtRealm;
import org.opsli.core.utils.ExcelUtil; import org.opsli.core.utils.ExcelUtil;
import org.opsli.core.utils.UserUtil; import org.opsli.core.utils.UserUtil;
import org.opsli.plugins.excel.exception.ExcelPluginException; import org.opsli.plugins.excel.exception.ExcelPluginException;
@ -52,6 +58,7 @@ import org.springframework.web.multipart.MultipartHttpServletRequest;
import javax.annotation.PostConstruct; import javax.annotation.PostConstruct;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.lang.reflect.Method;
import java.lang.reflect.Type; import java.lang.reflect.Type;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
@ -85,6 +92,10 @@ public abstract class BaseRestController <T extends BaseEntity, E extends ApiWra
/** Model 泛型游标 */ /** Model 泛型游标 */
private static final int MODEL_INDEX = 1; private static final int MODEL_INDEX = 1;
/** Excel 最大操作数量 防止OOM */
@Value("${opsli.excel-max-count:20000}")
private Integer excelMaxCount;
@Autowired(required = false) @Autowired(required = false)
protected S IService; protected S IService;
@Autowired @Autowired
@ -146,7 +157,6 @@ public abstract class BaseRestController <T extends BaseEntity, E extends ApiWra
}finally { }finally {
// 释放锁 // 释放锁
redisLockPlugins.unLock(redisLock); redisLockPlugins.unLock(redisLock);
redisLock = null;
} }
}else{ }else{
// 如果缓存没读到 则去数据库读 // 如果缓存没读到 则去数据库读
@ -184,7 +194,7 @@ public abstract class BaseRestController <T extends BaseEntity, E extends ApiWra
* @param request * @param request
* @return * @return
*/ */
protected ResultVo<?> excelImport(MultipartHttpServletRequest request){ protected ResultVo<?> importExcel(MultipartHttpServletRequest request){
// 计时器 // 计时器
TimeInterval timer = DateUtil.timer(); TimeInterval timer = DateUtil.timer();
Iterator<String> itr = request.getFileNames(); Iterator<String> itr = request.getFileNames();
@ -199,22 +209,39 @@ public abstract class BaseRestController <T extends BaseEntity, E extends ApiWra
String msgInfo = ""; String msgInfo = "";
try { try {
List<E> modelList = excelUtil.readExcel(files.get(0), modelClazz); List<E> modelList = excelUtil.readExcel(files.get(0), modelClazz);
boolean ret = IService.insertBatch(modelList); if(CollUtil.isNotEmpty(modelList)){
if(!ret){ if(modelList.size() > excelMaxCount){
throw new ExcelPluginException(CoreMsg.EXCEL_IMPORT_NO); String maxError = StrUtil.format(CoreMsg.EXCEL_HANDLE_MAX.getMessage(), modelList.size(), excelMaxCount);
// 清空 list
modelList.clear();
// 超出最大导出数量
throw new ExcelPluginException(CoreMsg.EXCEL_HANDLE_MAX.getCode(), maxError);
}
boolean ret = IService.insertBatch(modelList);
if(!ret){
// 清空 list
modelList.clear();
throw new ExcelPluginException(CoreMsg.EXCEL_IMPORT_NO);
}
// 清空 list
modelList.clear();
// 花费毫秒数
long timerCount = timer.interval();
// 提示信息
msgInfo = StrUtil.format(CoreMsg.EXCEL_IMPORT_SUCCESS.getMessage(), DateUtil.formatBetween(timerCount));
// 导出成功
resultVo = ResultVo.success(msgInfo);
resultVo.setCode(CoreMsg.EXCEL_IMPORT_SUCCESS.getCode());
}else {
throw new ExcelPluginException(CoreMsg.EXCEL_FILE_NULL);
} }
// 花费毫秒数
long timerCount = timer.interval();
// 提示信息
msgInfo = StrUtil.format(CoreMsg.EXCEL_IMPORT_SUCCESS.getMessage(), timerCount);
// 导出成功
resultVo = ResultVo.success(msgInfo);
resultVo.setCode(CoreMsg.EXCEL_IMPORT_SUCCESS.getCode());
} catch (ExcelPluginException e) { } catch (ExcelPluginException e) {
// 花费毫秒数 // 花费毫秒数
long timerCount = timer.interval(); long timerCount = timer.interval();
// 提示信息 // 提示信息
msgInfo = StrUtil.format(CoreMsg.EXCEL_IMPORT_ERROR.getMessage(), timerCount, e.getMessage()); msgInfo = StrUtil.format(CoreMsg.EXCEL_IMPORT_ERROR.getMessage(), DateUtil.formatBetween(timerCount),
e.getMessage());
// 导入失败 // 导入失败
resultVo = ResultVo.error(CoreMsg.EXCEL_IMPORT_ERROR.getCode(), msgInfo); resultVo = ResultVo.error(CoreMsg.EXCEL_IMPORT_ERROR.getCode(), msgInfo);
} }
@ -228,24 +255,63 @@ public abstract class BaseRestController <T extends BaseEntity, E extends ApiWra
* @param fileName 文件名称 * @param fileName 文件名称
* @param response * @param response
*/ */
protected ResultVo<?> importTemplate(String fileName, HttpServletResponse response){ protected void importTemplate(String fileName, HttpServletResponse response, Method method){
return this.excelExport(fileName + " 模版 ",null, response); this.excelExport(fileName + " 模版 ",null, response, method);
} }
/** /**
* 导出 * 导出
*
* 导出时,Token认证和方法权限认证 全部都由自定义完成
* 因为在 导出不成功时,需要推送错误信息,
* 前端直接走下载流,当失败时无法获得失败信息,即使前后端换一种方式后端推送二进制文件前端再次解析也是最少2倍的耗时
* ,且如果数据量过大,前端进行渲染时直接会把浏览器卡死
* 而直接开启socket接口推送显然是太过浪费资源了,所以目前采用Java最原始的手段
* response 推送 javascript代码 alert 提示报错信息
*
* @param fileName 文件名称 * @param fileName 文件名称
* @param queryWrapper 查询构建器 * @param queryWrapper 查询构建器
* @param response * @param response
*/ */
protected ResultVo<?> excelExport(String fileName, QueryWrapper<T> queryWrapper, HttpServletResponse response){ protected void excelExport(String fileName, QueryWrapper<T> queryWrapper, HttpServletResponse response,
Method method){
// 权限认证
try {
if(method == null){
// 无权访问该方法
throw new TokenException(TokenMsg.EXCEPTION_NOT_AUTH);
}
// Token 认证
JwtRealm.authToken();
RequiresPermissionsCus permissionsCus = method.getAnnotation(RequiresPermissionsCus.class);
if(permissionsCus != null){
// 方法权限认证
JwtRealm.authPerms(permissionsCus.value());
}
}catch (TokenException e){
// 推送错误信息
OutputStreamUtil.exceptionResponse(e.getMessage(), response);
return;
}
// 计时器 // 计时器
TimeInterval timer = DateUtil.timer(); TimeInterval timer = DateUtil.timer();
String msgInfo = ""; String msgInfo = "";
ResultVo<?> resultVo; ResultVo<?> resultVo;
List<E> modelList = Lists.newArrayList();
try { try {
List<E> modelList = Lists.newArrayList();
if(queryWrapper != null){ if(queryWrapper != null){
// 获得数量 大于 阈值 禁止导出, 防止OOM
int count = IService.count(queryWrapper);
if(count > excelMaxCount){
String maxError = StrUtil.format(CoreMsg.EXCEL_HANDLE_MAX.getMessage(), count, excelMaxCount);
// 超出最大导出数量
throw new ExcelPluginException(CoreMsg.EXCEL_HANDLE_MAX.getCode(), maxError);
}
List<T> entityList = IService.findList(queryWrapper); List<T> entityList = IService.findList(queryWrapper);
// 转化类型 // 转化类型
modelList = WrapperUtil.transformInstance(entityList, modelClazz); modelList = WrapperUtil.transformInstance(entityList, modelClazz);
@ -255,7 +321,8 @@ public abstract class BaseRestController <T extends BaseEntity, E extends ApiWra
// 花费毫秒数 // 花费毫秒数
long timerCount = timer.interval(); long timerCount = timer.interval();
// 提示信息 // 提示信息
msgInfo = StrUtil.format(CoreMsg.EXCEL_EXPORT_SUCCESS.getMessage(), modelList.size(), timerCount); msgInfo = StrUtil.format(CoreMsg.EXCEL_EXPORT_SUCCESS.getMessage(), modelList.size(),
DateUtil.formatBetween(timerCount));
// 导出成功 // 导出成功
resultVo = ResultVo.success(msgInfo); resultVo = ResultVo.success(msgInfo);
resultVo.setCode(CoreMsg.EXCEL_EXPORT_SUCCESS.getCode()); resultVo.setCode(CoreMsg.EXCEL_EXPORT_SUCCESS.getCode());
@ -263,13 +330,21 @@ public abstract class BaseRestController <T extends BaseEntity, E extends ApiWra
// 花费毫秒数 // 花费毫秒数
long timerCount = timer.interval(); long timerCount = timer.interval();
// 提示信息 // 提示信息
msgInfo = StrUtil.format(CoreMsg.EXCEL_EXPORT_ERROR.getMessage(), timerCount, e.getMessage()); msgInfo = StrUtil.format(CoreMsg.EXCEL_EXPORT_ERROR.getMessage(), DateUtil.formatBetween(timerCount), e.getMessage());
// 导出失败 // 导出失败
resultVo = ResultVo.error(CoreMsg.EXCEL_EXPORT_ERROR.getCode(), msgInfo); resultVo = ResultVo.error(CoreMsg.EXCEL_EXPORT_ERROR.getCode(), msgInfo);
}finally {
// 清空list
modelList.clear();
} }
// 记录导出日志 // 记录导出日志
log.info(msgInfo); log.info(msgInfo);
return resultVo;
// 导出异常
if(!resultVo.isSuccess()){
// 无权访问该方法
OutputStreamUtil.exceptionResponse(resultVo.getMsg(), response);
}
} }
/** /**

@ -239,6 +239,21 @@ public abstract class CrudServiceImpl<M extends BaseMapper<T>, T extends BaseEnt
return page; return page;
} }
@Override
public Page<T,E> findPageNotCount(Page<T,E> page) {
page.pageHelperBegin(false);
try{
List<T> list = this.findList(page.getQueryWrapper());
PageInfo<T> pageInfo = new PageInfo<>(list);
List<E> es = transformTs2Ms(pageInfo.getList());
page.instance(pageInfo, es);
} finally {
page.pageHelperEnd();
}
return page;
}
// ======================== 对象转化 ======================== // ======================== 对象转化 ========================
/** /**

@ -187,11 +187,18 @@ public interface CrudServiceInterface<T extends BaseEntity,E extends ApiWrapper>
/** /**
* 查询分页数据 * 查询分页数据
* * @param page 分页
* @return Page<T> * @return Page<T>
*/ */
Page<T,E> findPage(Page<T,E> page); Page<T,E> findPage(Page<T,E> page);
/**
* 查询分页数据 不查询 count
* @param page 分页
* @return Page<T>
*/
Page<T,E> findPageNotCount(Page<T,E> page);
} }

@ -15,15 +15,12 @@
*/ */
package org.opsli.core.cache.local; package org.opsli.core.cache.local;
import cn.hutool.core.io.FileUtil;
import cn.hutool.core.io.file.FileReader;
import cn.hutool.core.util.XmlUtil; import cn.hutool.core.util.XmlUtil;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.RandomUtils; import org.apache.commons.lang3.RandomUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.opsli.common.constants.CacheConstants; import org.opsli.common.constants.CacheConstants;
import org.opsli.common.utils.Props; import org.opsli.common.utils.Props;
import org.opsli.core.aspect.CacheDataAop; import org.opsli.core.aspect.CacheDataAop;
@ -39,7 +36,6 @@ import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node; import org.w3c.dom.Node;
import org.w3c.dom.NodeList; import org.w3c.dom.NodeList;
import java.io.BufferedInputStream;
import java.io.IOException; import java.io.IOException;
import java.util.List; import java.util.List;
@ -219,7 +215,7 @@ public class CacheUtil {
* @return V * @return V
*/ */
public static Object getHash(String key, String field){ public static Object getHash(String key, String field){
return CacheUtil.getHash(CacheConstants.EDEN_HASH_DATA,key,field,true); return CacheUtil.getHash(key,field,true);
} }
/** /**
@ -246,7 +242,7 @@ public class CacheUtil {
* @return V * @return V
*/ */
public static Object getHashByKeyOriginal(String key, String field){ public static Object getHashByKeyOriginal(String key, String field){
return CacheUtil.getHash(CacheConstants.EDEN_HASH_DATA,key,field,false); return CacheUtil.getHash(key,field,false);
} }
/** /**
@ -449,16 +445,15 @@ public class CacheUtil {
/** /**
* 获得 Hash 缓存 * 获得 Hash 缓存
* @param cacheName 主缓存名
* @param key 键 * @param key 键
* @param field 字段名 * @param field 字段名
* @param keyFlag 是否处理key * @param keyFlag 是否处理key
* @return * @return
*/ */
private static Object getHash(String cacheName, String key, String field, boolean keyFlag){ private static Object getHash(String key, String field, boolean keyFlag){
// 自动处理 key // 自动处理 key
if(keyFlag){ if(keyFlag){
key = CacheUtil.handleKey(cacheName, key); key = CacheUtil.handleKey(CacheConstants.EDEN_HASH_DATA, key);
} }
Object v = null; Object v = null;
try { try {
@ -980,8 +975,10 @@ public class CacheUtil {
// 删除 EhCache 不论是什么 本地都按照热数据处理 // 删除 EhCache 不论是什么 本地都按照热数据处理
ehCachePlugin.delete(CacheConstants.HOT_DATA,key+":"+field); ehCachePlugin.delete(CacheConstants.HOT_DATA,key+":"+field);
// 删除 Redis // 删除 Redis
redisPlugin.hDelete(key, field); Long hDeleteLong = redisPlugin.hDelete(key, field);
ret = true; if(hDeleteLong != null && hDeleteLong > 0){
ret = true;
}
}catch (Exception e){ }catch (Exception e){
log.error(e.getMessage(),e); log.error(e.getMessage(),e);
} }
@ -1005,8 +1002,7 @@ public class CacheUtil {
// 删除 EhCache 不论是什么 本地都按照热数据处理 // 删除 EhCache 不论是什么 本地都按照热数据处理
ehCachePlugin.delete(CacheConstants.HOT_DATA,key); ehCachePlugin.delete(CacheConstants.HOT_DATA,key);
// 删除 Redis // 删除 Redis
redisPlugin.del(key); ret = redisPlugin.del(key);
ret = true;
}catch (Exception e){ }catch (Exception e){
log.error(e.getMessage(),e); log.error(e.getMessage(),e);
} }
@ -1044,9 +1040,8 @@ public class CacheUtil {
public static boolean delNilFlag(String key) { public static boolean delNilFlag(String key) {
boolean ret = false; boolean ret = false;
try { try {
// 存入Redis // 删除Redis
redisPlugin.del(NIL_FLAG_PREFIX + key); ret = redisPlugin.del(NIL_FLAG_PREFIX + key);
ret = true;
}catch (Exception e){ }catch (Exception e){
log.error(e.getMessage(),e); log.error(e.getMessage(),e);
} }
@ -1065,10 +1060,7 @@ public class CacheUtil {
try { try {
// 判断Redis 是否 包含当前Nil值 // 判断Redis 是否 包含当前Nil值
Object o = redisPlugin.get(NIL_FLAG_PREFIX + key); Object o = redisPlugin.get(NIL_FLAG_PREFIX + key);
if(o != null){ return o != null;
return true;
}
return false;
}catch (Exception e){ }catch (Exception e){
log.error(e.getMessage(),e); log.error(e.getMessage(),e);
} }

@ -52,6 +52,11 @@ public enum MsgArgsType {
/** 组织 用户数据 */ /** 组织 用户数据 */
ORG_USER_DATA, ORG_USER_DATA,
/** 租户ID */
TENANT_ID,
/** 租户数据 */
TENANT_DATA,
/** 缓存数据Key */ /** 缓存数据Key */
CACHE_DATA_KEY, CACHE_DATA_KEY,
/** 缓存数据Value */ /** 缓存数据Value */

@ -36,6 +36,9 @@ public enum PushSubType {
/** 组织数据 */ /** 组织数据 */
ORG, ORG,
/** 租户 */
TENANT,
/** 热点数据 */ /** 热点数据 */
HOT_DATA, HOT_DATA,

@ -15,6 +15,8 @@
*/ */
package org.opsli.core.cache.pushsub.handler; package org.opsli.core.cache.pushsub.handler;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.convert.Convert;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.opsli.api.wrapper.system.dict.DictWrapper; import org.opsli.api.wrapper.system.dict.DictWrapper;
@ -29,6 +31,7 @@ import org.opsli.plugins.cache.EhCachePlugin;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import java.util.Collection; import java.util.Collection;
import java.util.List;
/** /**
* @BelongsProject: opsli-boot * @BelongsProject: opsli-boot
@ -41,7 +44,7 @@ import java.util.Collection;
public class DictHandler implements RedisPushSubHandler{ public class DictHandler implements RedisPushSubHandler{
@Autowired @Autowired
EhCachePlugin ehCachePlugin; private EhCachePlugin ehCachePlugin;
@Override @Override
public PushSubType getType() { public PushSubType getType() {
@ -54,15 +57,12 @@ public class DictHandler implements RedisPushSubHandler{
CacheType type = CacheType.valueOf((String) msgJson.get(MsgArgsType.DICT_TYPE.toString())); CacheType type = CacheType.valueOf((String) msgJson.get(MsgArgsType.DICT_TYPE.toString()));
if(DictModelType.COLLECTION == dictModelType){ if(DictModelType.COLLECTION == dictModelType){
Collection<Object> dicts = (Collection<Object>) msgJson.get(MsgArgsType.DICT_MODELS.toString()); Object dictListObj = msgJson.get(MsgArgsType.DICT_MODELS.toString());
for (Object dictObj : dicts) { List<DictWrapper> dictWrappers = Convert.toList(DictWrapper.class, dictListObj);
JSONObject jsonObject = msgJson.getJSONObject(MsgArgsType.DICT_MODEL.toString()); if(CollUtil.isNotEmpty(dictWrappers)){
if(jsonObject == null){ for (DictWrapper dictWrapper : dictWrappers) {
continue; this.handler(dictWrapper, type);
} }
DictWrapper dictWrapperModel = jsonObject.toJavaObject(DictWrapper.class);
this.handler(dictWrapperModel, type);
} }
} else if(DictModelType.OBJECT == dictModelType){ } else if(DictModelType.OBJECT == dictModelType){
JSONObject jsonObject = msgJson.getJSONObject(MsgArgsType.DICT_MODEL.toString()); JSONObject jsonObject = msgJson.getJSONObject(MsgArgsType.DICT_MODEL.toString());

@ -37,7 +37,7 @@ import org.springframework.beans.factory.annotation.Autowired;
public class EdenDataHandler implements RedisPushSubHandler{ public class EdenDataHandler implements RedisPushSubHandler{
@Autowired @Autowired
EhCachePlugin ehCachePlugin; private EhCachePlugin ehCachePlugin;
@Override @Override
public PushSubType getType() { public PushSubType getType() {

@ -36,7 +36,7 @@ import org.springframework.beans.factory.annotation.Autowired;
public class HotDataHandler implements RedisPushSubHandler{ public class HotDataHandler implements RedisPushSubHandler{
@Autowired @Autowired
EhCachePlugin ehCachePlugin; private EhCachePlugin ehCachePlugin;
@Override @Override
public PushSubType getType() { public PushSubType getType() {

@ -37,7 +37,7 @@ import org.springframework.beans.factory.annotation.Autowired;
public class MenuHandler implements RedisPushSubHandler{ public class MenuHandler implements RedisPushSubHandler{
@Autowired @Autowired
EhCachePlugin ehCachePlugin; private EhCachePlugin ehCachePlugin;
@Override @Override
public PushSubType getType() { public PushSubType getType() {

@ -38,7 +38,7 @@ import org.springframework.beans.factory.annotation.Autowired;
public class OrgHandler implements RedisPushSubHandler{ public class OrgHandler implements RedisPushSubHandler{
@Autowired @Autowired
EhCachePlugin ehCachePlugin; private EhCachePlugin ehCachePlugin;
@Override @Override
public PushSubType getType() { public PushSubType getType() {

@ -0,0 +1,78 @@
/**
* Copyright 2020 OPSLI 快速开发平台 https://www.opsli.com
* <p>
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
* <p>
* http://www.apache.org/licenses/LICENSE-2.0
* <p>
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations under
* the License.
*/
package org.opsli.core.cache.pushsub.handler;
import com.alibaba.fastjson.JSONObject;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.opsli.common.constants.CacheConstants;
import org.opsli.core.cache.local.CacheUtil;
import org.opsli.core.cache.pushsub.enums.MsgArgsType;
import org.opsli.core.cache.pushsub.enums.PushSubType;
import org.opsli.core.utils.OrgUtil;
import org.opsli.core.utils.TenantUtil;
import org.opsli.plugins.cache.EhCachePlugin;
import org.springframework.beans.factory.annotation.Autowired;
/**
* @BelongsProject: opsli-boot
* @BelongsPackage: org.opsli.core.cache.pushsub.handler
* @Author: Parker
* @CreateTime: 2020-09-15 16:24
* @Description: 租户消息处理
*/
@Slf4j
public class TenantHandler implements RedisPushSubHandler{
@Autowired
private EhCachePlugin ehCachePlugin;
@Override
public PushSubType getType() {
return PushSubType.TENANT;
}
@Override
public void handler(JSONObject msgJson) {
// 用户刷新
this.orgHandler(msgJson);
}
/**
* 租户数据处理
* @param msgJson
*/
private void orgHandler(JSONObject msgJson){
JSONObject data = msgJson.getJSONObject(MsgArgsType.TENANT_DATA.toString());
// 数据为空则不执行
if(data == null){
return;
}
// 获得租户ID
String tenantId = (String) msgJson.get(MsgArgsType.TENANT_ID.toString());
if(StringUtils.isEmpty(tenantId)){
return;
}
// 先删除
ehCachePlugin.delete(CacheConstants.HOT_DATA, TenantUtil.PREFIX_CODE + tenantId);
// 清除空拦截
CacheUtil.delNilFlag(TenantUtil.PREFIX_CODE + tenantId);
}
}

@ -39,7 +39,7 @@ import org.springframework.beans.factory.annotation.Autowired;
public class UserHandler implements RedisPushSubHandler{ public class UserHandler implements RedisPushSubHandler{
@Autowired @Autowired
EhCachePlugin ehCachePlugin; private EhCachePlugin ehCachePlugin;
@Override @Override
public PushSubType getType() { public PushSubType getType() {

@ -0,0 +1,61 @@
/**
* Copyright 2020 OPSLI 快速开发平台 https://www.opsli.com
* <p>
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
* <p>
* http://www.apache.org/licenses/LICENSE-2.0
* <p>
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations under
* the License.
*/
package org.opsli.core.cache.pushsub.msgs;
import com.alibaba.fastjson.JSONObject;
import lombok.Data;
import lombok.experimental.Accessors;
import org.opsli.api.wrapper.system.tenant.TenantModel;
import org.opsli.api.wrapper.system.user.UserOrgRefModel;
import org.opsli.core.cache.pushsub.enums.MsgArgsType;
import org.opsli.core.cache.pushsub.enums.PushSubType;
import org.opsli.core.cache.pushsub.receiver.RedisPushSubReceiver;
import org.opsli.plugins.redis.pushsub.entity.BaseSubMessage;
/**
* @BelongsProject: opsli-boot
* @BelongsPackage: org.opsli.core.cache.pushsub.msgs
* @Author: Parker
* @CreateTime: 2020-09-15 16:50
* @Description: 租户消息
*/
@Data
@Accessors(chain = true)
public final class TenantMsgFactory extends BaseSubMessage{
/** 通道 */
private static final String CHANNEL = RedisPushSubReceiver.BASE_CHANNEL+RedisPushSubReceiver.CHANNEL;
private TenantMsgFactory(){}
/**
* 构建消息 - 组织
*/
public static BaseSubMessage createTenantMsg(TenantModel tenantModel){
BaseSubMessage baseSubMessage = new BaseSubMessage();
// 数据
JSONObject jsonObj = new JSONObject();
jsonObj.put(MsgArgsType.TENANT_ID.toString(), tenantModel.getId());
jsonObj.put(MsgArgsType.TENANT_DATA.toString(), tenantModel);
// 租户
baseSubMessage.build(CHANNEL,PushSubType.TENANT.toString(),jsonObj);
return baseSubMessage;
}
}

@ -50,6 +50,9 @@ import java.util.concurrent.ConcurrentMap;
@Configuration @Configuration
public class RedisPushSubReceiver extends BaseReceiver { public class RedisPushSubReceiver extends BaseReceiver {
/** Spring Bean 前缀 */
public static final String SPRING_PREFIX = "redisPushSub_";
/** 监听信道 */ /** 监听信道 */
public static final String CHANNEL = "opsli"; public static final String CHANNEL = "opsli";
@ -61,7 +64,7 @@ public class RedisPushSubReceiver extends BaseReceiver {
private AutowireCapableBeanFactory beanFactory; private AutowireCapableBeanFactory beanFactory;
@Autowired @Autowired
DefaultListableBeanFactory defaultListableBeanFactory; private DefaultListableBeanFactory defaultListableBeanFactory;
public RedisPushSubReceiver() { public RedisPushSubReceiver() {
super(CHANNEL); super(CHANNEL);
@ -75,7 +78,6 @@ public class RedisPushSubReceiver extends BaseReceiver {
, RedisPushSubHandler.class , RedisPushSubHandler.class
); );
int count = 0;
for (Class<?> aClass : clazzSet) { for (Class<?> aClass : clazzSet) {
// 位运算 去除抽象类 // 位运算 去除抽象类
if((aClass.getModifiers() & Modifier.ABSTRACT) != 0){ if((aClass.getModifiers() & Modifier.ABSTRACT) != 0){
@ -91,7 +93,7 @@ public class RedisPushSubReceiver extends BaseReceiver {
HANDLER_MAP.put(handler.getType(),handler); HANDLER_MAP.put(handler.getType(),handler);
//将new出的对象放入Spring容器中 //将new出的对象放入Spring容器中
defaultListableBeanFactory.registerSingleton("redisPushSubHandler"+count, obj); defaultListableBeanFactory.registerSingleton(SPRING_PREFIX+aClass.getSimpleName(), obj);
//自动注入依赖 //自动注入依赖
beanFactory.autowireBean(obj); beanFactory.autowireBean(obj);
@ -99,7 +101,6 @@ public class RedisPushSubReceiver extends BaseReceiver {
} catch (Exception e){ } catch (Exception e){
log.error(CoreMsg.REDIS_EXCEPTION_PUSH_SUB.getMessage()); log.error(CoreMsg.REDIS_EXCEPTION_PUSH_SUB.getMessage());
} }
count ++;
} }
} }

@ -16,8 +16,13 @@
package org.opsli.core.conf; package org.opsli.core.conf;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ClassUtil;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
import org.apache.shiro.authc.pam.AtLeastOneSuccessfulStrategy;
import org.apache.shiro.authc.pam.ModularRealmAuthenticator;
import org.apache.shiro.mgt.SecurityManager; import org.apache.shiro.mgt.SecurityManager;
import org.apache.shiro.realm.Realm;
import org.apache.shiro.session.mgt.SessionManager; import org.apache.shiro.session.mgt.SessionManager;
import org.apache.shiro.spring.LifecycleBeanPostProcessor; import org.apache.shiro.spring.LifecycleBeanPostProcessor;
import org.apache.shiro.spring.security.interceptor.AuthorizationAttributeSourceAdvisor; import org.apache.shiro.spring.security.interceptor.AuthorizationAttributeSourceAdvisor;
@ -25,21 +30,21 @@ import org.apache.shiro.spring.web.ShiroFilterFactoryBean;
import org.apache.shiro.web.mgt.DefaultWebSecurityManager; import org.apache.shiro.web.mgt.DefaultWebSecurityManager;
import org.apache.shiro.web.session.mgt.DefaultWebSessionManager; import org.apache.shiro.web.session.mgt.DefaultWebSessionManager;
import org.opsli.common.utils.Props; import org.opsli.common.utils.Props;
import org.opsli.core.security.shiro.filter.OAuth2Filter; import org.opsli.core.security.shiro.authenticator.CustomModularRealmAuthenticator;
import org.opsli.core.security.shiro.realm.OAuth2Realm; import org.opsli.core.security.shiro.filter.CustomShiroFilter;
import org.opsli.core.security.shiro.realm.FlagRealm;
import org.opsli.plugins.redis.conf.RedisPluginConfig; import org.opsli.plugins.redis.conf.RedisPluginConfig;
import org.springframework.aop.framework.autoproxy.DefaultAdvisorAutoProxyCreator; import org.springframework.aop.framework.autoproxy.DefaultAdvisorAutoProxyCreator;
import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.AutoConfigureAfter;
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;
import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
import javax.servlet.Filter; import javax.servlet.Filter;
import java.util.HashMap; import java.lang.reflect.Modifier;
import java.util.LinkedHashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set;
/** /**
* Shiro配置 * Shiro配置
@ -55,15 +60,18 @@ public class ShiroConfig {
/** 获得排除URL */ /** 获得排除URL */
private static final List<String> URL_EXCLUSION; private static final List<String> URL_EXCLUSION;
/** API前缀 */
private static final String API_URL_PREFIX;
static{ static{
Props props = new Props("application.yaml"); Props props = new Props("application.yaml");
URL_EXCLUSION = props.getList("opsli.token-auth.url-exclusion"); URL_EXCLUSION = props.getList("opsli.token-auth.url-exclusion");
API_URL_PREFIX = props.getStr("server.servlet.api.path.global-prefix","");
} }
/** /**
* filer * filer
* @param securityManager * @param securityManager 安全管理器
* @return * @return
*/ */
@Bean("shiroFilter") @Bean("shiroFilter")
@ -73,31 +81,37 @@ public class ShiroConfig {
//oauth过滤 //oauth过滤
Map<String, Filter> filters = Maps.newHashMapWithExpectedSize(1); Map<String, Filter> filters = Maps.newHashMapWithExpectedSize(1);
filters.put("oauth2", new OAuth2Filter()); filters.put("last_filter", new CustomShiroFilter());
shiroFilter.setFilters(filters); shiroFilter.setFilters(filters);
Map<String, String> filterMap = Maps.newLinkedHashMap(); Map<String, String> filterMap = Maps.newLinkedHashMap();
// 加载排除URL
if(CollUtil.isNotEmpty(URL_EXCLUSION)){
for (String excUrl : URL_EXCLUSION) {
filterMap.put(excUrl, "anon");
}
}
// 登录接口拦截
filterMap.put("/sys/login", "anon");
filterMap.put("/sys/slipCount", "anon");
filterMap.put("/captcha.jpg", "anon");
// 导出Excel\模版 不做自动拦截 手动拦截
filterMap.put(API_URL_PREFIX + "/**/exportExcel", "anon");
filterMap.put(API_URL_PREFIX + "/**/importExcel/template", "anon");
filterMap.put("/webjars/**", "anon"); filterMap.put("/webjars/**", "anon");
filterMap.put("/druid/**", "anon"); filterMap.put("/druid/**", "anon");
filterMap.put("/app/**", "anon"); filterMap.put("/app/**", "anon");
filterMap.put("/sys/login", "anon");
filterMap.put("/sys/slipCount", "anon");
filterMap.put("/swagger/**", "anon"); filterMap.put("/swagger/**", "anon");
filterMap.put("/v2/api-docs", "anon"); filterMap.put("/v2/api-docs", "anon");
filterMap.put("/doc.html", "anon"); filterMap.put("/doc.html", "anon");
filterMap.put("/swagger-ui.html", "anon"); filterMap.put("/swagger-ui.html", "anon");
filterMap.put("/swagger-resources/**", "anon"); filterMap.put("/swagger-resources/**", "anon");
filterMap.put("/captcha.jpg", "anon");
filterMap.put("/ueditor/**", "anon");
filterMap.put("/static/file/**", "anon"); filterMap.put("/static/file/**", "anon");
filterMap.put("/**", "oauth2"); filterMap.put("/**", "last_filter");
// 加载排除URL
if(CollUtil.isNotEmpty(URL_EXCLUSION)){
for (String excUrl : URL_EXCLUSION) {
filterMap.put(excUrl, "anon");
}
}
shiroFilter.setFilterChainDefinitionMap(filterMap); shiroFilter.setFilterChainDefinitionMap(filterMap);
@ -113,16 +127,44 @@ public class ShiroConfig {
} }
@Bean("securityManager") @Bean("securityManager")
public DefaultWebSecurityManager securityManager(OAuth2Realm oAuth2Realm, SessionManager sessionManager,LettuceConnectionFactory lettuceConnectionFactory) { public DefaultWebSecurityManager securityManager(SessionManager sessionManager) {
DefaultWebSecurityManager securityManager = new DefaultWebSecurityManager(); DefaultWebSecurityManager securityManager = new DefaultWebSecurityManager();
securityManager.setRealm(oAuth2Realm);
securityManager.setSessionManager(sessionManager); securityManager.setSessionManager(sessionManager);
// 设置验证器为自定义验证器
securityManager.setAuthenticator(modularRealmAuthenticator());
List<Realm> realms = Lists.newArrayList();
// 拿到state包下 实现了 FlagRealm 接口的,所有子类
Set<Class<?>> clazzSet = ClassUtil.scanPackageBySuper(FlagRealm.class.getPackage().getName()
, FlagRealm.class
);
for (Class<?> aClass : clazzSet) {
// 位运算 去除抽象类
if((aClass.getModifiers() & Modifier.ABSTRACT) != 0){
continue;
}
try {
realms.add((Realm) aClass.newInstance());
} catch (Exception ignored){ }
}
if(CollUtil.isNotEmpty(realms)){
// 追加 Realms
securityManager.setRealms(realms);
}
return securityManager; return securityManager;
} }
@Bean /**
public OAuth2Realm oAuth2Realm() { * 针对多Realm,使用自定义身份验证器
return new OAuth2Realm(); */
@Bean("modularRealmAuthenticator")
public ModularRealmAuthenticator modularRealmAuthenticator(){
CustomModularRealmAuthenticator authenticator = new CustomModularRealmAuthenticator();
authenticator.setAuthenticationStrategy(new AtLeastOneSuccessfulStrategy());
return authenticator;
} }
@ -148,7 +190,7 @@ public class ShiroConfig {
/** /**
* 开启shiro权限注解生效 * 开启shiro权限注解生效
* @param securityManager * @param securityManager 安全管理器
* @return * @return
*/ */
@Bean("authorizationAttributeSourceAdvisor") @Bean("authorizationAttributeSourceAdvisor")

@ -21,6 +21,7 @@ import com.google.common.collect.Lists;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.opsli.core.utils.UserTokenUtil; import org.opsli.core.utils.UserTokenUtil;
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.Import; import org.springframework.context.annotation.Import;
@ -47,6 +48,10 @@ import java.util.List;
@Import(BeanValidatorPluginsConfiguration.class) @Import(BeanValidatorPluginsConfiguration.class)
public class SwaggerConfig { public class SwaggerConfig {
/** 系统名称 */
@Value("${opsli.system-name:OPSLI 快速开发平台}")
private String systemName;
private final TypeResolver typeResolver; private final TypeResolver typeResolver;
@Autowired @Autowired
@ -87,13 +92,13 @@ public class SwaggerConfig {
private ApiInfo apiInfo() { private ApiInfo apiInfo() {
return new ApiInfoBuilder() return new ApiInfoBuilder()
// //大标题 // //大标题
.title("Opsli-Boot 后台服务API接口文档") .title(systemName + " 服务API接口文档")
// 版本号 // 版本号
.version("1.0") .version("1.0")
// 描述 // 描述
.description("后台API接口") .description("后台API接口")
// 作者 // 作者
.contact("Parker") .contact(new Contact("Parker", "https://opsli.com", "meet.parker@foxmail.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();

@ -16,6 +16,8 @@
package org.opsli.core.conf.mybatis; package org.opsli.core.conf.mybatis;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.convert.Convert;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ReflectUtil; import cn.hutool.core.util.ReflectUtil;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
@ -24,7 +26,6 @@ import org.apache.ibatis.executor.Executor;
import org.apache.ibatis.mapping.MappedStatement; 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.opsli.api.wrapper.system.user.UserModel;
import org.opsli.common.constants.MyBatisConstants; import org.opsli.common.constants.MyBatisConstants;
import org.opsli.core.utils.UserUtil; import org.opsli.core.utils.UserUtil;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
@ -66,10 +67,7 @@ public class AutoFillInterceptor implements Interceptor {
private void fillField(Invocation invocation) { private void fillField(Invocation invocation) {
Object[] args = invocation.getArgs(); Object[] args = invocation.getArgs();
SqlCommandType sqlCommandType = null; SqlCommandType sqlCommandType = null;
for (int i = 0; i < args.length; i++) { for (Object arg : args) {
Object arg = args[i];
//String className = arg.getClass().getName();
//log.info(i + " 参数类型:" + className);
//第一个参数处理。根据它判断是否给“操作属性”赋值。 //第一个参数处理。根据它判断是否给“操作属性”赋值。
//如果是第一个参数 MappedStatement //如果是第一个参数 MappedStatement
if (arg instanceof MappedStatement) { if (arg instanceof MappedStatement) {
@ -102,7 +100,8 @@ public class AutoFillInterceptor implements Interceptor {
if(arg == null ){ if(arg == null ){
return; return;
} }
// 当前时间
Date currDate = DateUtil.date();
Field[] fields = ReflectUtil.getFields(arg.getClass()); Field[] fields = ReflectUtil.getFields(arg.getClass());
for (Field f : fields) { for (Field f : fields) {
f.setAccessible(true); f.setAccessible(true);
@ -111,25 +110,25 @@ public class AutoFillInterceptor implements Interceptor {
case MyBatisConstants.FIELD_CREATE_BY: case MyBatisConstants.FIELD_CREATE_BY:
// 如果创建人 为空则进行默认赋值 // 如果创建人 为空则进行默认赋值
Object createValue = ReflectUtil.getFieldValue(arg, f.getName()); Object createValue = ReflectUtil.getFieldValue(arg, f.getName());
if(createValue == null){ if(StringUtils.isBlank(Convert.toStr(createValue))){
setProperty(arg, MyBatisConstants.FIELD_CREATE_BY, UserUtil.getUser().getId()); setProperty(arg, MyBatisConstants.FIELD_CREATE_BY, UserUtil.getUser().getId());
} }
break; break;
// 创建日期
case MyBatisConstants.FIELD_CREATE_TIME:
setProperty(arg, MyBatisConstants.FIELD_CREATE_TIME, new Date());
break;
// 更新人 // 更新人
case MyBatisConstants.FIELD_UPDATE_BY: case MyBatisConstants.FIELD_UPDATE_BY:
// 如果更新人 为空则进行默认赋值 // 如果更新人 为空则进行默认赋值
Object updateValue = ReflectUtil.getFieldValue(arg, f.getName()); Object updateValue = ReflectUtil.getFieldValue(arg, f.getName());
if(updateValue == null){ if(StringUtils.isBlank(Convert.toStr(updateValue))){
setProperty(arg, MyBatisConstants.FIELD_UPDATE_BY, UserUtil.getUser().getId()); setProperty(arg, MyBatisConstants.FIELD_UPDATE_BY, UserUtil.getUser().getId());
} }
break; break;
// 创建日期
case MyBatisConstants.FIELD_CREATE_TIME:
setProperty(arg, MyBatisConstants.FIELD_CREATE_TIME, currDate);
break;
// 更新日期 // 更新日期
case MyBatisConstants.FIELD_UPDATE_TIME: case MyBatisConstants.FIELD_UPDATE_TIME:
setProperty(arg, MyBatisConstants.FIELD_UPDATE_TIME, new Date()); setProperty(arg, MyBatisConstants.FIELD_UPDATE_TIME, currDate);
break; break;
// 乐观锁 // 乐观锁
case MyBatisConstants.FIELD_OPTIMISTIC_LOCK: case MyBatisConstants.FIELD_OPTIMISTIC_LOCK:
@ -141,18 +140,11 @@ public class AutoFillInterceptor implements Interceptor {
break; break;
// 多租户设置 // 多租户设置
case MyBatisConstants.FIELD_TENANT: case MyBatisConstants.FIELD_TENANT:
// 2020-12-05 修复当前租户可能为空字符串报错问题
// 如果租户ID 为空则进行默认赋值 // 如果租户ID 为空则进行默认赋值
Object tenantValue = ReflectUtil.getFieldValue(arg, f.getName()); Object tenantValue = ReflectUtil.getFieldValue(arg, f.getName());
if(tenantValue == null){ if(StringUtils.isBlank(Convert.toStr(tenantValue))){
setProperty(arg, MyBatisConstants.FIELD_TENANT, UserUtil.getTenantId()); setProperty(arg, MyBatisConstants.FIELD_TENANT, UserUtil.getTenantId());
}else{
// 如果 tenantId 为空字符串 自动转换为 null
if(tenantValue instanceof String){
String tmp = String.valueOf(tenantValue);
if(StringUtils.isBlank(tmp)){
setProperty(arg, MyBatisConstants.FIELD_TENANT, null);
}
}
} }
break; break;
default: default:
@ -193,13 +185,13 @@ public class AutoFillInterceptor implements Interceptor {
case MyBatisConstants.FIELD_UPDATE_BY: case MyBatisConstants.FIELD_UPDATE_BY:
// 如果更新人 为空则进行默认赋值 // 如果更新人 为空则进行默认赋值
Object updateValue = ReflectUtil.getFieldValue(arg, f.getName()); Object updateValue = ReflectUtil.getFieldValue(arg, f.getName());
if(updateValue == null){ if(StringUtils.isBlank(Convert.toStr(updateValue))){
setProperty(arg, MyBatisConstants.FIELD_UPDATE_BY, UserUtil.getUser().getId()); setProperty(arg, MyBatisConstants.FIELD_UPDATE_BY, UserUtil.getUser().getId());
} }
break; break;
// 更新日期 // 更新日期
case MyBatisConstants.FIELD_UPDATE_TIME: case MyBatisConstants.FIELD_UPDATE_TIME:
setProperty(arg, MyBatisConstants.FIELD_UPDATE_TIME, new Date()); setProperty(arg, MyBatisConstants.FIELD_UPDATE_TIME, DateUtil.date());
break; break;
default: default:
break; break;
@ -213,7 +205,7 @@ public class AutoFillInterceptor implements Interceptor {
/** /**
* 为对象的操作属性赋值 * 为对象的操作属性赋值
* *
* @param bean * @param bean bean对象
*/ */
private void setProperty(Object bean, String name, Object value) { private void setProperty(Object bean, String name, Object value) {
//根据需要,将相关属性赋上默认值 //根据需要,将相关属性赋上默认值

@ -15,14 +15,18 @@
*/ */
package org.opsli.core.general; package org.opsli.core.general;
import cn.hutool.core.date.BetweenFormatter;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.lang.Console; import cn.hutool.core.lang.Console;
import cn.hutool.core.thread.ThreadUtil; import cn.hutool.core.thread.ThreadUtil;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import java.net.InetAddress; import java.net.InetAddress;
import java.net.UnknownHostException; import java.net.UnknownHostException;
import java.util.Date;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
/** /**
@ -34,23 +38,15 @@ import java.util.concurrent.TimeUnit;
@Component @Component
public class StartPrint { public class StartPrint {
/** 实例对象 */ /** 系统名称 */
public static StartPrint INSTANCE = new StartPrint(); private static String systemName;
/** 服务端口 */ /** 服务端口 */
private static String serverPort; private static String serverPort;
/** 服务根地址 */ /** 服务根地址 */
private static String serverContextPath; private static String serverContextPath;
/** 系统启动时间 */
private static String starterDate;
@Value("${server.port:8080}")
public void setServerPort(String serverPort) {
StartPrint.serverPort = serverPort;
}
@Value("${server.servlet.context-path:/opsli-boot}")
public void setServerContextPath(String serverContextPath) {
StartPrint.serverContextPath = serverContextPath;
}
/** /**
* 成功 * 成功
@ -60,33 +56,33 @@ public class StartPrint {
// 睡一秒打印 // 睡一秒打印
ThreadUtil.sleep(1, TimeUnit.SECONDS); ThreadUtil.sleep(1, TimeUnit.SECONDS);
String basePath = getBasePath(); String basePath = getBasePath();
StringBuilder printStr = new StringBuilder(); String printStr =
printStr.append("\n----------------------------------------------------------\n") "\n----------------------------------------------------------\n" +
.append("OPSLI 快速开发平台 框架启动成功! 相关URLs:\n") systemName + " 框架启动成功! 相关URLs:\n" +
.append("项目地址: \t\thttp://" + basePath + "/\n") "项目地址: \t\thttp://" + basePath + "/\n" +
.append("Doc文档: \t\thttp://" + basePath + "/doc.html\n") "Doc文档: \t\thttp://" + basePath + "/doc.html\n" +
.append("----------------------------------------------------------\n"); "----------------------------------------------------------\n";
Console.log(printStr.toString()); Console.log(printStr);
} }
/** /**
* 势必啊 * 失败
* 打印启动日志 * 打印启动日志
*/ */
public void errorPrint(){ public void errorPrint(){
// 睡一秒打印 // 睡一秒打印
ThreadUtil.sleep(1, TimeUnit.SECONDS); ThreadUtil.sleep(1, TimeUnit.SECONDS);
StringBuilder printStr = new StringBuilder(); String printStr =
printStr.append("\n----------------------------------------------------------\n") "\n----------------------------------------------------------\n" +
.append("OPSLI 快速开发平台 框架启动失败! 请检查相关配置!\n") systemName + " 框架启动失败! 请检查相关配置!\n" +
.append("----------------------------------------------------------\n"); "----------------------------------------------------------\n";
Console.log(printStr.toString()); Console.log(printStr);
} }
/** /**
* 获得服务根路径 * 获得服务根路径
* @return * @return String
*/ */
public String getBasePath(){ public String getBasePath(){
String ip = "127.0.0.1"; String ip = "127.0.0.1";
@ -95,4 +91,69 @@ public class StartPrint {
}catch (UnknownHostException ignored){} }catch (UnknownHostException ignored){}
return ip + ":" + serverPort + serverContextPath; return ip + ":" + serverPort + serverContextPath;
} }
/**
* 获得当前系统运行时间
* @return String
*/
public String getRunTime(){
//Level.MINUTE表示精确到分
return DateUtil.formatBetween(DateUtil.parseDateTime(starterDate), DateUtil.date(), BetweenFormatter.Level.MINUTE);
}
// ======================
/**
* 获得实例对象
* @return StartPrint
*/
public static StartPrint getInstance(){
return StartPrintInner.INSTANCE;
}
/**
* 静态内部类
*/
private static class StartPrintInner{
/** 实例对象 */
private static final StartPrint INSTANCE = new StartPrint();
}
@Value("${opsli.system-name:OPSLI快速开发平台}")
public void setSystemName(String systemName) {
StartPrint.systemName = systemName;
}
@Value("${opsli.system-starter-time}")
public void setStarterDate(String starterDate) {
// 非空验证
if(StringUtils.isEmpty(starterDate)){
StartPrint.starterDate = DateUtil.date().toString();
return;
}
// 非法时间参数验证
Date tmp = null;
try {
tmp = DateUtil.parseDateTime(starterDate);
}catch (Exception ignored){}
if(tmp == null){
StartPrint.starterDate = DateUtil.date().toString();
return;
}
StartPrint.starterDate = starterDate;
}
@Value("${server.port:8080}")
public void setServerPort(String serverPort) {
StartPrint.serverPort = serverPort;
}
@Value("${server.servlet.context-path:/opsli-boot}")
public void setServerContextPath(String serverContextPath) {
StartPrint.serverContextPath = serverContextPath;
}
} }

@ -20,6 +20,7 @@ import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.authc.IncorrectCredentialsException; import org.apache.shiro.authc.IncorrectCredentialsException;
import org.apache.shiro.authc.LockedAccountException; import org.apache.shiro.authc.LockedAccountException;
import org.apache.shiro.authc.pam.UnsupportedTokenException;
import org.apache.shiro.authz.AuthorizationException; import org.apache.shiro.authz.AuthorizationException;
import org.opsli.api.base.result.ResultVo; import org.opsli.api.base.result.ResultVo;
import org.opsli.common.exception.*; import org.opsli.common.exception.*;
@ -143,6 +144,19 @@ public class GlobalExceptionHandler {
); );
} }
/**
* 拦截 自定义 Shiro 认证异常
*/
@ExceptionHandler(UnsupportedTokenException.class)
@ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR)
@ResponseBody
public ResultVo<?> unsupportedTokenException(UnsupportedTokenException e) {
// 找不到认证授权器
return ResultVo.error(TokenMsg.EXCEPTION_NOT_REALM.getCode(),
TokenMsg.EXCEPTION_NOT_REALM.getMessage()
);
}
/** /**
* 拦截 自定义 Token 认证异常 * 拦截 自定义 Token 认证异常
@ -200,9 +214,9 @@ public class GlobalExceptionHandler {
//log.error("数据异常:{}",e.getMessage(),e); //log.error("数据异常:{}",e.getMessage(),e);
// 默认值异常 // 默认值异常
if(StringUtils.contains(e.getMessage(),SQL_EXCEPTION)){ if(StringUtils.contains(e.getMessage(),SQL_EXCEPTION)){
String Field = e.getMessage().replaceAll("Field '","") String field = e.getMessage().replaceAll("Field '","")
.replaceAll("' doesn't have a default value",""); .replaceAll("' doesn't have a default value","");
String msg = StrFormatter.format(CoreMsg.SQL_EXCEPTION_NOT_HAVE_DEFAULT_VALUE.getMessage(), Field); String msg = StrFormatter.format(CoreMsg.SQL_EXCEPTION_NOT_HAVE_DEFAULT_VALUE.getMessage(), field);
return ResultVo.error(CoreMsg.SQL_EXCEPTION_NOT_HAVE_DEFAULT_VALUE.getCode(), msg); return ResultVo.error(CoreMsg.SQL_EXCEPTION_NOT_HAVE_DEFAULT_VALUE.getCode(), msg);
} }
String msg = StrFormatter.format(CoreMsg.SQL_EXCEPTION_UNKNOWN.getMessage(), e.getMessage()); String msg = StrFormatter.format(CoreMsg.SQL_EXCEPTION_UNKNOWN.getMessage(), e.getMessage());

@ -15,8 +15,10 @@ import org.springframework.stereotype.Component;
@Component @Component
@Slf4j @Slf4j
public class ApplicationFailedEventListener implements ApplicationListener<ApplicationFailedEvent> { public class ApplicationFailedEventListener implements ApplicationListener<ApplicationFailedEvent> {
@Override @Override
public void onApplicationEvent(ApplicationFailedEvent event) { public void onApplicationEvent(ApplicationFailedEvent event) {
StartPrint.INSTANCE.errorPrint(); StartPrint.getInstance().errorPrint();
} }
}
}

@ -14,10 +14,12 @@ import org.springframework.stereotype.Component;
*/ */
@Component @Component
@Slf4j @Slf4j
public class ApplicationReadyEventListene implements ApplicationListener<ApplicationReadyEvent> { public class ApplicationReadyEventListener implements ApplicationListener<ApplicationReadyEvent> {
@Override @Override
public void onApplicationEvent(ApplicationReadyEvent event) { public void onApplicationEvent(ApplicationReadyEvent event) {
event.getApplicationContext(); event.getApplicationContext();
StartPrint.INSTANCE.successPrint(); StartPrint.getInstance().successPrint();
} }
} }

@ -42,17 +42,20 @@ public enum CoreMsg implements BaseMsg {
/** /**
* Excel * Excel
*/ */
EXCEL_EXPORT_SUCCESS(200,"Excel 导出成功! - 数据行数:{} - 耗时:{}毫秒"), EXCEL_EXPORT_SUCCESS(200,"Excel 导出成功! - 数据行数:{} - 耗时:{}"),
EXCEL_EXPORT_ERROR(10301,"Excel 导出失败! - 耗时:{}毫秒 - 失败信息:{}"), EXCEL_EXPORT_ERROR(10301,"Excel 导出失败! - 耗时:{} - 失败信息:{}"),
EXCEL_IMPORT_SUCCESS(200,"EXCEL 导入成功! - 耗时:{}毫秒"), EXCEL_IMPORT_SUCCESS(200,"EXCEL 导入成功! - 耗时:{}"),
EXCEL_IMPORT_ERROR(10303,"Excel导入失败! - 耗时:{}毫秒 - 失败信息:{}"), EXCEL_IMPORT_ERROR(10303,"Excel导入失败! - 耗时:{} - 失败信息:{}"),
EXCEL_IMPORT_NO(10304,""), EXCEL_IMPORT_NO(10304,"导入对象为空"),
EXCEL_FILE_NULL(10305,"请选择文件"), EXCEL_FILE_NULL(10305,"请选择文件"),
EXCEL_HANDLE_MAX(10700, "超出最大操作数量, 当前数据[{}]条,允许最大阈值[{}]条"),
/** /**
* 缓存 * 缓存
*/ */
CACHE_PUNCTURE_EXCEPTION(10405, "当期服务繁忙,客官请稍微再次尝试!"), CACHE_PUNCTURE_EXCEPTION(10405, "当期服务繁忙,客官请稍微再次尝试!"),
CACHE_DEL_EXCEPTION(10406, "无法清除缓存,请稍后再试"),
/** /**
@ -64,10 +67,13 @@ public enum CoreMsg implements BaseMsg {
/** 演示模式 */ /** 演示模式 */
EXCEPTION_ENABLE_DEMO(10600,"演示模式不允许操作"), EXCEPTION_ENABLE_DEMO(10600,"演示模式不允许操作"),
/** 其他 */
OTHER_EXCEPTION_LIMITER(10700,"当前系统繁忙,请稍后再试"),
; ;
private int code; private final int code;
private String message; private final String message;
CoreMsg(int code,String message){ CoreMsg(int code,String message){
this.code = code; this.code = code;

@ -34,8 +34,8 @@ public enum JwtMsg implements BaseMsg {
; ;
private int code; private final int code;
private String message; private final String message;
JwtMsg(int code, String message){ JwtMsg(int code, String message){
this.code = code; this.code = code;

@ -36,7 +36,10 @@ public enum TokenMsg implements BaseMsg {
/** /**
* 登陆 * 登陆
*/ */
EXCEPTION_LOGIN_CAPTCHA(12100,"验证码不正确!"), EXCEPTION_CAPTCHA_ERROR(12100,"验证码不正确!"),
EXCEPTION_CAPTCHA_NULL(12201, "验证码已失效"),
EXCEPTION_CAPTCHA_UUID_NULL(12202, "验证码UUID为空"),
EXCEPTION_CAPTCHA_CODE_NULL(12203, "验证码为空"),
EXCEPTION_LOGIN_ACCOUNT_NO(12101,"账号或密码不正确!"), EXCEPTION_LOGIN_ACCOUNT_NO(12101,"账号或密码不正确!"),
EXCEPTION_LOGIN_ACCOUNT_LOCKED(12102,"账号已被锁定,请联系管理员!"), EXCEPTION_LOGIN_ACCOUNT_LOCKED(12102,"账号已被锁定,请联系管理员!"),
EXCEPTION_LOGOUT_ERROR(12103,"登出失败,没有授权Token!"), EXCEPTION_LOGOUT_ERROR(12103,"登出失败,没有授权Token!"),
@ -49,12 +52,13 @@ public enum TokenMsg implements BaseMsg {
* 其他 * 其他
*/ */
EXCEPTION_USER_NULL(12200, "用户为空"), EXCEPTION_USER_NULL(12200, "用户为空"),
EXCEPTION_CAPTCHA_NULL(12201, "验证码已失效"), EXCEPTION_NOT_AUTH(12201, "无权访问该方法"),
EXCEPTION_NOT_AUTH(12202, "无权访问该方法"), EXCEPTION_NOT_REALM(12202, "找不到认证授权器"),
; ;
private int code; private final int code;
private String message; private final String message;
TokenMsg(int code, String message){ TokenMsg(int code, String message){
this.code = code; this.code = code;

@ -71,23 +71,17 @@ public class Page<T extends BaseEntity,E extends ApiWrapper> extends PageSeriali
} }
/** /**
* 分页 构造函数 * 分页函数
* @param pageNo 页
* @param pageSize 分页大小
*/ */
public Page(int pageNo, int pageSize, String orderBy) { public void pageHelperBegin(){
super(); this.pageHelperBegin(true);
this.pageNo = pageNo;
this.pageSize = pageSize;
} }
/** /**
* 分页函数 * 分页函数 不统计 count
*/ */
public void pageHelperBegin(){ public void pageHelperBegin(boolean countFlag){
PageHelper.startPage(this.pageNo,this.pageSize); PageHelper.startPage(this.pageNo,this.pageSize, countFlag);
} }
/** /**

@ -37,8 +37,7 @@ public class GenQueryBuilder<T extends BaseEntity> implements QueryBuilder<T> {
@Override @Override
public QueryWrapper<T> build() { public QueryWrapper<T> build() {
QueryWrapper<T> queryWrapper = new QueryWrapper<>(); return new QueryWrapper<>();
return queryWrapper;
} }
} }

@ -47,11 +47,11 @@ public class WebQueryBuilder<T extends BaseEntity> implements QueryBuilder<T>{
private static final String ORDER_DESC = "DESC"; private static final String ORDER_DESC = "DESC";
/** 参数 */ /** 参数 */
private Map<String, String[]> parameterMap; private final Map<String, String[]> parameterMap;
/** Entity Clazz */ /** Entity Clazz */
private Class<? extends BaseEntity> entityClazz; private final Class<? extends BaseEntity> entityClazz;
/** 默认排序字段 */ /** 默认排序字段 */
private String defaultOrderField; private final String defaultOrderField;
/** /**
* 构造函数 只是生产 查询器 * 构造函数 只是生产 查询器
@ -102,20 +102,20 @@ public class WebQueryBuilder<T extends BaseEntity> implements QueryBuilder<T>{
} }
// 键 和 操作 // 键 和 操作
String[] key_handle = keys.split("_"); String[] keyHandle = keys.split("_");
if(key_handle.length < 2){ if(keyHandle.length < 2){
continue; continue;
} }
// 判断 字段是否合法 // 判断 字段是否合法
boolean hasField = this.validationField(key_handle); boolean hasField = this.validationField(keyHandle);
if(hasField){ if(hasField){
// 验证操作是否合法 // 验证操作是否合法
boolean hasHandle = this.validationHandle(key_handle); boolean hasHandle = this.validationHandle(keyHandle);
if(hasHandle){ if(hasHandle){
// 操作 // 操作
String handle = key_handle[1]; String handle = keyHandle[1];
// 键 // 键
String key = key_handle[0]; String key = keyHandle[0];
// 处理值 // 处理值
String value = values[0]; String value = values[0];
// 赋值 // 赋值
@ -152,54 +152,62 @@ public class WebQueryBuilder<T extends BaseEntity> implements QueryBuilder<T>{
} }
// 转换驼峰 为 数据库下划线字段 // 转换驼峰 为 数据库下划线字段
key = HumpUtil.humpToUnderline(key); key = HumpUtil.humpToUnderline(key);
if (EQ.equals(handle)) { switch (handle) {
// 全值匹配 case EQ:
queryWrapper.eq(key,value); // 全值匹配
} else if (LIKE.equals(handle)) { queryWrapper.eq(key, value);
// 模糊匹配 break;
queryWrapper.like(key,value); case LIKE:
} else if (BEGIN.equals(handle)) { // 模糊匹配
// 大于等于 queryWrapper.like(key, value);
queryWrapper.ge(key,value); break;
} else if (END.equals(handle)) { case BEGIN:
// 小于等于 // 大于等于
queryWrapper.le(key,value); queryWrapper.ge(key, value);
} else if (ORDER.equals(handle)) { break;
// 排序 case END:
if(ORDER_ASC.equals(value)){ // 小于等于
queryWrapper.orderByAsc(key); queryWrapper.le(key, value);
} else if(ORDER_DESC.equals(value)){ break;
queryWrapper.orderByDesc(key); case ORDER:
} else{ // 排序
queryWrapper.orderByAsc(key); if (ORDER_ASC.equals(value)) {
} queryWrapper.orderByAsc(key);
} else if (ORDER_DESC.equals(value)) {
queryWrapper.orderByDesc(key);
} else {
queryWrapper.orderByAsc(key);
}
break;
default:
break;
} }
} }
/** /**
* 检测 字段是否合法 * 检测 字段是否合法
* @param key_handle * @param keyHandle
* @return * @return
*/ */
private boolean validationField(String[] key_handle){ private boolean validationField(String[] keyHandle){
if(entityClazz == null || key_handle == null || StringUtils.isEmpty(key_handle[0])){ if(entityClazz == null || keyHandle == null || StringUtils.isEmpty(keyHandle[0])){
return false; return false;
} }
// 判断当前传入参数 是否是Entity的字段 // 判断当前传入参数 是否是Entity的字段
return ReflectUtil.hasField(entityClazz, key_handle[0]); return ReflectUtil.hasField(entityClazz, keyHandle[0]);
} }
/** /**
* 检测 操作是否合法 * 检测 操作是否合法
* @param key_handle * @param keyHandle
* @return * @return
*/ */
private boolean validationHandle(String[] key_handle){ private boolean validationHandle(String[] keyHandle){
if(key_handle == null || StringUtils.isEmpty(key_handle[1])){ if(keyHandle == null || StringUtils.isEmpty(keyHandle[1])){
return false; return false;
} }
String handle = key_handle[1]; String handle = keyHandle[1];
if (EQ.equals(handle)) { if (EQ.equals(handle)) {
return true; return true;
} else if (LIKE.equals(handle)) { } else if (LIKE.equals(handle)) {
@ -208,9 +216,7 @@ public class WebQueryBuilder<T extends BaseEntity> implements QueryBuilder<T>{
return true; return true;
} else if (END.equals(handle)) { } else if (END.equals(handle)) {
return true; return true;
} else if (ORDER.equals(handle)) {
return true;
} }
return false; return ORDER.equals(handle);
} }
} }

@ -0,0 +1,44 @@
package org.opsli.core.security.shiro.authenticator;
import org.apache.shiro.authc.AuthenticationInfo;
import org.apache.shiro.authc.AuthenticationToken;
import org.apache.shiro.authc.pam.ModularRealmAuthenticator;
import org.apache.shiro.authc.pam.UnsupportedTokenException;
import org.apache.shiro.realm.Realm;
import java.util.Collection;
/**
* 自定义身份验证器,根据登录使用的Token匹配调用对应的Realm
* @author Parker
*/
public class CustomModularRealmAuthenticator extends ModularRealmAuthenticator {
/**
* 自定义Realm的分配策略
* 通过realm.supports()方法匹配对应的Realm,因此才要在Realm中重写supports()方法
* @param realms
* @param token
* @return
*/
@Override
protected AuthenticationInfo doMultiRealmAuthentication(Collection<Realm> realms, AuthenticationToken token) {
// 判断getRealms()是否返回为空
assertRealmsConfigured();
// 通过supports()方法,匹配对应的Realm
Realm uniqueRealm = null;
for (Realm realm : realms) {
if (realm.supports(token)) {
uniqueRealm = realm;
break;
}
}
if (uniqueRealm == null) {
throw new UnsupportedTokenException();
}
return uniqueRealm.getAuthenticationInfo(token);
}
}

@ -1,12 +1,17 @@
package org.opsli.core.security.shiro.filter; package org.opsli.core.security.shiro.filter;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.authc.AuthenticationException; import org.apache.shiro.authc.AuthenticationException;
import org.apache.shiro.authc.AuthenticationToken; import org.apache.shiro.authc.AuthenticationToken;
import org.apache.shiro.web.filter.authc.AuthenticatingFilter; import org.apache.shiro.web.filter.authc.AuthenticatingFilter;
import org.opsli.api.base.result.ResultVo; import org.opsli.api.base.result.ResultVo;
import org.opsli.common.constants.SignConstants;
import org.opsli.common.constants.TokenTypeConstants;
import org.opsli.core.msg.TokenMsg; import org.opsli.core.msg.TokenMsg;
import org.opsli.core.security.shiro.token.OAuth2Token; import org.opsli.core.security.shiro.token.ExternalToken;
import org.opsli.core.security.shiro.token.JwtToken;
import org.opsli.core.utils.JwtUtil;
import org.opsli.core.utils.UserTokenUtil; import org.opsli.core.utils.UserTokenUtil;
import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestMethod;
@ -27,7 +32,7 @@ import java.io.IOException;
* @date 2017-05-20 13:00 * @date 2017-05-20 13:00
*/ */
public class OAuth2Filter extends AuthenticatingFilter { public class CustomShiroFilter extends AuthenticatingFilter {
@Override @Override
protected AuthenticationToken createToken(ServletRequest request, ServletResponse response) throws Exception { protected AuthenticationToken createToken(ServletRequest request, ServletResponse response) throws Exception {
@ -38,7 +43,19 @@ public class OAuth2Filter extends AuthenticatingFilter {
return null; return null;
} }
return new OAuth2Token(token); String tokenType = "";
// 分析token
try {
tokenType = JwtUtil.getClaim(token, SignConstants.TYPE);
}catch (Exception ignored){}
// 手机登录
if(TokenTypeConstants.TYPE_EXTERNAL.equals(tokenType)){
return new ExternalToken(token);
}
// .... 追加登录方式
return new JwtToken(token);
} }
@Override @Override
@ -85,11 +102,10 @@ public class OAuth2Filter extends AuthenticatingFilter {
try { try {
//处理登录失败的异常 //处理登录失败的异常
Throwable throwable = e.getCause() == null ? e : e.getCause(); Throwable throwable = e.getCause() == null ? e : e.getCause();
ResultVo<Object> error = ResultVo.error(401, throwable.getMessage()); ResultVo<Object> error = ResultVo.error(TokenMsg.EXCEPTION_TOKEN_LOSE_EFFICACY.getCode(),
throwable.getMessage());
httpResponse.getWriter().print(error.toJsonStr()); httpResponse.getWriter().print(error.toJsonStr());
} catch (IOException e1) { } catch (IOException ignored) {}
}
return false; return false;
} }

@ -0,0 +1,9 @@
package org.opsli.core.security.shiro.realm;
/**
* @Author: Parker
* @CreateTime: 2020-12-29 20:10
* @Description: Realm 识别类 勿删
*/
public interface FlagRealm {
}

@ -1,18 +1,24 @@
package org.opsli.core.security.shiro.realm; package org.opsli.core.security.shiro.realm;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.io.IoUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.shiro.authc.*; import org.apache.shiro.authc.*;
import org.apache.shiro.authz.AuthorizationInfo; import org.apache.shiro.authz.AuthorizationInfo;
import org.apache.shiro.authz.SimpleAuthorizationInfo; import org.apache.shiro.authz.SimpleAuthorizationInfo;
import org.apache.shiro.realm.AuthorizingRealm; import org.apache.shiro.realm.AuthorizingRealm;
import org.apache.shiro.subject.PrincipalCollection; import org.apache.shiro.subject.PrincipalCollection;
import org.opsli.api.wrapper.system.user.UserModel; import org.opsli.api.wrapper.system.user.UserModel;
import org.opsli.common.api.TokenThreadLocal;
import org.opsli.common.exception.TokenException; import org.opsli.common.exception.TokenException;
import org.opsli.core.msg.TokenMsg; import org.opsli.core.msg.TokenMsg;
import org.opsli.core.security.shiro.token.OAuth2Token; import org.opsli.core.security.shiro.token.JwtToken;
import org.opsli.core.utils.UserTokenUtil; import org.opsli.core.utils.UserTokenUtil;
import org.opsli.core.utils.UserUtil; import org.opsli.core.utils.UserUtil;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import javax.servlet.http.HttpServletResponse;
import java.io.PrintWriter;
import java.util.List; import java.util.List;
/** /**
@ -23,14 +29,15 @@ import java.util.List;
* @date 2017-05-20 14:00 * @date 2017-05-20 14:00
*/ */
@Component @Component
public class OAuth2Realm extends AuthorizingRealm { @Slf4j
public class JwtRealm extends AuthorizingRealm implements FlagRealm {
/** 账号锁定状态 */ /** 账号锁定状态 */
private static final char LOCK_VAL = '1'; public static final String LOCK_VAL = "1";
@Override @Override
public boolean supports(AuthenticationToken token) { public boolean supports(AuthenticationToken token) {
return token instanceof OAuth2Token; return token instanceof JwtToken;
} }
/** /**
@ -85,4 +92,67 @@ public class OAuth2Realm extends AuthorizingRealm {
return new SimpleAuthenticationInfo(user, accessToken, getName()); return new SimpleAuthenticationInfo(user, accessToken, getName());
} }
/**
* Token 认证
*/
public static void authToken()
throws TokenException {
String accessToken = TokenThreadLocal.get();
// 1. 校验 token 是否有效
boolean verify = UserTokenUtil.verify(accessToken);
if(!verify){
// token失效,请重新登录
throw new TokenException(
TokenMsg.EXCEPTION_TOKEN_LOSE_EFFICACY);
}
// 2. 查询 用户信息
String userId = UserTokenUtil.getUserIdByToken(accessToken);
UserModel user = UserUtil.getUser(userId);
// 3. 校验账户是否锁定
if(user == null || user.getLocked().equals(JwtRealm.LOCK_VAL)){
// 账号已被锁定,请联系管理员
// token失效,请重新登录
throw new TokenException(
TokenMsg.EXCEPTION_TOKEN_LOSE_EFFICACY);
}
}
/**
* 按钮权限 认证
*/
public static void authPerms(String[] currPerms)
throws TokenException {
if(currPerms == null ){
return;
}
String accessToken = TokenThreadLocal.get();
// 查询 用户信息
String userId = UserTokenUtil.getUserIdByToken(accessToken);
//用户权限列表
List<String> permsSet = UserUtil.getUserAllPermsByUserId(userId);
if(CollUtil.isEmpty(permsSet)){
// 无权访问该方法
throw new TokenException(
TokenMsg.EXCEPTION_NOT_AUTH);
}
for (String currPerm : currPerms) {
if(!permsSet.contains(currPerm)){
// 无权访问该方法
throw new TokenException(
TokenMsg.EXCEPTION_NOT_AUTH);
}
}
}
} }

@ -0,0 +1,55 @@
package org.opsli.core.security.shiro.realm;
import lombok.extern.slf4j.Slf4j;
import org.apache.shiro.authc.AuthenticationException;
import org.apache.shiro.authc.AuthenticationInfo;
import org.apache.shiro.authc.AuthenticationToken;
import org.apache.shiro.authz.AuthorizationInfo;
import org.apache.shiro.realm.AuthorizingRealm;
import org.apache.shiro.subject.PrincipalCollection;
import org.opsli.common.exception.TokenException;
import org.opsli.core.security.shiro.token.ExternalToken;
import org.springframework.stereotype.Component;
/**
* 手机登录 认证
*
* @author Parker
* @date 2020-12-29 14:00
*/
@Component
@Slf4j
public class TelRealm extends AuthorizingRealm implements FlagRealm {
/** 账号锁定状态 */
public static final char LOCK_VAL = '1';
@Override
public boolean supports(AuthenticationToken token) {
return token instanceof ExternalToken;
}
/**
* 授权(验证权限时调用)
*/
@Override
protected AuthorizationInfo doGetAuthorizationInfo(PrincipalCollection principals) {
// TODO 待处理
return null;
}
/**
* 对外认证(登录时调用)
*/
@Override
protected AuthenticationInfo doGetAuthenticationInfo(AuthenticationToken token)
throws AuthenticationException, TokenException {
// TODO 待处理
return null;
}
}

@ -4,16 +4,17 @@ package org.opsli.core.security.shiro.token;
import org.apache.shiro.authc.AuthenticationToken; import org.apache.shiro.authc.AuthenticationToken;
/** /**
* OAuth2 token * 第三方对外接口 token
* *
* @author 孙志强 * @author Parker
* @date 2017-05-20 13:22 * @date 2017-05-20 13:22
*/ */
public class OAuth2Token implements AuthenticationToken { public class ExternalToken implements AuthenticationToken {
private String token;
public OAuth2Token(String token){ private final String token;
public ExternalToken(String token){
this.token = token; this.token = token;
} }
@ -26,4 +27,5 @@ public class OAuth2Token implements AuthenticationToken {
public Object getCredentials() { public Object getCredentials() {
return token; return token;
} }
} }

@ -4,14 +4,15 @@ package org.opsli.core.security.shiro.token;
import org.apache.shiro.authc.AuthenticationToken; import org.apache.shiro.authc.AuthenticationToken;
/** /**
* jwt token * OAuth2 token
* *
* @author parker * @author Parker
* @date 2017-05-20 13:22 * @date 2017-05-20 13:22
*/ */
public class JwtToken implements AuthenticationToken { public class JwtToken implements AuthenticationToken {
private String token;
private final String token;
public JwtToken(String token){ public JwtToken(String token){
this.token = token; this.token = token;
@ -26,4 +27,5 @@ public class JwtToken implements AuthenticationToken {
public Object getCredentials() { public Object getCredentials() {
return token; return token;
} }
} }

@ -1,34 +0,0 @@
package org.opsli.core.utils;
import java.io.UnsupportedEncodingException;
import java.util.Base64;
/**
* Base64工具
* @author 孙志强
* @date 2018/11/05 23:10
*/
public final class Base64ConvertUtil {
/**
* 加密
* @param str
* @return java.lang.String
*/
public static String encode(String str) throws UnsupportedEncodingException {
byte[] encodeBytes = Base64.getEncoder().encode(str.getBytes("utf-8"));
return new String(encodeBytes);
}
/**
* 解密
* @param str
* @return java.lang.String
*/
public static String decode(String str) throws UnsupportedEncodingException {
byte[] decodeBytes = Base64.getDecoder().decode(str.getBytes("utf-8"));
return new String(decodeBytes);
}
// ==============
private Base64ConvertUtil(){}
}

@ -17,12 +17,10 @@ package org.opsli.core.utils;
import com.google.code.kaptcha.Producer; import com.google.code.kaptcha.Producer;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.opsli.api.web.system.dict.DictDetailApi;
import org.opsli.common.constants.CacheConstants; import org.opsli.common.constants.CacheConstants;
import org.opsli.common.exception.TokenException; import org.opsli.common.exception.TokenException;
import org.opsli.common.utils.Props; import org.opsli.common.utils.Props;
import org.opsli.core.msg.TokenMsg; import org.opsli.core.msg.TokenMsg;
import org.opsli.plugins.redis.RedisLockPlugins;
import org.opsli.plugins.redis.RedisPlugin; import org.opsli.plugins.redis.RedisPlugin;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.AutoConfigureAfter;
@ -89,22 +87,28 @@ public class CaptchaUtil{
* @param code * @param code
* @return * @return
*/ */
public static boolean validate(String uuid, String code) { public static void validate(String uuid, String code) {
// 判断UUID 是否为空
if(StringUtils.isEmpty(uuid)){ if(StringUtils.isEmpty(uuid)){
return false; throw new TokenException(TokenMsg.EXCEPTION_CAPTCHA_UUID_NULL);
}
// 判断 验证码是否为空
if(StringUtils.isEmpty(code)){
throw new TokenException(TokenMsg.EXCEPTION_CAPTCHA_CODE_NULL);
} }
// 验证码 // 验证码
String codeTemp = (String) redisPlugin.get(PREFIX_NAME + PREFIX + uuid); String codeTemp = (String) redisPlugin.get(PREFIX_NAME + PREFIX + uuid);
if(StringUtils.isEmpty(codeTemp)){ if(StringUtils.isEmpty(codeTemp)){
throw new TokenException(TokenMsg.EXCEPTION_CAPTCHA_NULL); throw new TokenException(TokenMsg.EXCEPTION_CAPTCHA_NULL);
} }
// 删除验证码 // 验证 验证码是否正确
//redisPlugin.del(PREFIX_NAME + PREFIX + uuid); boolean captchaFlag = codeTemp.equalsIgnoreCase(code);
if(!captchaFlag){
return codeTemp.equalsIgnoreCase(code); throw new TokenException(TokenMsg.EXCEPTION_CAPTCHA_ERROR);
}
} }

@ -15,15 +15,16 @@
*/ */
package org.opsli.core.utils; package org.opsli.core.utils;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.collection.ListUtil;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.opsli.api.base.result.ResultVo; import org.opsli.api.base.result.ResultVo;
import org.opsli.api.web.system.dict.DictDetailApi; import org.opsli.api.web.system.dict.DictDetailApi;
import org.opsli.api.web.system.menu.MenuApi;
import org.opsli.api.wrapper.system.dict.DictWrapper;
import org.opsli.api.wrapper.system.dict.DictDetailModel; import org.opsli.api.wrapper.system.dict.DictDetailModel;
import org.opsli.api.wrapper.system.dict.DictWrapper;
import org.opsli.common.constants.CacheConstants; import org.opsli.common.constants.CacheConstants;
import org.opsli.common.constants.DictConstants; import org.opsli.common.constants.DictConstants;
import org.opsli.core.cache.local.CacheUtil; import org.opsli.core.cache.local.CacheUtil;
@ -144,7 +145,6 @@ public class DictUtil {
}finally { }finally {
// ============ 释放锁 // ============ 释放锁
redisLockPlugins.unLock(redisLock); redisLockPlugins.unLock(redisLock);
redisLock = null;
} }
// 如果名称还是 为空 则赋默认值 // 如果名称还是 为空 则赋默认值
@ -232,7 +232,6 @@ public class DictUtil {
}finally { }finally {
// ============ 释放锁 // ============ 释放锁
redisLockPlugins.unLock(redisLock); redisLockPlugins.unLock(redisLock);
redisLock = null;
} }
@ -275,7 +274,8 @@ public class DictUtil {
dictWrapperModels.add(dictWrapperModel); dictWrapperModels.add(dictWrapperModel);
} }
if(!dictWrapperModels.isEmpty()){ if(!dictWrapperModels.isEmpty()){
return dictWrapperModels; // 排序
return sortDictWrappers(dictWrapperModels);
} }
// 防止缓存穿透判断 // 防止缓存穿透判断
@ -320,7 +320,8 @@ public class DictUtil {
dictWrapperModels.add(dictWrapperModel); dictWrapperModels.add(dictWrapperModel);
} }
if(!dictWrapperModels.isEmpty()){ if(!dictWrapperModels.isEmpty()){
return dictWrapperModels; // 排序
return sortDictWrappers(dictWrapperModels);
} }
@ -346,7 +347,6 @@ public class DictUtil {
}finally { }finally {
// ============ 释放锁 // ============ 释放锁
redisLockPlugins.unLock(redisLock); redisLockPlugins.unLock(redisLock);
redisLock = null;
} }
@ -361,6 +361,28 @@ public class DictUtil {
log.error(e.getMessage(),e); log.error(e.getMessage(),e);
dictWrapperModels = Lists.newArrayList(); dictWrapperModels = Lists.newArrayList();
} }
// 排序
return sortDictWrappers(dictWrapperModels);
}
/**
* 字典排序
* @param dictWrapperModels
* @return
*/
private static List<DictWrapper> sortDictWrappers(List<DictWrapper> dictWrapperModels) {
ListUtil.sort(dictWrapperModels, (o1, o2) -> {
int oInt1 = Integer.MAX_VALUE;
int oInt2 = Integer.MAX_VALUE;
if(o1 != null && o1.getModel() != null){
oInt1 = o1.getModel().getSortNo()==null?oInt1:o1.getModel().getSortNo();
}
if(o2 != null && o2.getModel() != null){
oInt2 = o2.getModel().getSortNo()==null?oInt2:o2.getModel().getSortNo();
}
return Integer.compare(oInt1, oInt2);
});
return dictWrapperModels; return dictWrapperModels;
} }
@ -374,13 +396,13 @@ public class DictUtil {
* @return * @return
*/ */
public static void put(DictWrapper model){ public static void put(DictWrapper model){
// 清除缓存
DictUtil.del(model);
CacheUtil.putEdenHash(DictConstants.CACHE_PREFIX_NAME + model.getTypeCode(), CacheUtil.putEdenHash(DictConstants.CACHE_PREFIX_NAME + model.getTypeCode(),
model.getDictName(), model.getModel()); model.getDictName(), model.getModel());
CacheUtil.putEdenHash(DictConstants.CACHE_PREFIX_VALUE + model.getTypeCode(), CacheUtil.putEdenHash(DictConstants.CACHE_PREFIX_VALUE + model.getTypeCode(),
model.getDictValue(), model.getModel()); model.getDictValue(), model.getModel());
// 删除 空属性 拦截
CacheUtil.delNilFlag(DictConstants.CACHE_PREFIX_NAME + model.getTypeCode() + ":" + model.getDictName());
CacheUtil.delNilFlag(DictConstants.CACHE_PREFIX_VALUE + model.getTypeCode() + ":" + model.getTypeCode());
} }
/** /**
@ -388,12 +410,64 @@ public class DictUtil {
* @param model 字典模型 * @param model 字典模型
* @return * @return
*/ */
public static void del(DictWrapper model){ public static boolean del(DictWrapper model){
CacheUtil.delEdenHash(DictConstants.CACHE_PREFIX_NAME + model.getTypeCode(), model.getDictName()); if(model == null){
CacheUtil.delEdenHash(DictConstants.CACHE_PREFIX_VALUE + model.getTypeCode(), model.getDictValue()); return true;
// 删除 空属性 拦截 }
CacheUtil.delNilFlag(DictConstants.CACHE_PREFIX_NAME + model.getTypeCode() + ":" + model.getDictName());
CacheUtil.delNilFlag(DictConstants.CACHE_PREFIX_VALUE + model.getTypeCode() + ":" + model.getTypeCode()); boolean hasNilFlagByName = CacheUtil.hasNilFlag(DictConstants.CACHE_PREFIX_NAME +
model.getTypeCode() + ":" + model.getDictName());
boolean hasNilFlagByValue = CacheUtil.hasNilFlag(DictConstants.CACHE_PREFIX_VALUE +
model.getTypeCode() + ":" + model.getDictValue());
DictWrapper dictByName = CacheUtil.get(DictConstants.CACHE_PREFIX_NAME + model.getTypeCode(),
DictWrapper.class);
DictWrapper dictByValue = CacheUtil.get(DictConstants.CACHE_PREFIX_VALUE + model.getTypeCode(),
DictWrapper.class);
// 计数器
int count = 0;
if (hasNilFlagByName){
count++;
// 清除空拦截
boolean tmp = CacheUtil.delNilFlag(DictConstants.CACHE_PREFIX_NAME +
model.getTypeCode() + ":" + model.getDictName());
if(tmp){
count--;
}
}
if (hasNilFlagByValue){
count++;
// 清除空拦截
boolean tmp = CacheUtil.delNilFlag(DictConstants.CACHE_PREFIX_VALUE +
model.getTypeCode() + ":" + model.getDictValue());
if(tmp){
count--;
}
}
if (dictByName != null){
count++;
// 清除空拦截
boolean tmp = CacheUtil.delEdenHash(DictConstants.CACHE_PREFIX_NAME +
model.getTypeCode(), model.getDictName());
if(tmp){
count--;
}
}
if (dictByValue != null){
count++;
// 清除空拦截
boolean tmp = CacheUtil.delEdenHash(DictConstants.CACHE_PREFIX_VALUE +
model.getTypeCode(), model.getDictValue());
if(tmp){
count--;
}
}
return count == 0;
} }
/** /**
@ -401,11 +475,21 @@ public class DictUtil {
* @param typeCode 字典编号 * @param typeCode 字典编号
* @return * @return
*/ */
public static void delAll(String typeCode){ public static boolean delAll(String typeCode){
List<DictWrapper> dictWrapperList = DictUtil.getDictList(typeCode); List<DictWrapper> dictWrapperList = DictUtil.getDictList(typeCode);
if(CollUtil.isEmpty(dictWrapperList)){
return true;
}
// 计数器
int count = dictWrapperList.size();
for (DictWrapper dictWrapperModel : dictWrapperList) { for (DictWrapper dictWrapperModel : dictWrapperList) {
DictUtil.del(dictWrapperModel); boolean tmp = DictUtil.del(dictWrapperModel);
if(tmp){
count--;
}
} }
return count == 0;
} }

@ -1,5 +1,6 @@
package org.opsli.core.utils; package org.opsli.core.utils;
import cn.hutool.core.codec.Base64;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.auth0.jwt.JWT; import com.auth0.jwt.JWT;
import com.auth0.jwt.JWTVerifier; import com.auth0.jwt.JWTVerifier;
@ -8,11 +9,11 @@ import com.auth0.jwt.exceptions.JWTDecodeException;
import com.auth0.jwt.interfaces.DecodedJWT; import com.auth0.jwt.interfaces.DecodedJWT;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.opsli.common.constants.SignConstants; import org.opsli.common.constants.SignConstants;
import org.opsli.common.constants.TokenTypeConstants;
import org.opsli.common.exception.JwtException; import org.opsli.common.exception.JwtException;
import org.opsli.common.utils.Props; import org.opsli.common.utils.Props;
import org.opsli.core.msg.JwtMsg; import org.opsli.core.msg.JwtMsg;
import java.io.UnsupportedEncodingException;
import java.util.Date; import java.util.Date;
/** /**
@ -47,17 +48,11 @@ public final class JwtUtil {
* @return boolean 是否正确 * @return boolean 是否正确
*/ */
public static boolean verify(String token) { public static boolean verify(String token) {
try { String secret = getClaim(token, SignConstants.ACCOUNT) + Base64.decodeStr(ENCRYPT_JWT_KEY);
String secret = getClaim(token, SignConstants.ACCOUNT) + Base64ConvertUtil.decode(ENCRYPT_JWT_KEY); Algorithm algorithm = Algorithm.HMAC256(secret);
Algorithm algorithm = Algorithm.HMAC256(secret); JWTVerifier verifier = JWT.require(algorithm).build();
JWTVerifier verifier = JWT.require(algorithm).build(); verifier.verify(token);
verifier.verify(token); return true;
return true;
} catch (UnsupportedEncodingException e) {
// 认证解密异常
String msg = StrUtil.format(JwtMsg.EXCEPTION_TOKEN.getMessage(), e.getMessage());
throw new JwtException(JwtMsg.EXCEPTION_TOKEN.getCode(), msg);
}
} }
/** /**
@ -79,34 +74,31 @@ public final class JwtUtil {
/** /**
* 生成签名 * 生成签名
* @param tokenType token类型
* @param account 帐号 * @param account 帐号
* @param userId 用户ID
* @return java.lang.String 返回加密的Token * @return java.lang.String 返回加密的Token
*/ */
public static String sign(String account, String userId) { public static String sign(String tokenType, String account, String userId) {
try { // 帐号加JWT私钥加密
// 帐号加JWT私钥加密 String secret = account + Base64.decodeStr(ENCRYPT_JWT_KEY);
String secret = account + Base64ConvertUtil.decode(ENCRYPT_JWT_KEY); // 此处过期时间是以毫秒为单位,所以乘以1000
// 此处过期时间是以毫秒为单位,所以乘以1000 Date date = new Date(System.currentTimeMillis() + EXPIRE);
Date date = new Date(System.currentTimeMillis() + EXPIRE); Algorithm algorithm = Algorithm.HMAC256(secret);
Algorithm algorithm = Algorithm.HMAC256(secret); // 附带account帐号信息
// 附带account帐号信息 return JWT.create()
return JWT.create() .withClaim(SignConstants.TYPE, tokenType)
.withClaim(SignConstants.ACCOUNT, account) .withClaim(SignConstants.ACCOUNT, account)
.withClaim(SignConstants.USER_ID, userId) .withClaim(SignConstants.USER_ID, userId)
.withClaim(SignConstants.TIMESTAMP, String.valueOf(System.currentTimeMillis())) .withClaim(SignConstants.TIMESTAMP, String.valueOf(System.currentTimeMillis()))
// token 过期时间 // token 过期时间
.withExpiresAt(date) .withExpiresAt(date)
.sign(algorithm); .sign(algorithm);
} catch (UnsupportedEncodingException e) {
// 加密异常
String msg = StrUtil.format(JwtMsg.EXCEPTION_ENCODE.getMessage(), e.getMessage());
throw new JwtException(JwtMsg.EXCEPTION_ENCODE.getCode(), msg);
}
} }
public static void main(String[] args) { public static void main(String[] args) {
String aaaaaa = JwtUtil.sign("aaaaaa","123123"); String aaaaaa = JwtUtil.sign(TokenTypeConstants.TYPE_SYSTEM, "aaaaaa","123123");
boolean verify = JwtUtil.verify(aaaaaa); boolean verify = JwtUtil.verify(aaaaaa);
System.out.println(aaaaaa); System.out.println(aaaaaa);

@ -15,6 +15,8 @@
*/ */
package org.opsli.core.utils; package org.opsli.core.utils;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.convert.Convert;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
@ -26,6 +28,7 @@ import org.opsli.api.wrapper.system.logs.LogsModel;
import org.opsli.api.wrapper.system.menu.MenuModel; import org.opsli.api.wrapper.system.menu.MenuModel;
import org.opsli.api.wrapper.system.user.UserModel; import org.opsli.api.wrapper.system.user.UserModel;
import org.opsli.common.annotation.EnableLog; import org.opsli.common.annotation.EnableLog;
import org.opsli.common.annotation.RequiresPermissionsCus;
import org.opsli.common.utils.IPUtil; import org.opsli.common.utils.IPUtil;
import org.opsli.core.thread.LogsThreadPool; import org.opsli.core.thread.LogsThreadPool;
import org.springframework.web.context.request.RequestAttributes; import org.springframework.web.context.request.RequestAttributes;
@ -137,10 +140,18 @@ public final class LogUtil {
// 如果title 还为空 则系统自动赋值 // 如果title 还为空 则系统自动赋值
if(StringUtils.isEmpty(logsModel.getTitle())){ if(StringUtils.isEmpty(logsModel.getTitle())){
RequiresPermissions permissions = method.getAnnotation(RequiresPermissions.class); RequiresPermissions permissions = method.getAnnotation(RequiresPermissions.class);
RequiresPermissionsCus permissionsCus = method.getAnnotation(RequiresPermissionsCus.class);
List<String> values = null;
if(permissions != null){ if(permissions != null){
String[] values = permissions.value(); values = Convert.toList(String.class, permissions.value());
if(values.length > 0){ }else if(permissionsCus != null){
String perms = values[0]; values = Convert.toList(String.class, permissionsCus.value());
}
if(CollUtil.isNotEmpty(values)){
if(values != null && values.size() > 0){
String perms = values.get(0);
// 获得当前用户所持有菜单 // 获得当前用户所持有菜单
List<MenuModel> menuListByUserId = UserUtil.getMenuListByUserId(user.getId()); List<MenuModel> menuListByUserId = UserUtil.getMenuListByUserId(user.getId());
if(menuListByUserId != null){ if(menuListByUserId != null){

@ -19,11 +19,9 @@ import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.opsli.api.base.result.ResultVo; import org.opsli.api.base.result.ResultVo;
import org.opsli.api.web.system.menu.MenuApi; import org.opsli.api.web.system.menu.MenuApi;
import org.opsli.api.web.system.user.UserApi;
import org.opsli.api.wrapper.system.menu.MenuModel; import org.opsli.api.wrapper.system.menu.MenuModel;
import org.opsli.core.cache.local.CacheUtil; import org.opsli.core.cache.local.CacheUtil;
import org.opsli.core.cache.pushsub.msgs.MenuMsgFactory; import org.opsli.core.cache.pushsub.msgs.MenuMsgFactory;
import org.opsli.core.cache.pushsub.msgs.OrgMsgFactory;
import org.opsli.plugins.redis.RedisLockPlugins; import org.opsli.plugins.redis.RedisLockPlugins;
import org.opsli.plugins.redis.RedisPlugin; import org.opsli.plugins.redis.RedisPlugin;
import org.opsli.plugins.redis.lock.RedisLock; import org.opsli.plugins.redis.lock.RedisLock;
@ -114,7 +112,6 @@ public class MenuUtil {
}finally { }finally {
// ============ 释放锁 // ============ 释放锁
redisLockPlugins.unLock(redisLock); redisLockPlugins.unLock(redisLock);
redisLock = null;
} }
if(menuModel == null){ if(menuModel == null){
@ -134,29 +131,42 @@ public class MenuUtil {
* @param menu * @param menu
* @return * @return
*/ */
public static void refreshMenu(MenuModel menu){ public static boolean refreshMenu(MenuModel menu){
if(menu == null || StringUtils.isEmpty(menu.getMenuCode())){ if(menu == null || StringUtils.isEmpty(menu.getMenuCode())){
return; return true;
} }
// 计数器
int count = 0;
MenuModel menuModel = CacheUtil.get(PREFIX_CODE + menu.getMenuCode(), MenuModel.class); MenuModel menuModel = CacheUtil.get(PREFIX_CODE + menu.getMenuCode(), MenuModel.class);
boolean hasNilFlag = CacheUtil.hasNilFlag(PREFIX_CODE + menu.getMenuCode()); boolean hasNilFlag = CacheUtil.hasNilFlag(PREFIX_CODE + menu.getMenuCode());
// 只要不为空 则执行刷新 // 只要不为空 则执行刷新
if (hasNilFlag){ if (hasNilFlag){
count++;
// 清除空拦截 // 清除空拦截
CacheUtil.delNilFlag(PREFIX_CODE + menu.getMenuCode()); boolean tmp = CacheUtil.delNilFlag(PREFIX_CODE + menu.getMenuCode());
if(tmp){
count--;
}
} }
if(menuModel != null){ if(menuModel != null){
count++;
// 先删除 // 先删除
CacheUtil.del(PREFIX_CODE + menu.getMenuCode()); boolean tmp = CacheUtil.del(PREFIX_CODE + menu.getMenuCode());
if(tmp){
count--;
}
// 发送通知消息 // 发送通知消息
redisPlugin.sendMessage( redisPlugin.sendMessage(
MenuMsgFactory.createMenuMsg(menu) MenuMsgFactory.createMenuMsg(menu)
); );
} }
return count == 0;
} }

@ -18,12 +18,9 @@ package org.opsli.core.utils;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.opsli.api.base.result.ResultVo; import org.opsli.api.base.result.ResultVo;
import org.opsli.api.web.system.menu.MenuApi;
import org.opsli.api.web.system.user.UserApi; import org.opsli.api.web.system.user.UserApi;
import org.opsli.api.wrapper.system.menu.MenuModel;
import org.opsli.api.wrapper.system.user.UserOrgRefModel; import org.opsli.api.wrapper.system.user.UserOrgRefModel;
import org.opsli.core.cache.local.CacheUtil; import org.opsli.core.cache.local.CacheUtil;
import org.opsli.core.cache.pushsub.msgs.MenuMsgFactory;
import org.opsli.core.cache.pushsub.msgs.OrgMsgFactory; import org.opsli.core.cache.pushsub.msgs.OrgMsgFactory;
import org.opsli.plugins.redis.RedisLockPlugins; import org.opsli.plugins.redis.RedisLockPlugins;
import org.opsli.plugins.redis.RedisPlugin; import org.opsli.plugins.redis.RedisPlugin;
@ -115,7 +112,6 @@ public class OrgUtil {
}finally { }finally {
// ============ 释放锁 // ============ 释放锁
redisLockPlugins.unLock(redisLock); redisLockPlugins.unLock(redisLock);
redisLock = null;
} }
if(orgRefModel == null){ if(orgRefModel == null){
@ -135,29 +131,41 @@ public class OrgUtil {
* @param userId * @param userId
* @return * @return
*/ */
public static void refreshMenu(String userId){ public static boolean refreshOrg(String userId){
if(StringUtils.isEmpty(userId)){ if(StringUtils.isEmpty(userId)){
return; return true;
} }
// 计数器
int count = 0;
UserOrgRefModel orgRefModel = CacheUtil.get(PREFIX_CODE + userId, UserOrgRefModel.class); UserOrgRefModel orgRefModel = CacheUtil.get(PREFIX_CODE + userId, UserOrgRefModel.class);
boolean hasNilFlag = CacheUtil.hasNilFlag(PREFIX_CODE + userId); boolean hasNilFlag = CacheUtil.hasNilFlag(PREFIX_CODE + userId);
// 只要不为空 则执行刷新 // 只要不为空 则执行刷新
if (hasNilFlag){ if (hasNilFlag){
count++;
// 清除空拦截 // 清除空拦截
CacheUtil.delNilFlag(PREFIX_CODE + userId); boolean tmp = CacheUtil.delNilFlag(PREFIX_CODE + userId);
if(tmp){
count--;
}
} }
if(orgRefModel != null){ if(orgRefModel != null){
count++;
// 先删除 // 先删除
CacheUtil.del(PREFIX_CODE + userId); boolean tmp = CacheUtil.del(PREFIX_CODE + userId);
if(tmp){
count--;
}
// 发送通知消息 // 发送通知消息
redisPlugin.sendMessage( redisPlugin.sendMessage(
OrgMsgFactory.createOrgMsg(orgRefModel) OrgMsgFactory.createOrgMsg(orgRefModel)
); );
} }
return count == 0;
} }

@ -0,0 +1,129 @@
/**
* Copyright 2020 OPSLI 快速开发平台 https://www.opsli.com
* <p>
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
* <p>
* http://www.apache.org/licenses/LICENSE-2.0
* <p>
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations under
* the License.
*/
package org.opsli.core.utils;
import cn.hutool.core.collection.CollUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.opsli.api.wrapper.system.user.UserModel;
import org.opsli.common.constants.CacheConstants;
import org.opsli.common.utils.Props;
import org.opsli.plugins.redis.RedisLockPlugins;
import org.opsli.plugins.redis.RedisPlugin;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.context.annotation.Lazy;
import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Component;
import javax.servlet.http.HttpServletRequest;
import java.util.List;
import java.util.Map;
import java.util.Set;
import static org.opsli.common.constants.OrderConstants.UTIL_ORDER;
/**
* @Author: 周鹏程
* @CreateTime: 2020-09-22 11:17
* @Description: 搜索历史工具类
*/
@Slf4j
@Order(UTIL_ORDER)
@Component
@Lazy(false)
@AutoConfigureAfter({RedisPlugin.class , RedisLockPlugins.class})
public class SearchHisUtil {
/** 搜索历史缓存数据KEY */
private static final int DEFAULT_COUNT = 10;
/**
* 热点数据前缀
*/
public static final String PREFIX_NAME;
private static final String CACHE_PREFIX = "his:username:";
/** Redis插件 */
private static RedisPlugin redisPlugin;
static {
Props props = new Props("application.yaml");
PREFIX_NAME = props.getStr("spring.cache-conf.prefix", CacheConstants.PREFIX_NAME) + ":";
}
/**
* 获得搜索历史记录
* @param key 类型
* @param count 获取数量
*/
public static Set<Object> getSearchHis(HttpServletRequest request, String key, Integer count) {
if(request == null || StringUtils.isEmpty(key)){
return null;
}
if(count == null){
count = DEFAULT_COUNT;
}
// 获得当前用户
UserModel user = UserUtil.getUser();
String cacheKey = PREFIX_NAME + CACHE_PREFIX + user.getUsername() + ":" + key;
return redisPlugin.zReverseRange(cacheKey, 0, count - 1);
}
/**
* 存放搜索历史记录
* @param request
* @param keys 搜索key
*/
public static void putSearchHis(HttpServletRequest request, List<String> keys) {
if(request == null || CollUtil.isEmpty(keys)){
return;
}
// 获得当前用户
UserModel user = UserUtil.getUser();
Map<String, String[]> parameterMap = request.getParameterMap();
for (String key : keys) {
String[] values = parameterMap.get(key);
if(values == null || values.length == 0){
continue;
}
String cacheKey = PREFIX_NAME + CACHE_PREFIX + user.getUsername() + ":" + key;
String val = values[0];
// 记录
redisPlugin.zIncrementScore(cacheKey, val, 1);
}
}
// ===================================
@Autowired
public void setRedisPlugin(RedisPlugin redisPlugin) {
SearchHisUtil.redisPlugin = redisPlugin;
}
}

@ -1,29 +1,31 @@
package org.opsli.core.utils; package org.opsli.core.utils;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.Validate; import org.apache.commons.lang3.Validate;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.DisposableBean; import org.springframework.beans.factory.DisposableBean;
import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware; import org.springframework.context.ApplicationContextAware;
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.context.annotation.Lazy; import org.springframework.context.annotation.Lazy;
import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
/** /**
* 以静态变量保存Spring ApplicationContext, 可在任何代码任何地方任何时候取出ApplicaitonContext. * 以静态变量保存Spring ApplicationContext, 可在任何代码任何地方任何时候取出ApplicationContext.
* *
* 针对项目 启动后好使, 项目启动前 Bean注册时不好使
* @author Zaric * @author Zaric
* @date 2016-5-29 下午1:25:40 * @date 2016-5-29 下午1:25:40
*/ */
@Order(-1)
@Component @Component
@Lazy(false) @Lazy(false)
@Slf4j
public class SpringContextHolder implements ApplicationContextAware, DisposableBean { public class SpringContextHolder implements ApplicationContextAware, DisposableBean {
private static ApplicationContext applicationContext = null; private static ApplicationContext applicationContext = null;
private static Logger logger = LoggerFactory.getLogger(SpringContextHolder.class);
/** /**
* 从静态变量applicationContext中取得Bean, 自动转型为所赋值对象的类型. * 从静态变量applicationContext中取得Bean, 自动转型为所赋值对象的类型.
*/ */
@ -41,23 +43,43 @@ public class SpringContextHolder implements ApplicationContextAware, DisposableB
return applicationContext.getBean(requiredType); return applicationContext.getBean(requiredType);
} }
/**
* 注册Bean对象
* @param beanName beanName
* @param bean bean对象
* @param <T> 泛型
*/
public static <T> boolean registerBean(String beanName, T bean) {
assertContextInjected();
boolean ret = false;
ConfigurableApplicationContext context = (ConfigurableApplicationContext) applicationContext;
if(context != null){
try {
context.getBeanFactory().registerSingleton(beanName, bean);
ret = true;
}catch (Exception e){
log.error(e.getMessage(), e);
}
}
return ret;
}
/** /**
* 清除SpringContextHolder中的ApplicationContext为Null. * 清除SpringContextHolder中的ApplicationContext为Null.
*/ */
public static void clearHolder() { public static void clearHolder() {
if (logger.isDebugEnabled()){ if (log.isDebugEnabled()){
logger.debug("清除SpringContextHolder中的ApplicationContext:" + applicationContext); log.debug("清除SpringContextHolder中的ApplicationContext:" + applicationContext);
} }
applicationContext = null; applicationContext = null;
} }
/** /**
* 检查ApplicationContext不为空. * 检查ApplicationContext不为空.
*/ */
private static void assertContextInjected() { private static void assertContextInjected() {
Validate.validState(applicationContext != null, "applicaitonContext属性未注入, 请在applicationContext.xml中定义SpringContextHolder."); Validate.validState(applicationContext != null, "applicationContext属性未注入.");
} }
// ================== // ==================
@ -74,8 +96,9 @@ public class SpringContextHolder implements ApplicationContextAware, DisposableB
* 实现DisposableBean接口, 在Context关闭时清理静态变量. * 实现DisposableBean接口, 在Context关闭时清理静态变量.
*/ */
@Override @Override
public void destroy() throws Exception { public void destroy(){
SpringContextHolder.clearHolder(); SpringContextHolder.clearHolder();
} }
} }

@ -0,0 +1,191 @@
/**
* Copyright 2020 OPSLI 快速开发平台 https://www.opsli.com
* <p>
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
* <p>
* http://www.apache.org/licenses/LICENSE-2.0
* <p>
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations under
* the License.
*/
package org.opsli.core.utils;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.opsli.api.base.result.ResultVo;
import org.opsli.api.web.system.tenant.TenantApi;
import org.opsli.api.wrapper.system.tenant.TenantModel;
import org.opsli.core.cache.local.CacheUtil;
import org.opsli.core.cache.pushsub.msgs.TenantMsgFactory;
import org.opsli.plugins.redis.RedisLockPlugins;
import org.opsli.plugins.redis.RedisPlugin;
import org.opsli.plugins.redis.lock.RedisLock;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.context.annotation.Lazy;
import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Component;
import static org.opsli.common.constants.OrderConstants.UTIL_ORDER;
/**
* @BelongsProject: opsli-boot
* @BelongsPackage: org.opsli.core.utils
* @Author: Parker
* @CreateTime: 2020-09-19 20:03
* @Description: 租户工具类
*/
@Slf4j
@Order(UTIL_ORDER)
@Component
@AutoConfigureAfter({RedisPlugin.class , RedisLockPlugins.class, TenantApi.class})
@Lazy(false)
public class TenantUtil {
/** 前缀 */
public static final String PREFIX_CODE = "tenant:id:";
/** Redis插件 */
private static RedisPlugin redisPlugin;
/** Redis分布式锁 */
private static RedisLockPlugins redisLockPlugins;
/** 租户 Api */
private static TenantApi tenantApi;
/**
* 根据 tenantId 获得租户
* @param tenantId
* @return
*/
public static TenantModel getTenant(String tenantId){
// 先从缓存里拿
TenantModel tenantModel = CacheUtil.get(PREFIX_CODE + tenantId, TenantModel.class);
if (tenantModel != null){
return tenantModel;
}
// 拿不到 --------
// 防止缓存穿透判断
boolean hasNilFlag = CacheUtil.hasNilFlag(PREFIX_CODE + tenantId);
if(hasNilFlag){
return null;
}
// 锁凭证 redisLock 贯穿全程
RedisLock redisLock = new RedisLock();
redisLock.setLockName(PREFIX_CODE + tenantId)
.setAcquireTimeOut(3000L)
.setLockTimeOut(5000L);
try {
// 这里增加分布式锁 防止缓存击穿
// ============ 尝试加锁
redisLock = redisLockPlugins.tryLock(redisLock);
if(redisLock == null){
return null;
}
// 如果获得锁 则 再次检查缓存里有没有, 如果有则直接退出, 没有的话才发起数据库请求
tenantModel = CacheUtil.get(PREFIX_CODE + tenantId, TenantModel.class);
if (tenantModel != null){
return tenantModel;
}
// 查询数据库
ResultVo<TenantModel> resultVo = tenantApi.getTenantByUsable(tenantId);
if(resultVo.isSuccess()){
tenantModel = resultVo.getData();
// 存入缓存
CacheUtil.put(PREFIX_CODE + tenantId, tenantModel);
}
}catch (Exception e){
log.error(e.getMessage(),e);
}finally {
// ============ 释放锁
redisLockPlugins.unLock(redisLock);
}
if(tenantModel == null){
// 设置空变量 用于防止穿透判断
CacheUtil.putNilFlag(PREFIX_CODE + tenantId);
return null;
}
return tenantModel;
}
// ============== 刷新缓存 ==============
/**
* 刷新租户 - 删就完了
* @param tenantId
* @return
*/
public static boolean refreshTenant(String tenantId){
if(StringUtils.isEmpty(tenantId)){
return true;
}
// 计数器
int count = 0;
TenantModel tenantModel = CacheUtil.get(PREFIX_CODE + tenantId, TenantModel.class);
boolean hasNilFlag = CacheUtil.hasNilFlag(PREFIX_CODE + tenantId);
// 只要不为空 则执行刷新
if (hasNilFlag){
count++;
// 清除空拦截
boolean tmp = CacheUtil.delNilFlag(PREFIX_CODE + tenantId);
if(tmp){
count--;
}
}
if(tenantModel != null){
count++;
// 先删除
boolean tmp = CacheUtil.del(PREFIX_CODE + tenantId);
if(tmp){
count--;
}
// 发送通知消息
redisPlugin.sendMessage(
TenantMsgFactory.createTenantMsg(tenantModel)
);
}
return count == 0;
}
// =====================================
@Autowired
public void setRedisPlugin(RedisPlugin redisPlugin) {
TenantUtil.redisPlugin = redisPlugin;
}
@Autowired
public void setRedisLockPlugins(RedisLockPlugins redisLockPlugins) {
TenantUtil.redisLockPlugins = redisLockPlugins;
}
@Autowired
public void setTenantApi(TenantApi tenantApi) {
TenantUtil.tenantApi = tenantApi;
}
}

@ -29,13 +29,12 @@ import org.opsli.api.wrapper.system.user.UserModel;
import org.opsli.common.constants.CacheConstants; import org.opsli.common.constants.CacheConstants;
import org.opsli.common.constants.SignConstants; import org.opsli.common.constants.SignConstants;
import org.opsli.common.constants.TokenConstants; import org.opsli.common.constants.TokenConstants;
import org.opsli.common.exception.ServiceException; import org.opsli.common.constants.TokenTypeConstants;
import org.opsli.common.exception.TokenException; import org.opsli.common.exception.TokenException;
import org.opsli.common.utils.Props; import org.opsli.common.utils.Props;
import org.opsli.core.msg.TokenMsg; import org.opsli.core.msg.TokenMsg;
import org.opsli.plugins.redis.RedisPlugin; import org.opsli.plugins.redis.RedisPlugin;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.context.annotation.Lazy; import org.springframework.context.annotation.Lazy;
import org.springframework.core.annotation.Order; import org.springframework.core.annotation.Order;
@ -116,7 +115,7 @@ public class UserTokenUtil {
); );
// 生成 Token 包含 username userId timestamp // 生成 Token 包含 username userId timestamp
String signToken = JwtUtil.sign(user.getUsername(), user.getId()); String signToken = JwtUtil.sign(TokenTypeConstants.TYPE_SYSTEM, user.getUsername(), user.getId());
// 生成MD5 16进制码 用于缩减存储 // 生成MD5 16进制码 用于缩减存储
String signTokenHex = new Md5Hash(signToken).toHex(); String signTokenHex = new Md5Hash(signToken).toHex();
@ -159,7 +158,7 @@ public class UserTokenUtil {
String userId = ""; String userId = "";
try { try {
userId = JwtUtil.getClaim(token, SignConstants.USER_ID); userId = JwtUtil.getClaim(token, SignConstants.USER_ID);
}catch (Exception e){} }catch (Exception ignored){}
return userId; return userId;
} }
@ -244,7 +243,7 @@ public class UserTokenUtil {
/** /**
* 验证锁定账号 * 验证锁定账号
* @param username * @param username 用户名
*/ */
public static void verifyLockAccount(String username){ public static void verifyLockAccount(String username){
// 判断账号是否临时锁定 // 判断账号是否临时锁定
@ -273,9 +272,9 @@ public class UserTokenUtil {
/** /**
* 锁定账号 * 锁定账号
* @param username * @param username 用户名
*/ */
public static ResultVo<?> lockAccount(String username){ public static TokenMsg lockAccount(String username){
// 如果失败次数 超过阈值 则锁定账号 // 如果失败次数 超过阈值 则锁定账号
Long slipNum = redisPlugin.increment(ACCOUNT_SLIP_COUNT_PREFIX + username); Long slipNum = redisPlugin.increment(ACCOUNT_SLIP_COUNT_PREFIX + username);
if (slipNum != null){ if (slipNum != null){
@ -291,20 +290,12 @@ public class UserTokenUtil {
} }
} }
Map<String,Boolean> flagMap = Maps.newHashMap(); return TokenMsg.EXCEPTION_LOGIN_ACCOUNT_NO;
flagMap.put("izVerify", false);
if(slipNum != null && slipNum >= ACCOUNT_SLIP_VERIFY_COUNT){
flagMap.put("izVerify", true);
}
return ResultVo.error(TokenMsg.EXCEPTION_LOGIN_ACCOUNT_NO.getCode(),
TokenMsg.EXCEPTION_LOGIN_ACCOUNT_NO.getMessage(),
flagMap
);
} }
/** /**
* 获得当前失败次数 * 获得当前失败次数
* @param username * @param username 用户名
*/ */
public static long getSlipCount(String username){ public static long getSlipCount(String username){
long count = 0L; long count = 0L;
@ -320,7 +311,7 @@ public class UserTokenUtil {
/** /**
* 清除锁定账号 * 清除锁定账号
* @param username * @param username 用户名
*/ */
public static void clearLockAccount(String username){ public static void clearLockAccount(String username){
// 删除失败次数记录 // 删除失败次数记录

@ -15,6 +15,7 @@
*/ */
package org.opsli.core.utils; package org.opsli.core.utils;
import cn.hutool.core.convert.Convert;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
@ -29,7 +30,6 @@ import org.opsli.common.api.TokenThreadLocal;
import org.opsli.common.exception.TokenException; import org.opsli.common.exception.TokenException;
import org.opsli.common.utils.Props; import org.opsli.common.utils.Props;
import org.opsli.core.cache.local.CacheUtil; import org.opsli.core.cache.local.CacheUtil;
import org.opsli.core.cache.pushsub.msgs.MenuMsgFactory;
import org.opsli.core.cache.pushsub.msgs.UserMsgFactory; import org.opsli.core.cache.pushsub.msgs.UserMsgFactory;
import org.opsli.core.msg.TokenMsg; import org.opsli.core.msg.TokenMsg;
import org.opsli.plugins.redis.RedisLockPlugins; import org.opsli.plugins.redis.RedisLockPlugins;
@ -162,7 +162,6 @@ public class UserUtil {
}finally { }finally {
// ============ 释放锁 // ============ 释放锁
redisLockPlugins.unLock(redisLock); redisLockPlugins.unLock(redisLock);
redisLock = null;
} }
if(userModel == null){ if(userModel == null){
@ -226,7 +225,6 @@ public class UserUtil {
}finally { }finally {
// ============ 释放锁 // ============ 释放锁
redisLockPlugins.unLock(redisLock); redisLockPlugins.unLock(redisLock);
redisLock = null;
} }
if(userModel == null){ if(userModel == null){
@ -250,12 +248,12 @@ public class UserUtil {
try { try {
Object obj = CacheUtil.get(PREFIX_ID_ROLES + userId); Object obj = CacheUtil.get(PREFIX_ID_ROLES + userId);
if(obj instanceof List){ if(obj instanceof List){
List<String> list = (List<String>) obj; List<String> list = Convert.toList(String.class, obj);
if (!list.isEmpty()) { if (!list.isEmpty()) {
return list; return list;
} }
}else { }else {
JSONArray jsonArray = (JSONArray) obj; JSONArray jsonArray = Convert.convert(JSONArray.class, obj);
if (jsonArray != null && !jsonArray.isEmpty()) { if (jsonArray != null && !jsonArray.isEmpty()) {
return jsonArray.toJavaList(String.class); return jsonArray.toJavaList(String.class);
} }
@ -289,12 +287,12 @@ public class UserUtil {
try { try {
Object obj = CacheUtil.get(PREFIX_ID_ROLES + userId); Object obj = CacheUtil.get(PREFIX_ID_ROLES + userId);
if(obj instanceof List){ if(obj instanceof List){
List<String> list = (List<String>) obj; List<String> list = Convert.toList(String.class, obj);
if (!list.isEmpty()) { if (!list.isEmpty()) {
return list; return list;
} }
}else { }else {
JSONArray jsonArray = (JSONArray) obj; JSONArray jsonArray = Convert.convert(JSONArray.class, obj);
if (jsonArray != null && !jsonArray.isEmpty()) { if (jsonArray != null && !jsonArray.isEmpty()) {
return jsonArray.toJavaList(String.class); return jsonArray.toJavaList(String.class);
} }
@ -313,7 +311,6 @@ public class UserUtil {
}finally { }finally {
// ============ 释放锁 // ============ 释放锁
redisLockPlugins.unLock(redisLock); redisLockPlugins.unLock(redisLock);
redisLock = null;
} }
if(roles == null || roles.size() == 0){ if(roles == null || roles.size() == 0){
@ -338,12 +335,12 @@ public class UserUtil {
try { try {
Object obj = CacheUtil.get(PREFIX_ID_PERMISSIONS + userId); Object obj = CacheUtil.get(PREFIX_ID_PERMISSIONS + userId);
if(obj instanceof List){ if(obj instanceof List){
List<String> list = (List<String>) obj; List<String> list = Convert.toList(String.class, obj);
if (!list.isEmpty()) { if (!list.isEmpty()) {
return list; return list;
} }
}else { }else {
JSONArray jsonArray = (JSONArray) obj; JSONArray jsonArray = Convert.convert(JSONArray.class, obj);
if (jsonArray != null && !jsonArray.isEmpty()) { if (jsonArray != null && !jsonArray.isEmpty()) {
return jsonArray.toJavaList(String.class); return jsonArray.toJavaList(String.class);
} }
@ -378,12 +375,12 @@ public class UserUtil {
try { try {
Object obj = CacheUtil.get(PREFIX_ID_PERMISSIONS + userId); Object obj = CacheUtil.get(PREFIX_ID_PERMISSIONS + userId);
if(obj instanceof List){ if(obj instanceof List){
List<String> list = (List<String>) obj; List<String> list = Convert.toList(String.class, obj);
if (!list.isEmpty()) { if (!list.isEmpty()) {
return list; return list;
} }
}else { }else {
JSONArray jsonArray = (JSONArray) obj; JSONArray jsonArray = Convert.convert(JSONArray.class, obj);
if (jsonArray != null && !jsonArray.isEmpty()) { if (jsonArray != null && !jsonArray.isEmpty()) {
return jsonArray.toJavaList(String.class); return jsonArray.toJavaList(String.class);
} }
@ -402,7 +399,6 @@ public class UserUtil {
}finally { }finally {
// ============ 释放锁 // ============ 释放锁
redisLockPlugins.unLock(redisLock); redisLockPlugins.unLock(redisLock);
redisLock = null;
} }
if(permissions == null || permissions.size() == 0){ if(permissions == null || permissions.size() == 0){
@ -426,7 +422,7 @@ public class UserUtil {
try { try {
Object obj = CacheUtil.get(PREFIX_ID_MENUS + userId); Object obj = CacheUtil.get(PREFIX_ID_MENUS + userId);
if(obj instanceof List){ if(obj instanceof List){
List<Object> list = (List<Object>) obj; List<?> list = Convert.toList(obj);
if (!list.isEmpty()) { if (!list.isEmpty()) {
List<MenuModel> menuModels = Lists.newArrayListWithCapacity(list.size()); List<MenuModel> menuModels = Lists.newArrayListWithCapacity(list.size());
for (Object menuObj : list) { for (Object menuObj : list) {
@ -441,7 +437,7 @@ public class UserUtil {
return menuModels; return menuModels;
} }
}else { }else {
JSONArray jsonArray = (JSONArray) obj; JSONArray jsonArray = Convert.convert(JSONArray.class, obj);
if (jsonArray != null && !jsonArray.isEmpty()) { if (jsonArray != null && !jsonArray.isEmpty()) {
return jsonArray.toJavaList(MenuModel.class); return jsonArray.toJavaList(MenuModel.class);
} }
@ -476,7 +472,7 @@ public class UserUtil {
try { try {
Object obj = CacheUtil.get(PREFIX_ID_MENUS + userId); Object obj = CacheUtil.get(PREFIX_ID_MENUS + userId);
if(obj instanceof List){ if(obj instanceof List){
List<Object> list = (List<Object>) obj; List<?> list = Convert.toList(obj);
if (!list.isEmpty()) { if (!list.isEmpty()) {
List<MenuModel> menuModels = Lists.newArrayListWithCapacity(list.size()); List<MenuModel> menuModels = Lists.newArrayListWithCapacity(list.size());
for (Object menuObj : list) { for (Object menuObj : list) {
@ -491,7 +487,7 @@ public class UserUtil {
return menuModels; return menuModels;
} }
}else { }else {
JSONArray jsonArray = (JSONArray) obj; JSONArray jsonArray = Convert.convert(JSONArray.class, obj);
if (jsonArray != null && !jsonArray.isEmpty()) { if (jsonArray != null && !jsonArray.isEmpty()) {
return jsonArray.toJavaList(MenuModel.class); return jsonArray.toJavaList(MenuModel.class);
} }
@ -510,7 +506,6 @@ public class UserUtil {
}finally { }finally {
// ============ 释放锁 // ============ 释放锁
redisLockPlugins.unLock(redisLock); redisLockPlugins.unLock(redisLock);
redisLock = null;
} }
if(menus == null || menus.size() == 0){ if(menus == null || menus.size() == 0){
@ -529,9 +524,9 @@ public class UserUtil {
* @param user * @param user
* @return * @return
*/ */
public static void refreshUser(UserModel user){ public static boolean refreshUser(UserModel user){
if(user == null || StringUtils.isEmpty(user.getId())){ if(user == null || StringUtils.isEmpty(user.getId())){
return; return true;
} }
UserModel userModelById = CacheUtil.get(PREFIX_ID + user.getId(), UserModel.class); UserModel userModelById = CacheUtil.get(PREFIX_ID + user.getId(), UserModel.class);
@ -541,27 +536,52 @@ public class UserUtil {
boolean hasNilFlagById = CacheUtil.hasNilFlag(PREFIX_ID + user.getId()); boolean hasNilFlagById = CacheUtil.hasNilFlag(PREFIX_ID + user.getId());
boolean hasNilFlagByName = CacheUtil.hasNilFlag(PREFIX_USERNAME + user.getUsername()); boolean hasNilFlagByName = CacheUtil.hasNilFlag(PREFIX_USERNAME + user.getUsername());
// 只要有一个不为空 则执行刷新 // 计数器
if (hasNilFlagById || hasNilFlagByName){ int count = 0;
if (hasNilFlagById){
count++;
// 清除空拦截 // 清除空拦截
CacheUtil.delNilFlag(PREFIX_ID + user.getId()); boolean tmp = CacheUtil.delNilFlag(PREFIX_ID + user.getId());
CacheUtil.delNilFlag(PREFIX_USERNAME + user.getUsername()); if(tmp){
count--;
}
}
if (hasNilFlagByName){
count++;
// 清除空拦截
boolean tmp = CacheUtil.delNilFlag(PREFIX_USERNAME + user.getUsername());
if(tmp){
count--;
}
} }
// 只要有一个不为空 则执行刷新 // 只要有一个不为空 则执行刷新
if (userModelById != null || userModelByUsername != null){ if (userModelById != null){
count++;
// 先删除 // 先删除
CacheUtil.del(PREFIX_ID + user.getId()); boolean tmp = CacheUtil.del(PREFIX_ID + user.getId());
CacheUtil.del(PREFIX_USERNAME + user.getUsername()); if(tmp){
// 清除空拦截 count--;
CacheUtil.delNilFlag(PREFIX_ID + user.getId()); }
CacheUtil.delNilFlag(PREFIX_USERNAME + user.getUsername()); }
// 发送通知消息 if (userModelByUsername != null){
redisPlugin.sendMessage( count++;
UserMsgFactory.createUserMsg(user) // 先删除
); boolean tmp = CacheUtil.del(PREFIX_USERNAME + user.getUsername());
if(tmp){
count--;
}
} }
// 发送通知消息
redisPlugin.sendMessage(
UserMsgFactory.createUserMsg(user)
);
return count == 0;
} }
@ -570,30 +590,38 @@ public class UserUtil {
* @param userId * @param userId
* @return * @return
*/ */
public static void refreshUserRoles(String userId){ public static boolean refreshUserRoles(String userId){
try { Object obj = CacheUtil.get(PREFIX_ID_ROLES + userId);
Object obj = CacheUtil.get(PREFIX_ID_ROLES + userId); boolean hasNilFlag = CacheUtil.hasNilFlag(PREFIX_ID_ROLES + userId);
boolean hasNilFlag = CacheUtil.hasNilFlag(PREFIX_ID_ROLES + userId);
// 只要不为空 则执行刷新
if (hasNilFlag){
// 清除空拦截
CacheUtil.delNilFlag(PREFIX_ID_ROLES + userId);
}
if(obj != null){ // 计数器
// 先删除 int count = 0;
CacheUtil.del(PREFIX_ID_ROLES + userId);
// 发送通知消息 // 只要不为空 则执行刷新
redisPlugin.sendMessage( if (hasNilFlag){
UserMsgFactory.createUserRolesMsg(userId, null) count++;
); // 清除空拦截
boolean tmp = CacheUtil.delNilFlag(PREFIX_ID_ROLES + userId);
if(tmp){
count--;
} }
}
}catch (Exception e){ if(obj != null){
log.error(e.getMessage(), e); count++;
// 先删除
boolean tmp = CacheUtil.del(PREFIX_ID_ROLES + userId);
if(tmp){
count--;
}
} }
// 发送通知消息
redisPlugin.sendMessage(
UserMsgFactory.createUserRolesMsg(userId, null)
);
return count == 0;
} }
/** /**
@ -601,29 +629,38 @@ public class UserUtil {
* @param userId * @param userId
* @return * @return
*/ */
public static void refreshUserAllPerms(String userId){ public static boolean refreshUserAllPerms(String userId){
try { Object obj = CacheUtil.get(PREFIX_ID_PERMISSIONS + userId);
Object obj = CacheUtil.get(PREFIX_ID_PERMISSIONS + userId); boolean hasNilFlag = CacheUtil.hasNilFlag(PREFIX_ID_PERMISSIONS + userId);
boolean hasNilFlag = CacheUtil.hasNilFlag(PREFIX_ID_PERMISSIONS + userId);
// 只要不为空 则执行刷新 // 计数器
if (hasNilFlag){ int count = 0;
// 清除空拦截
CacheUtil.delNilFlag(PREFIX_ID_PERMISSIONS + userId);
}
if(obj != null){ // 只要不为空 则执行刷新
// 先删除 if (hasNilFlag){
CacheUtil.del(PREFIX_ID_PERMISSIONS + userId); count++;
// 清除空拦截
boolean tmp = CacheUtil.delNilFlag(PREFIX_ID_PERMISSIONS + userId);
if(tmp){
count--;
}
}
// 发送通知消息 if(obj != null){
redisPlugin.sendMessage( count++;
UserMsgFactory.createUserPermsMsg(userId, null) // 先删除
); boolean tmp = CacheUtil.del(PREFIX_ID_PERMISSIONS + userId);
if(tmp){
count--;
} }
}catch (Exception e){
log.error(e.getMessage(), e);
} }
// 发送通知消息
redisPlugin.sendMessage(
UserMsgFactory.createUserPermsMsg(userId, null)
);
return count == 0;
} }
/** /**
@ -631,30 +668,38 @@ public class UserUtil {
* @param userId * @param userId
* @return * @return
*/ */
public static void refreshUserMenus(String userId){ public static boolean refreshUserMenus(String userId){
try { Object obj = CacheUtil.get(PREFIX_ID_MENUS + userId);
Object obj = CacheUtil.get(PREFIX_ID_MENUS + userId); boolean hasNilFlag = CacheUtil.hasNilFlag(PREFIX_ID_MENUS + userId);
boolean hasNilFlag = CacheUtil.hasNilFlag(PREFIX_ID_MENUS + userId);
// 只要不为空 则执行刷新
if (hasNilFlag){
// 清除空拦截
CacheUtil.delNilFlag(PREFIX_ID_MENUS + userId);
}
if(obj != null){ // 计数器
// 先删除 int count = 0;
CacheUtil.del(PREFIX_ID_MENUS + userId);
// 发送通知消息 // 只要不为空 则执行刷新
redisPlugin.sendMessage( if (hasNilFlag){
UserMsgFactory.createUserMenusMsg(userId, null) count++;
); // 清除空拦截
boolean tmp = CacheUtil.delNilFlag(PREFIX_ID_MENUS + userId);
if(tmp){
count--;
} }
}
}catch (Exception e){ if(obj != null){
log.error(e.getMessage(), e); count++;
// 先删除
boolean tmp = CacheUtil.del(PREFIX_ID_MENUS + userId);
if(tmp){
count--;
}
} }
// 发送通知消息
redisPlugin.sendMessage(
UserMsgFactory.createUserMenusMsg(userId, null)
);
return count == 0;
} }
/** /**

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save