diff --git a/LICENSE b/LICENSE deleted file mode 100644 index 4c2728b..0000000 --- a/LICENSE +++ /dev/null @@ -1,232 +0,0 @@ -GNU GENERAL PUBLIC LICENSE -Version 3, 29 June 2007 - -Copyright © 2007 Free Software Foundation, Inc. - -Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. - -Preamble - -The GNU General Public License is a free, copyleft license for software and other kinds of works. - -The licenses for most software and other practical works are designed to take away your freedom to share and change the works. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change all versions of a program--to make sure it remains free software for all its users. We, the Free Software Foundation, use the GNU General Public License for most of our software; it applies also to any other work released this way by its authors. You can apply it to your programs, too. - -When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for them if you wish), that you receive source code or can get it 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. - -To protect your rights, we need to prevent others from denying you these rights or asking you to surrender the rights. Therefore, you have certain responsibilities if you distribute copies of the software, or if you modify it: responsibilities to respect the freedom of others. - -For example, if you distribute copies of such a program, whether gratis or for a fee, you must pass on to the recipients the same freedoms that you received. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights. - -Developers that use the GNU GPL protect your rights with two steps: (1) assert copyright on the software, and (2) offer you this License giving you legal permission to copy, distribute and/or modify it. - -For the developers' and authors' protection, the GPL clearly explains that there is no warranty for this free software. For both users' and authors' sake, the GPL requires that modified versions be marked as changed, so that their problems will not be attributed erroneously to authors of previous versions. - -Some devices are designed to deny users access to install or run modified versions of the software inside them, although the manufacturer can do so. This is fundamentally incompatible with the aim of protecting users' freedom to change the software. The systematic pattern of such abuse occurs in the area of products for individuals to use, which is precisely where it is most unacceptable. Therefore, we have designed this version of the GPL to prohibit the practice for those products. If such problems arise substantially in other domains, we stand ready to extend this provision to those domains in future versions of the GPL, as needed to protect the freedom of users. - -Finally, every program is threatened constantly by software patents. States should not allow patents to restrict development and use of software on general-purpose computers, but in those that do, we wish to avoid the special danger that patents applied to a free program could make it effectively proprietary. To prevent this, the GPL assures that patents cannot be used to render the program non-free. - -The precise terms and conditions for copying, distribution and modification follow. - -TERMS AND CONDITIONS - -0. Definitions. - -“This License” refers to version 3 of the GNU General Public License. - -“Copyright” also means copyright-like laws that apply to other kinds of works, such as semiconductor masks. - -“The Program” refers to any copyrightable work licensed under this License. Each licensee is addressed as “you”. “Licensees” and “recipients” may be individuals or organizations. - -To “modify” a work means to copy from or adapt all or part of the work in a fashion requiring copyright permission, other than the making of an exact copy. The resulting work is called a “modified version” of the earlier work or a work “based on” the earlier work. - -A “covered work” means either the unmodified Program or a work based on the Program. - -To “propagate” a work means to do anything with it that, without permission, would make you directly or secondarily liable for infringement under applicable copyright law, except executing it on a computer or modifying a private copy. Propagation includes copying, distribution (with or without modification), making available to the public, and in some countries other activities as well. - -To “convey” a work means any kind of propagation that enables other parties to make or receive copies. Mere interaction with a user through a computer network, with no transfer of a copy, is not conveying. - -An interactive user interface displays “Appropriate Legal Notices” to the extent that it includes a convenient and prominently visible feature that (1) displays an appropriate copyright notice, and (2) tells the user that there is no warranty for the work (except to the extent that warranties are provided), that licensees may convey the work under this License, and how to view a copy of this License. If the interface presents a list of user commands or options, such as a menu, a prominent item in the list meets this criterion. - -1. Source Code. -The “source code” for a work means the preferred form of the work for making modifications to it. “Object code” means any non-source form of a work. - -A “Standard Interface” means an interface that either is an official standard defined by a recognized standards body, or, in the case of interfaces specified for a particular programming language, one that is widely used among developers working in that language. - -The “System Libraries” of an executable work include anything, other than the work as a whole, that (a) is included in the normal form of packaging a Major Component, but which is not part of that Major Component, and (b) serves only to enable use of the work with that Major Component, or to implement a Standard Interface for which an implementation is available to the public in source code form. A “Major Component”, in this context, means a major essential component (kernel, window system, and so on) of the specific operating system (if any) on which the executable work runs, or a compiler used to produce the work, or an object code interpreter used to run it. - -The “Corresponding Source” for a work in object code form means all the source code needed to generate, install, and (for an executable work) run the object code and to modify the work, including scripts to control those activities. However, it does not include the work's System Libraries, or general-purpose tools or generally available free programs which are used unmodified in performing those activities but which are not part of the work. For example, Corresponding Source includes interface definition files associated with source files for the work, and the source code for shared libraries and dynamically linked subprograms that the work is specifically designed to require, such as by intimate data communication or control flow between those subprograms and other parts of the work. - -The Corresponding Source need not include anything that users can regenerate automatically from other parts of the Corresponding Source. - -The Corresponding Source for a work in source code form is that same work. - -2. Basic Permissions. -All rights granted under this License are granted for the term of copyright on the Program, and are irrevocable provided the stated conditions are met. This License explicitly affirms your unlimited permission to run the unmodified Program. The output from running a covered work is covered by this License only if the output, given its content, constitutes a covered work. This License acknowledges your rights of fair use or other equivalent, as provided by copyright law. - -You may make, run and propagate covered works that you do not convey, without conditions so long as your license otherwise remains in force. You may convey covered works to others for the sole purpose of having them make modifications exclusively for you, or provide you with facilities for running those works, provided that you comply with the terms of this License in conveying all material for which you do not control copyright. Those thus making or running the covered works for you must do so exclusively on your behalf, under your direction and control, on terms that prohibit them from making any copies of your copyrighted material outside their relationship with you. - -Conveying under any other circumstances is permitted solely under the conditions stated below. Sublicensing is not allowed; section 10 makes it unnecessary. - -3. Protecting Users' Legal Rights From Anti-Circumvention Law. -No covered work shall be deemed part of an effective technological measure under any applicable law fulfilling obligations under article 11 of the WIPO copyright treaty adopted on 20 December 1996, or similar laws prohibiting or restricting circumvention of such measures. - -When you convey a covered work, you waive any legal power to forbid circumvention of technological measures to the extent such circumvention is effected by exercising rights under this License with respect to the covered work, and you disclaim any intention to limit operation or modification of the work as a means of enforcing, against the work's users, your or third parties' legal rights to forbid circumvention of technological measures. - -4. Conveying Verbatim Copies. -You may convey verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice; keep intact all notices stating that this License and any non-permissive terms added in accord with section 7 apply to the code; keep intact all notices of the absence of any warranty; and give all recipients a copy of this License along with the Program. - -You may charge any price or no price for each copy that you convey, and you may offer support or warranty protection for a fee. - -5. Conveying Modified Source Versions. -You may convey a work based on the Program, or the modifications to produce it from the Program, in the form of source code under the terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is released under this License and any conditions added under section 7. This requirement modifies the requirement in section 4 to “keep intact all notices”. - - c) You must license the entire work, as a whole, under this License to anyone who comes into possession of a copy. This License will therefore apply, along with any applicable section 7 additional terms, to the whole of the work, and all its parts, regardless of how they are packaged. This License gives no permission to license the work in any other way, but it does not invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display Appropriate Legal Notices; however, if the Program has interactive interfaces that do not display Appropriate Legal Notices, your work need not make them do so. - -A compilation of a covered work with other separate and independent works, which are not by their nature extensions of the covered work, and which are not combined with it such as to form a larger program, in or on a volume of a storage or distribution medium, is called an “aggregate” if the compilation and its resulting copyright are not used to limit the access or legal rights of the compilation's users beyond what the individual works permit. Inclusion of a covered work in an aggregate does not cause this License to apply to the other parts of the aggregate. - -6. Conveying Non-Source Forms. -You may convey a covered work in object code form under the terms of sections 4 and 5, provided that you also convey the machine-readable Corresponding Source under the terms of this License, in one of these ways: - - a) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by the Corresponding Source fixed on a durable physical medium customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by a written offer, valid for at least three years and valid for as long as you offer spare parts or customer support for that product model, to give anyone who possesses the object code either (1) a copy of the Corresponding Source for all the software in the product that is covered by this License, on a durable physical medium customarily used for software interchange, for a price no more than your reasonable cost of physically performing this conveying of source, or (2) access to copy the Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the written offer to provide the Corresponding Source. This alternative is allowed only occasionally and noncommercially, and only if you received the object code with such an offer, in accord with subsection 6b. - - d) Convey the object code by offering access from a designated place (gratis or for a charge), and offer equivalent access to the Corresponding Source in the same way through the same place at no further charge. You need not require recipients to copy the Corresponding Source along with the object code. If the place to copy the object code is a network server, the Corresponding Source may be on a different server (operated by you or a third party) that supports equivalent copying facilities, provided you maintain clear directions next to the object code saying where to find the Corresponding Source. Regardless of what server hosts the Corresponding Source, you remain obligated to ensure that it is available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided you inform other peers where the object code and Corresponding Source of the work are being offered to the general public at no charge under subsection 6d. - -A separable portion of the object code, whose source code is excluded from the Corresponding Source as a System Library, need not be included in conveying the object code work. - -A “User Product” is either (1) a “consumer product”, which means any tangible personal property which is normally used for personal, family, or household purposes, or (2) anything designed or sold for incorporation into a dwelling. In determining whether a product is a consumer product, doubtful cases shall be resolved in favor of coverage. For a particular product received by a particular user, “normally used” refers to a typical or common use of that class of product, regardless of the status of the particular user or of the way in which the particular user actually uses, or expects or is expected to use, the product. A product is a consumer product regardless of whether the product has substantial commercial, industrial or non-consumer uses, unless such uses represent the only significant mode of use of the product. - -“Installation Information” for a User Product means any methods, procedures, authorization keys, or other information required to install and execute modified versions of a covered work in that User Product from a modified version of its Corresponding Source. The information must suffice to ensure that the continued functioning of the modified object code is in no case prevented or interfered with solely because modification has been made. - -If you convey an object code work under this section in, or with, or specifically for use in, a User Product, and the conveying occurs as part of a transaction in which the right of possession and use of the User Product is transferred to the recipient in perpetuity or for a fixed term (regardless of how the transaction is characterized), the Corresponding Source conveyed under this section must be accompanied by the Installation Information. But this requirement does not apply if neither you nor any third party retains the ability to install modified object code on the User Product (for example, the work has been installed in ROM). - -The requirement to provide Installation Information does not include a requirement to continue to provide support service, warranty, or updates for a work that has been modified or installed by the recipient, or for the User Product in which it has been modified or installed. Access to a network may be denied when the modification itself materially and adversely affects the operation of the network or violates the rules and protocols for communication across the network. - -Corresponding Source conveyed, and Installation Information provided, in accord with this section must be in a format that is publicly documented (and with an implementation available to the public in source code form), and must require no special password or key for unpacking, reading or copying. - -7. Additional Terms. -“Additional permissions” are terms that supplement the terms of this License by making exceptions from one or more of its conditions. Additional permissions that are applicable to the entire Program shall be treated as though they were included in this License, to the extent that they are valid under applicable law. If additional permissions apply only to part of the Program, that part may be used separately under those permissions, but the entire Program remains governed by this License without regard to the additional permissions. - -When you convey a copy of a covered work, you may at your option remove any additional permissions from that copy, or from any part of it. (Additional permissions may be written to require their own removal in certain cases when you modify the work.) You may place additional permissions on material, added by you to a covered work, for which you have or can give appropriate copyright permission. - -Notwithstanding any other provision of this License, for material you add to a covered work, you may (if authorized by the copyright holders of that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or author attributions in that material or in the Appropriate Legal Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or requiring that modified versions of such material be marked in reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or authors of the material; or - - e) Declining to grant rights under trademark law for use of some trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that material by anyone who conveys the material (or modified versions of it) with contractual assumptions of liability to the recipient, for any liability that these contractual assumptions directly impose on those licensors and authors. - -All other non-permissive additional terms are considered “further restrictions” within the meaning of section 10. If the Program as you received it, or any part of it, contains a notice stating that it is governed by this License along with a term that is a further restriction, you may remove that term. If a license document contains a further restriction but permits relicensing or conveying under this License, you may add to a covered work material governed by the terms of that license document, provided that the further restriction does not survive such relicensing or conveying. - -If you add terms to a covered work in accord with this section, you must place, in the relevant source files, a statement of the additional terms that apply to those files, or a notice indicating where to find the applicable terms. - -Additional terms, permissive or non-permissive, may be stated in the form of a separately written license, or stated as exceptions; the above requirements apply either way. - -8. Termination. -You may not propagate or modify a covered work except as expressly provided under this License. Any attempt otherwise to propagate or modify it is void, and will automatically terminate your rights under this License (including any patent licenses granted under the third paragraph of section 11). - -However, if you cease all violation of this License, then your license from a particular copyright holder is reinstated (a) provisionally, unless and until the copyright holder explicitly and finally terminates your license, and (b) permanently, if the copyright holder fails to notify you of the violation by some reasonable means prior to 60 days after the cessation. - -Moreover, your license from a particular copyright holder is reinstated permanently if the copyright holder notifies you of the violation by some reasonable means, this is the first time you have received notice of violation of this License (for any work) from that copyright holder, and you cure the violation prior to 30 days after your receipt of the notice. - -Termination of your rights under this section does not terminate the licenses of parties who have received copies or rights from you under this License. If your rights have been terminated and not permanently reinstated, you do not qualify to receive new licenses for the same material under section 10. - -9. Acceptance Not Required for Having Copies. -You are not required to accept this License in order to receive or run a copy of the Program. Ancillary propagation of a covered work occurring solely as a consequence of using peer-to-peer transmission to receive a copy likewise does not require acceptance. However, nothing other than this License grants you permission to propagate or modify any covered work. These actions infringe copyright if you do not accept this License. Therefore, by modifying or propagating a covered work, you indicate your acceptance of this License to do so. - -10. Automatic Licensing of Downstream Recipients. -Each time you convey a covered work, the recipient automatically receives a license from the original licensors, to run, modify and propagate that work, subject to this License. You are not responsible for enforcing compliance by third parties with this License. - -An “entity transaction” is a transaction transferring control of an organization, or substantially all assets of one, or subdividing an organization, or merging organizations. If propagation of a covered work results from an entity transaction, each party to that transaction who receives a copy of the work also receives whatever licenses to the work the party's predecessor in interest had or could give under the previous paragraph, plus a right to possession of the Corresponding Source of the work from the predecessor in interest, if the predecessor has it or can get it with reasonable efforts. - -You may not impose any further restrictions on the exercise of the rights granted or affirmed under this License. For example, you may not impose a license fee, royalty, or other charge for exercise of rights granted under this License, and you may not initiate litigation (including a cross-claim or counterclaim in a lawsuit) alleging that any patent claim is infringed by making, using, selling, offering for sale, or importing the Program or any portion of it. - -11. Patents. -A “contributor” is a copyright holder who authorizes use under this License of the Program or a work on which the Program is based. The work thus licensed is called the contributor's “contributor version”. - -A contributor's “essential patent claims” are all patent claims owned or controlled by the contributor, whether already acquired or hereafter acquired, that would be infringed by some manner, permitted by this License, of making, using, or selling its contributor version, but do not include claims that would be infringed only as a consequence of further modification of the contributor version. For purposes of this definition, “control” includes the right to grant patent sublicenses in a manner consistent with the requirements of this License. - -Each contributor grants you a non-exclusive, worldwide, royalty-free patent license under the contributor's essential patent claims, to make, use, sell, offer for sale, import and otherwise run, modify and propagate the contents of its contributor version. - -In the following three paragraphs, a “patent license” is any express agreement or commitment, however denominated, not to enforce a patent (such as an express permission to practice a patent or covenant not to sue for patent infringement). To “grant” such a patent license to a party means to make such an agreement or commitment not to enforce a patent against the party. - -If you convey a covered work, knowingly relying on a patent license, and the Corresponding Source of the work is not available for anyone to copy, free of charge and under the terms of this License, through a publicly available network server or other readily accessible means, then you must either (1) cause the Corresponding Source to be so available, or (2) arrange to deprive yourself of the benefit of the patent license for this particular work, or (3) arrange, in a manner consistent with the requirements of this License, to extend the patent license to downstream recipients. “Knowingly relying” means you have actual knowledge that, but for the patent license, your conveying the covered work in a country, or your recipient's use of the covered work in a country, would infringe one or more identifiable patents in that country that you have reason to believe are valid. - -If, pursuant to or in connection with a single transaction or arrangement, you convey, or propagate by procuring conveyance of, a covered work, and grant a patent license to some of the parties receiving the covered work authorizing them to use, propagate, modify or convey a specific copy of the covered work, then the patent license you grant is automatically extended to all recipients of the covered work and works based on it. - -A patent license is “discriminatory” if it does not include within the scope of its coverage, prohibits the exercise of, or is conditioned on the non-exercise of one or more of the rights that are specifically granted under this License. You may not convey a covered work if you are a party to an arrangement with a third party that is in the business of distributing software, under which you make payment to the third party based on the extent of your activity of conveying the work, and under which the third party grants, to any of the parties who would receive the covered work from you, a discriminatory patent license (a) in connection with copies of the covered work conveyed by you (or copies made from those copies), or (b) primarily for and in connection with specific products or compilations that contain the covered work, unless you entered into that arrangement, or that patent license was granted, prior to 28 March 2007. - -Nothing in this License shall be construed as excluding or limiting any implied license or other defenses to infringement that may otherwise be available to you under applicable patent law. - -12. No Surrender of Others' Freedom. -If conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot convey a covered work so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not convey it at all. For example, if you agree to terms that obligate you to collect a royalty for further conveying from those to whom you convey the Program, the only way you could satisfy both those terms and this License would be to refrain entirely from conveying the Program. - -13. Use with the GNU Affero General Public License. -Notwithstanding any other provision of this License, you have permission to link or combine any covered work with a work licensed under version 3 of the GNU Affero General Public License into a single combined work, and to convey the resulting work. The terms of this License will continue to apply to the part which is the covered work, but the special requirements of the GNU Affero General Public License, section 13, concerning interaction through a network will apply to the combination as such. - -14. Revised Versions of this License. -The Free Software Foundation may publish revised and/or new versions of the GNU 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 that a certain numbered version of the GNU General Public License “or any later version” applies to it, you have the option of following the terms and conditions either of that numbered version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of the GNU General Public License, you may choose any version ever published by the Free Software Foundation. - -If the Program specifies that a proxy can decide which future versions of the GNU General Public License can be used, that proxy's public statement of acceptance of a version permanently authorizes you to choose that version for the Program. - -Later license versions may give you additional or different permissions. However, no additional obligations are imposed on any author or copyright holder as a result of your choosing to follow a later version. - -15. Disclaimer of Warranty. -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. - -16. Limitation of Liability. -IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS 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. - -17. Interpretation of Sections 15 and 16. -If the disclaimer of warranty and limitation of liability provided above cannot be given local legal effect according to their terms, reviewing courts shall apply local law that most closely approximates an absolute waiver of all civil liability in connection with the Program, unless a warranty or assumption of liability accompanies a copy of the Program in return for a fee. - -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 state the exclusion of warranty; and each file should have at least the “copyright” line and a pointer to where the full notice is found. - - dolphin-backend - Copyright (C) 2025 dolphin-projects - - 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 3 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, see . - -Also add information on how to contact you by electronic and paper mail. - -If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - - dolphin-backend Copyright (C) 2025 dolphin-projects - This program 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, your program's commands might be different; for a GUI interface, you would use an “about box”. - -You should also get your employer (if you work as a programmer) or school, if any, to sign a “copyright disclaimer” for the program, if necessary. For more information on this, and how to apply and follow the GNU GPL, see . - -The GNU 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. But first, please read . diff --git a/README.md b/README.md deleted file mode 100644 index 64b8cad..0000000 --- a/README.md +++ /dev/null @@ -1,2 +0,0 @@ -# dolphin-backend - diff --git a/dolphin-authorize/pom.xml b/dolphin-authorize/pom.xml new file mode 100644 index 0000000..90442e0 --- /dev/null +++ b/dolphin-authorize/pom.xml @@ -0,0 +1,52 @@ + + + 4.0.0 + + + day.gitlab + dolphin-backend + 0.0.1-SNAPSHOT + + + dolphin-authorize + jar + + + + + day.gitlab + dolphin-module-rbac + ${project.version} + + + + org.springframework.boot + spring-boot-starter-webmvc + + + + org.mybatis.spring.boot + mybatis-spring-boot-starter + + + com.baomidou + mybatis-plus-spring-boot4-starter + + + + org.projectlombok + lombok + true + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + + + diff --git a/dolphin-modules/dolphin-module-auth/src/main/java/day/gitlab/dolphin/auth/constants/Exceptions.java b/dolphin-authorize/src/main/java/day/gitlab/dolphin/authorize/constants/Exceptions.java similarity index 77% rename from dolphin-modules/dolphin-module-auth/src/main/java/day/gitlab/dolphin/auth/constants/Exceptions.java rename to dolphin-authorize/src/main/java/day/gitlab/dolphin/authorize/constants/Exceptions.java index c75cea7..fdb076b 100644 --- a/dolphin-modules/dolphin-module-auth/src/main/java/day/gitlab/dolphin/auth/constants/Exceptions.java +++ b/dolphin-authorize/src/main/java/day/gitlab/dolphin/authorize/constants/Exceptions.java @@ -1,4 +1,4 @@ -package day.gitlab.dolphin.auth.constants; +package day.gitlab.dolphin.authorize.constants; public class Exceptions { diff --git a/dolphin-authorize/src/main/java/day/gitlab/dolphin/authorize/controller/AuthorizeController.java b/dolphin-authorize/src/main/java/day/gitlab/dolphin/authorize/controller/AuthorizeController.java new file mode 100644 index 0000000..b4d92f2 --- /dev/null +++ b/dolphin-authorize/src/main/java/day/gitlab/dolphin/authorize/controller/AuthorizeController.java @@ -0,0 +1,29 @@ +package day.gitlab.dolphin.authorize.controller; + +import day.gitlab.dolphin.authorize.controller.dto.LoginDTO; +import day.gitlab.dolphin.authorize.controller.vo.TokenPair; +import day.gitlab.dolphin.authorize.controller.vo.UserInfoVO; +import day.gitlab.dolphin.authorize.service.AuthorizeService; +import day.gitlab.dolphin.common.security.annotation.AuthorityIgnore; +import day.gitlab.dolphin.common.web.entity.ApiResponse; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + +@RestController +@RequiredArgsConstructor +@RequestMapping("/authorize") +public class AuthorizeController { + + private final AuthorizeService authorizeService; + + @AuthorityIgnore + @PostMapping("/login") + public ApiResponse login(@RequestBody LoginDTO loginDTO) { + return ApiResponse.success(authorizeService.login(loginDTO)); + } + + @GetMapping("/getUserInfo") + public ApiResponse getUserInfo() { + return ApiResponse.success(authorizeService.getUserInfo()); + } +} diff --git a/dolphin-authorize/src/main/java/day/gitlab/dolphin/authorize/controller/dto/LoginDTO.java b/dolphin-authorize/src/main/java/day/gitlab/dolphin/authorize/controller/dto/LoginDTO.java new file mode 100644 index 0000000..be0ff29 --- /dev/null +++ b/dolphin-authorize/src/main/java/day/gitlab/dolphin/authorize/controller/dto/LoginDTO.java @@ -0,0 +1,11 @@ +package day.gitlab.dolphin.authorize.controller.dto; + +import lombok.Data; + +@Data +public class LoginDTO { + + private String username; + + private String password; +} \ No newline at end of file diff --git a/dolphin-modules/dolphin-module-auth/src/main/java/day/gitlab/dolphin/auth/entity/vo/LoginVO.java b/dolphin-authorize/src/main/java/day/gitlab/dolphin/authorize/controller/vo/TokenPair.java similarity index 75% rename from dolphin-modules/dolphin-module-auth/src/main/java/day/gitlab/dolphin/auth/entity/vo/LoginVO.java rename to dolphin-authorize/src/main/java/day/gitlab/dolphin/authorize/controller/vo/TokenPair.java index 6ee1acf..d0b1940 100644 --- a/dolphin-modules/dolphin-module-auth/src/main/java/day/gitlab/dolphin/auth/entity/vo/LoginVO.java +++ b/dolphin-authorize/src/main/java/day/gitlab/dolphin/authorize/controller/vo/TokenPair.java @@ -1,4 +1,4 @@ -package day.gitlab.dolphin.auth.entity.vo; +package day.gitlab.dolphin.authorize.controller.vo; import lombok.AllArgsConstructor; import lombok.Builder; @@ -9,7 +9,7 @@ import lombok.NoArgsConstructor; @Builder @NoArgsConstructor @AllArgsConstructor -public class LoginVO { +public class TokenPair { private String accessToken; diff --git a/dolphin-modules/dolphin-module-auth/src/main/java/day/gitlab/dolphin/auth/entity/vo/UserInfoVO.java b/dolphin-authorize/src/main/java/day/gitlab/dolphin/authorize/controller/vo/UserInfoVO.java similarity index 85% rename from dolphin-modules/dolphin-module-auth/src/main/java/day/gitlab/dolphin/auth/entity/vo/UserInfoVO.java rename to dolphin-authorize/src/main/java/day/gitlab/dolphin/authorize/controller/vo/UserInfoVO.java index d3f631e..341e4f1 100644 --- a/dolphin-modules/dolphin-module-auth/src/main/java/day/gitlab/dolphin/auth/entity/vo/UserInfoVO.java +++ b/dolphin-authorize/src/main/java/day/gitlab/dolphin/authorize/controller/vo/UserInfoVO.java @@ -1,4 +1,4 @@ -package day.gitlab.dolphin.auth.entity.vo; +package day.gitlab.dolphin.authorize.controller.vo; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/dolphin-authorize/src/main/java/day/gitlab/dolphin/authorize/service/AuthorizeService.java b/dolphin-authorize/src/main/java/day/gitlab/dolphin/authorize/service/AuthorizeService.java new file mode 100644 index 0000000..68d99c7 --- /dev/null +++ b/dolphin-authorize/src/main/java/day/gitlab/dolphin/authorize/service/AuthorizeService.java @@ -0,0 +1,12 @@ +package day.gitlab.dolphin.authorize.service; + +import day.gitlab.dolphin.authorize.controller.dto.LoginDTO; +import day.gitlab.dolphin.authorize.controller.vo.TokenPair; +import day.gitlab.dolphin.authorize.controller.vo.UserInfoVO; + +public interface AuthorizeService { + + TokenPair login(LoginDTO loginDTO); + + UserInfoVO getUserInfo(); +} diff --git a/dolphin-authorize/src/main/java/day/gitlab/dolphin/authorize/service/impl/AuthorizationProviderImpl.java b/dolphin-authorize/src/main/java/day/gitlab/dolphin/authorize/service/impl/AuthorizationProviderImpl.java new file mode 100644 index 0000000..e3fe34e --- /dev/null +++ b/dolphin-authorize/src/main/java/day/gitlab/dolphin/authorize/service/impl/AuthorizationProviderImpl.java @@ -0,0 +1,39 @@ +package day.gitlab.dolphin.authorize.service.impl; + +import day.gitlab.dolphin.common.security.AuthenticationProvider; +import day.gitlab.dolphin.common.security.UserPrincipal; +import day.gitlab.dolphin.module.rbac.entity.Role; +import day.gitlab.dolphin.module.rbac.entity.User; +import day.gitlab.dolphin.module.rbac.mapper.RoleMapper; +import day.gitlab.dolphin.module.rbac.mapper.UserMapper; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Objects; + +@Service +@RequiredArgsConstructor +public class AuthorizationProviderImpl implements AuthenticationProvider { + + private final UserMapper userMapper; + private final RoleMapper roleMapper; + + @Override + public UserPrincipal getUserPrincipal(String userId) { + User user = userMapper.selectById(userId); + Objects.requireNonNull(user); + + return UserPrincipal.builder() + .id(user.getId()) + .username(user.getUsername()) + .nickname(user.getNickname()) + .build(); + } + + @Override + public List getUserAuthorities(String userId) { + List roles = roleMapper.findAllByUserId(userId); + return roles.stream().map(Role::getCode).toList(); + } +} diff --git a/dolphin-authorize/src/main/java/day/gitlab/dolphin/authorize/service/impl/AuthorizeServiceImpl.java b/dolphin-authorize/src/main/java/day/gitlab/dolphin/authorize/service/impl/AuthorizeServiceImpl.java new file mode 100644 index 0000000..cfed984 --- /dev/null +++ b/dolphin-authorize/src/main/java/day/gitlab/dolphin/authorize/service/impl/AuthorizeServiceImpl.java @@ -0,0 +1,54 @@ +package day.gitlab.dolphin.authorize.service.impl; + +import day.gitlab.dolphin.authorize.constants.Exceptions; +import day.gitlab.dolphin.authorize.controller.dto.LoginDTO; +import day.gitlab.dolphin.authorize.controller.vo.TokenPair; +import day.gitlab.dolphin.authorize.controller.vo.UserInfoVO; +import day.gitlab.dolphin.authorize.service.AuthorizeService; +import day.gitlab.dolphin.common.core.util.BCrypt; +import day.gitlab.dolphin.common.security.Authentication; +import day.gitlab.dolphin.common.security.SecurityContextHolder; +import day.gitlab.dolphin.common.security.jwt.JwtInfo; +import day.gitlab.dolphin.common.web.i18n.MessagesHelper; +import day.gitlab.dolphin.module.rbac.entity.User; +import day.gitlab.dolphin.module.rbac.enums.UserEnabled; +import day.gitlab.dolphin.module.rbac.mapper.UserMapper; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +public class AuthorizeServiceImpl implements AuthorizeService { + + private final JwtInfo jwtInfo; + + private final UserMapper userMapper; + + private final MessagesHelper messagesHelper; + + @Override + public TokenPair login(LoginDTO loginDTO) { + User dbUser = userMapper.findByUsername(loginDTO.getUsername()); + if (dbUser == null || !BCrypt.checkpw(loginDTO.getPassword(), dbUser.getPassword())) { + throw messagesHelper.newBusinessException(Exceptions.USERNAME_OR_PASSWORD_INCORRECT); + } + if (!UserEnabled.ENABLED.equals(dbUser.getEnabled())) { + throw messagesHelper.newBusinessException(Exceptions.USER_NOT_ENABLED); + } + + return TokenPair.builder() + .accessToken(jwtInfo.generateAccessToken(dbUser.getId())) + .refreshToken(jwtInfo.generateRefreshToken(dbUser.getId())) + .build(); + } + + @Override + public UserInfoVO getUserInfo() { + Authentication authentication = SecurityContextHolder.getAuthentication(); + return UserInfoVO.builder() + .id(authentication.getUserPrincipal().getId()) + .username(authentication.getUserPrincipal().getNickname()) + .authorities(authentication.getUserAuthorities()) + .build(); + } +} diff --git a/dolphin-commons/dolphin-common-core/pom.xml b/dolphin-commons/dolphin-common-core/pom.xml index 831937d..f21ae1d 100644 --- a/dolphin-commons/dolphin-common-core/pom.xml +++ b/dolphin-commons/dolphin-common-core/pom.xml @@ -1,45 +1,32 @@ - 4.0.0 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + day.gitlab dolphin-commons 0.0.1-SNAPSHOT - dolphin-common-core - jar + dolphin-common-core + jar - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-validation - - - - io.jsonwebtoken - jjwt-api - - org.projectlombok - lombok - true - + org.projectlombok + lombok + true + - - + + org.apache.maven.plugins maven-compiler-plugin - + diff --git a/dolphin-commons/dolphin-common-core/src/main/java/day/gitlab/dolphin/common/core/constants/Constants.java b/dolphin-commons/dolphin-common-core/src/main/java/day/gitlab/dolphin/common/core/constants/Constants.java deleted file mode 100644 index 9ece4e6..0000000 --- a/dolphin-commons/dolphin-common-core/src/main/java/day/gitlab/dolphin/common/core/constants/Constants.java +++ /dev/null @@ -1,4 +0,0 @@ -package day.gitlab.dolphin.common.core.constants; - -public class Constants { -} diff --git a/dolphin-commons/dolphin-common-core/src/main/java/day/gitlab/dolphin/common/core/entity/PageRequest.java b/dolphin-commons/dolphin-common-core/src/main/java/day/gitlab/dolphin/common/core/entity/PageRequest.java deleted file mode 100644 index eb7123d..0000000 --- a/dolphin-commons/dolphin-common-core/src/main/java/day/gitlab/dolphin/common/core/entity/PageRequest.java +++ /dev/null @@ -1,25 +0,0 @@ -package day.gitlab.dolphin.common.core.entity; - -import jakarta.validation.constraints.Min; -import jakarta.validation.constraints.NotNull; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class PageRequest { - - /** 当前分页，默认1 */ - @Min(1) - @NotNull - private Long pageNumber = 1L; - - /** 分页条数，默认10 */ - @Min(1) - @NotNull - private Long pageSize = 10L; -} diff --git a/dolphin-commons/dolphin-common-core/src/main/java/day/gitlab/dolphin/common/core/entity/PageResponse.java b/dolphin-commons/dolphin-common-core/src/main/java/day/gitlab/dolphin/common/core/entity/PageResponse.java deleted file mode 100644 index 3ef5a1a..0000000 --- a/dolphin-commons/dolphin-common-core/src/main/java/day/gitlab/dolphin/common/core/entity/PageResponse.java +++ /dev/null @@ -1,27 +0,0 @@ -package day.gitlab.dolphin.common.core.entity; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.util.List; - -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class PageResponse { - - /** 总记录数 */ - private Long total = 0L; - - /** 当前分页，默认1 */ - private Long pageNumber = 1L; - - /** 分页条数，默认10 */ - private Long pageSize = 10L; - - /** 记录 */ - private List records; -} diff --git a/dolphin-commons/dolphin-common-core/src/main/java/day/gitlab/dolphin/common/core/entity/QueryPageRequest.java b/dolphin-commons/dolphin-common-core/src/main/java/day/gitlab/dolphin/common/core/entity/QueryPageRequest.java deleted file mode 100644 index ba59305..0000000 --- a/dolphin-commons/dolphin-common-core/src/main/java/day/gitlab/dolphin/common/core/entity/QueryPageRequest.java +++ /dev/null @@ -1,15 +0,0 @@ -package day.gitlab.dolphin.common.core.entity; - -import lombok.*; - -@Data -@NoArgsConstructor -@AllArgsConstructor -@EqualsAndHashCode(callSuper = true) -public class QueryPageRequest extends PageRequest { - - /** - * 查询参数 - */ - private T query; -} diff --git a/dolphin-commons/dolphin-common-core/src/main/java/day/gitlab/dolphin/common/core/entity/Result.java b/dolphin-commons/dolphin-common-core/src/main/java/day/gitlab/dolphin/common/core/entity/Result.java deleted file mode 100644 index 089f7d7..0000000 --- a/dolphin-commons/dolphin-common-core/src/main/java/day/gitlab/dolphin/common/core/entity/Result.java +++ /dev/null @@ -1,63 +0,0 @@ -package day.gitlab.dolphin.common.core.entity; - -import day.gitlab.dolphin.common.core.exception.BusinessException; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@NoArgsConstructor -@AllArgsConstructor -public class Result { - - public static final String SUCCESS = "00000000"; - public static final String FAILURE = "99999999"; - - public static final String SUCCESS_MESSAGE = "success"; - public static final String FAILURE_MESSAGE = "failure"; - - private String code; - private String message; - private T data; - private long timestamp; - - // ========== 通用响应方法 ========== - - public static Result result(String code, String message, T data) { - return new Result<>(code, message, data, System.currentTimeMillis()); - } - - // ========== 成功响应方法 ========== - - public static Result success() { - return result(SUCCESS, SUCCESS_MESSAGE, null); - } - - public static Result success(T data) { - return result(SUCCESS, SUCCESS_MESSAGE, data); - } - - public static Result success(String message, T data) { - return result(SUCCESS, message, data); - } - - // ========== 失败响应方法 ========== - - public static Result failure() { - return result(FAILURE, FAILURE_MESSAGE, null); - } - - public static Result failure(String message) { - return result(FAILURE, message, null); - } - - public static Result failure(String code, String message) { - return result(code, message, null); - } - - // ========== 异常响应方法 ========== - - public static Result failure(BusinessException e) { - return result(e.getCode(), e.getMessage(), null); - } -} diff --git a/dolphin-commons/dolphin-common-core/src/main/java/day/gitlab/dolphin/common/core/exception/GlobalExceptionHandler.java b/dolphin-commons/dolphin-common-core/src/main/java/day/gitlab/dolphin/common/core/exception/GlobalExceptionHandler.java deleted file mode 100644 index a3a5395..0000000 --- a/dolphin-commons/dolphin-common-core/src/main/java/day/gitlab/dolphin/common/core/exception/GlobalExceptionHandler.java +++ /dev/null @@ -1,19 +0,0 @@ -package day.gitlab.dolphin.common.core.exception; - -import day.gitlab.dolphin.common.core.entity.Result; -import org.springframework.web.bind.annotation.ExceptionHandler; -import org.springframework.web.bind.annotation.RestControllerAdvice; - -@RestControllerAdvice -public class GlobalExceptionHandler { - - @ExceptionHandler(value = BusinessException.class) - public Result handleBusinessException(BusinessException e) { - return Result.failure(e); - } - - @ExceptionHandler(value = Exception.class) - public Result handleException(Exception e) { - return Result.failure(e.getMessage()); - } -} diff --git a/dolphin-commons/dolphin-common-core/src/main/java/day/gitlab/dolphin/common/core/util/BCrypt.java b/dolphin-commons/dolphin-common-core/src/main/java/day/gitlab/dolphin/common/core/util/BCrypt.java index 44fbfff..9b4c0b5 100644 --- a/dolphin-commons/dolphin-common-core/src/main/java/day/gitlab/dolphin/common/core/util/BCrypt.java +++ b/dolphin-commons/dolphin-common-core/src/main/java/day/gitlab/dolphin/common/core/util/BCrypt.java @@ -14,7 +14,7 @@ import java.security.SecureRandom; * String pw_hash = BCrypt.hashpw(plain_password, BCrypt.gensalt()); * } *

- * 使用checkpw方法检查被加密的字符串是否与原始字符串匹配： + * 使用checkpw方法检查被加密的字符串是否与原始字符串匹配: *

* {@code * BCrypt.checkpw(candidate_password, stored_hash); diff --git a/dolphin-commons/dolphin-common-core/src/main/java/day/gitlab/dolphin/common/core/util/Strings.java b/dolphin-commons/dolphin-common-core/src/main/java/day/gitlab/dolphin/common/core/util/Strings.java new file mode 100644 index 0000000..8ced1be --- /dev/null +++ b/dolphin-commons/dolphin-common-core/src/main/java/day/gitlab/dolphin/common/core/util/Strings.java @@ -0,0 +1,20 @@ +package day.gitlab.dolphin.common.core.util; + +public class Strings { + + public static boolean isEmpty(String str) { + return str == null || str.isEmpty(); + } + + public static boolean isNotEmpty(String str) { + return !isEmpty(str); + } + + public static boolean isBlank(String str) { + return str == null || str.trim().isEmpty(); + } + + public static boolean isNotBlank(String str) { + return !isBlank(str); + } +} diff --git a/dolphin-commons/dolphin-common-mybatis/pom.xml b/dolphin-commons/dolphin-common-mybatis/pom.xml index d840a40..d7cc48e 100644 --- a/dolphin-commons/dolphin-common-mybatis/pom.xml +++ b/dolphin-commons/dolphin-common-mybatis/pom.xml @@ -1,47 +1,52 @@ - 4.0.0 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + day.gitlab dolphin-commons 0.0.1-SNAPSHOT - dolphin-common-mybatis - jar + dolphin-common-mybatis + jar day.gitlab - dolphin-common-core + dolphin-common-web ${project.version} org.springframework.boot - spring-boot-starter-web + spring-boot-starter-webmvc - + - com.mybatis-flex - mybatis-flex-spring-boot3-starter + org.mybatis.spring.boot + mybatis-spring-boot-starter + + + com.baomidou + mybatis-plus-spring-boot4-starter - org.projectlombok - lombok - true - + org.projectlombok + lombok + true + - - + + org.apache.maven.plugins maven-compiler-plugin - + diff --git a/dolphin-commons/dolphin-common-mybatis/src/main/java/day/gitlab/dolphin/common/mybatis/MyBatisFlexConfiguration.java b/dolphin-commons/dolphin-common-mybatis/src/main/java/day/gitlab/dolphin/common/mybatis/MyBatisFlexConfiguration.java deleted file mode 100644 index 6b67e68..0000000 --- a/dolphin-commons/dolphin-common-mybatis/src/main/java/day/gitlab/dolphin/common/mybatis/MyBatisFlexConfiguration.java +++ /dev/null @@ -1,30 +0,0 @@ -package day.gitlab.dolphin.common.mybatis; - -import com.mybatisflex.annotation.KeyType; -import com.mybatisflex.core.FlexGlobalConfig; -import com.mybatisflex.core.audit.AuditManager; -import com.mybatisflex.core.keygen.KeyGeneratorFactory; -import com.mybatisflex.spring.boot.MyBatisFlexCustomizer; -import jakarta.annotation.Resource; -import org.springframework.context.annotation.Configuration; - -@Configuration -public class MyBatisFlexConfiguration implements MyBatisFlexCustomizer { - - @Resource - private UUIDv7KeyGenerator uuidv7KeyGenerator; - - @Override - public void customize(FlexGlobalConfig flexGlobalConfig) { - KeyGeneratorFactory.register("uuidv7", uuidv7KeyGenerator); - - // 设置默认主键类型 - FlexGlobalConfig.KeyConfig keyConfig = new FlexGlobalConfig.KeyConfig(); - keyConfig.setKeyType(KeyType.Generator); - keyConfig.setValue("uuidv7"); - keyConfig.setBefore(true); - flexGlobalConfig.setKeyConfig(keyConfig); - - AuditManager.setAuditEnable(true); - } -} diff --git a/dolphin-commons/dolphin-common-mybatis/src/main/java/day/gitlab/dolphin/common/mybatis/Pages.java b/dolphin-commons/dolphin-common-mybatis/src/main/java/day/gitlab/dolphin/common/mybatis/Pages.java deleted file mode 100644 index 12f9dbd..0000000 --- a/dolphin-commons/dolphin-common-mybatis/src/main/java/day/gitlab/dolphin/common/mybatis/Pages.java +++ /dev/null @@ -1,35 +0,0 @@ -package day.gitlab.dolphin.common.mybatis; - -import com.mybatisflex.core.BaseMapper; -import com.mybatisflex.core.paginate.Page; -import com.mybatisflex.core.query.QueryWrapper; -import day.gitlab.dolphin.common.core.entity.PageResponse; -import day.gitlab.dolphin.common.core.entity.QueryPageRequest; - -import java.util.Objects; -import java.util.function.BiFunction; -import java.util.function.Function; - -public class Pages { - - public static Page paginate(BaseMapper mapper, QueryPageRequest pageRequest, BiFunction biFunction) { - Page page = new Page<>(pageRequest.getPageNumber(), pageRequest.getPageSize()); - QueryWrapper wrapper = new QueryWrapper(); - wrapper = biFunction.apply(pageRequest.getQuery(), wrapper); - - return mapper.paginate(page, wrapper); - } - - public static PageResponse toPageResponse(Page page, Function mapFunction) { - PageResponse pageResponse = new PageResponse<>(); - pageResponse.setPageNumber(page.getPageNumber()); - pageResponse.setPageSize(page.getPageSize()); - pageResponse.setTotal(page.getTotalRow()); - - if (page.getRecords() != null) { - pageResponse.setRecords(page.getRecords().stream().map(mapFunction).filter(Objects::nonNull).toList()); - } - - return pageResponse; - } -} diff --git a/dolphin-commons/dolphin-common-mybatis/src/main/java/day/gitlab/dolphin/common/mybatis/UUIDv7KeyGenerator.java b/dolphin-commons/dolphin-common-mybatis/src/main/java/day/gitlab/dolphin/common/mybatis/UUIDv7KeyGenerator.java deleted file mode 100644 index 763d933..0000000 --- a/dolphin-commons/dolphin-common-mybatis/src/main/java/day/gitlab/dolphin/common/mybatis/UUIDv7KeyGenerator.java +++ /dev/null @@ -1,14 +0,0 @@ -package day.gitlab.dolphin.common.mybatis; - -import com.mybatisflex.core.keygen.IKeyGenerator; -import day.gitlab.dolphin.common.core.util.UUIDv7; -import org.springframework.stereotype.Component; - -@Component -public class UUIDv7KeyGenerator implements IKeyGenerator { - - @Override - public Object generate(Object entity, String keyColumn) { - return UUIDv7.randomUUID().toString(); - } -} diff --git a/dolphin-commons/dolphin-common-mybatis/src/main/java/day/gitlab/dolphin/common/mybatis/entity/UUIDv7Generator.java b/dolphin-commons/dolphin-common-mybatis/src/main/java/day/gitlab/dolphin/common/mybatis/entity/UUIDv7Generator.java new file mode 100644 index 0000000..6f98739 --- /dev/null +++ b/dolphin-commons/dolphin-common-mybatis/src/main/java/day/gitlab/dolphin/common/mybatis/entity/UUIDv7Generator.java @@ -0,0 +1,20 @@ +package day.gitlab.dolphin.common.mybatis.entity; + +import com.baomidou.mybatisplus.core.incrementer.DefaultIdentifierGenerator; +import day.gitlab.dolphin.common.core.util.UUIDv7; +import org.springframework.stereotype.Component; + +import java.net.InetAddress; + +@Component +public class UUIDv7Generator extends DefaultIdentifierGenerator { + + public UUIDv7Generator() { + super((InetAddress) null); + } + + @Override + public String nextUUID(Object entity) { + return UUIDv7.randomUUID().toString(); + } +} diff --git a/dolphin-commons/dolphin-common-mybatis/src/main/java/day/gitlab/dolphin/common/mybatis/util/Pages.java b/dolphin-commons/dolphin-common-mybatis/src/main/java/day/gitlab/dolphin/common/mybatis/util/Pages.java new file mode 100644 index 0000000..85c66c2 --- /dev/null +++ b/dolphin-commons/dolphin-common-mybatis/src/main/java/day/gitlab/dolphin/common/mybatis/util/Pages.java @@ -0,0 +1,35 @@ +package day.gitlab.dolphin.common.mybatis.util; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import day.gitlab.dolphin.common.web.entity.PageRequest; +import day.gitlab.dolphin.common.web.entity.PageResponse; + +import java.util.Objects; +import java.util.function.BiFunction; +import java.util.function.Function; + +public class Pages { + + public static Page paginate(PageRequest pageRequest, BaseMapper mapper, BiFunction, QueryWrapper> biFunction) { + Page page = new Page<>(pageRequest.getPageIndex(), pageRequest.getPageSize()); + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper = biFunction.apply(pageRequest.getQuery(), wrapper); + + return mapper.selectPage(page, wrapper); + } + + public static PageResponse toPageResponse(Page page, Function mapFunction) { + PageResponse pageResponse = new PageResponse<>(); + pageResponse.setPageIndex(page.getCurrent()); + pageResponse.setPageSize(page.getSize()); + pageResponse.setTotal(page.getTotal()); + + if (page.getRecords() != null) { + pageResponse.setRecords(page.getRecords().stream().map(mapFunction).filter(Objects::nonNull).toList()); + } + + return pageResponse; + } +} diff --git a/dolphin-commons/dolphin-common-security/pom.xml b/dolphin-commons/dolphin-common-security/pom.xml index 4755b77..2163254 100644 --- a/dolphin-commons/dolphin-common-security/pom.xml +++ b/dolphin-commons/dolphin-common-security/pom.xml @@ -1,7 +1,8 @@ - 4.0.0 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + day.gitlab dolphin-commons @@ -9,47 +10,47 @@ dolphin-common-security - jar + jar day.gitlab - dolphin-common-core + dolphin-common-mybatis ${project.version} org.springframework.boot - spring-boot-starter-web + spring-boot-starter-webmvc org.springframework.boot - spring-boot-starter-aop + spring-boot-starter-aspectj org.springframework.boot spring-boot-starter-data-redis - + io.jsonwebtoken jjwt-api - org.projectlombok - lombok - true - + org.projectlombok + lombok + true + - - + + org.apache.maven.plugins maven-compiler-plugin - + diff --git a/dolphin-commons/dolphin-common-security/src/main/java/day/gitlab/dolphin/common/security/AuthenticationFilter.java b/dolphin-commons/dolphin-common-security/src/main/java/day/gitlab/dolphin/common/security/AuthenticationFilter.java index 87c9222..3ec4328 100644 --- a/dolphin-commons/dolphin-common-security/src/main/java/day/gitlab/dolphin/common/security/AuthenticationFilter.java +++ b/dolphin-commons/dolphin-common-security/src/main/java/day/gitlab/dolphin/common/security/AuthenticationFilter.java @@ -1,10 +1,9 @@ package day.gitlab.dolphin.common.security; -import com.fasterxml.jackson.databind.ObjectMapper; -import day.gitlab.dolphin.common.core.entity.Result; -import day.gitlab.dolphin.common.core.exception.BusinessException; import day.gitlab.dolphin.common.security.annotation.AuthorityIgnoreInitializer; import day.gitlab.dolphin.common.security.config.SecurityConfig; +import day.gitlab.dolphin.common.web.entity.ApiResponse; +import day.gitlab.dolphin.common.web.exception.BusinessException; import jakarta.servlet.FilterChain; import jakarta.servlet.ServletException; import jakarta.servlet.http.HttpServletRequest; @@ -13,6 +12,7 @@ import org.springframework.http.MediaType; import org.springframework.lang.NonNull; import org.springframework.stereotype.Component; import org.springframework.web.filter.OncePerRequestFilter; +import tools.jackson.databind.ObjectMapper; import java.io.IOException; @@ -51,12 +51,12 @@ public class AuthenticationFilter extends OncePerRequestFilter { response.setStatus(200); response.setContentType(MediaType.APPLICATION_JSON_VALUE); response.setCharacterEncoding("UTF-8"); - response.getWriter().write(new ObjectMapper().writeValueAsString(Result.failure(e))); + response.getWriter().write(new ObjectMapper().writeValueAsString(ApiResponse.failure(e))); } catch (Exception e) { response.setStatus(500); response.setContentType(MediaType.APPLICATION_JSON_VALUE); response.setCharacterEncoding("UTF-8"); - response.getWriter().write(new ObjectMapper().writeValueAsString(Result.failure(e.getMessage()))); + response.getWriter().write(new ObjectMapper().writeValueAsString(ApiResponse.failure(e))); } finally { SecurityContextHolder.clearAuthentication(); } diff --git a/dolphin-commons/dolphin-common-security/src/main/java/day/gitlab/dolphin/common/security/annotation/AuthorityCheckAspect.java b/dolphin-commons/dolphin-common-security/src/main/java/day/gitlab/dolphin/common/security/annotation/AuthorityCheckAspect.java index 9a42886..64c7049 100644 --- a/dolphin-commons/dolphin-common-security/src/main/java/day/gitlab/dolphin/common/security/annotation/AuthorityCheckAspect.java +++ b/dolphin-commons/dolphin-common-security/src/main/java/day/gitlab/dolphin/common/security/annotation/AuthorityCheckAspect.java @@ -1,9 +1,9 @@ package day.gitlab.dolphin.common.security.annotation; -import day.gitlab.dolphin.common.core.i18n.MessagesHelper; import day.gitlab.dolphin.common.security.Authentication; import day.gitlab.dolphin.common.security.SecurityContextHolder; import day.gitlab.dolphin.common.security.constants.Exceptions; +import day.gitlab.dolphin.common.web.i18n.MessagesHelper; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.annotation.Before; diff --git a/dolphin-commons/dolphin-common-security/src/main/java/day/gitlab/dolphin/common/security/config/SecurityConfig.java b/dolphin-commons/dolphin-common-security/src/main/java/day/gitlab/dolphin/common/security/config/SecurityConfig.java index 892c6af..eb73c3a 100644 --- a/dolphin-commons/dolphin-common-security/src/main/java/day/gitlab/dolphin/common/security/config/SecurityConfig.java +++ b/dolphin-commons/dolphin-common-security/src/main/java/day/gitlab/dolphin/common/security/config/SecurityConfig.java @@ -21,4 +21,5 @@ public class SecurityConfig { private long refreshTokenExpire = 7 * 24 * 3600 * 1000L; + private String issuer = "dolphin"; } diff --git a/dolphin-commons/dolphin-common-core/src/main/java/day/gitlab/dolphin/common/core/util/JWT.java b/dolphin-commons/dolphin-common-security/src/main/java/day/gitlab/dolphin/common/security/jwt/JWT.java similarity index 54% rename from dolphin-commons/dolphin-common-core/src/main/java/day/gitlab/dolphin/common/core/util/JWT.java rename to dolphin-commons/dolphin-common-security/src/main/java/day/gitlab/dolphin/common/security/jwt/JWT.java index a525a13..45ec440 100644 --- a/dolphin-commons/dolphin-common-core/src/main/java/day/gitlab/dolphin/common/core/util/JWT.java +++ b/dolphin-commons/dolphin-common-security/src/main/java/day/gitlab/dolphin/common/security/jwt/JWT.java @@ -1,7 +1,6 @@ -package day.gitlab.dolphin.common.core.util; +package day.gitlab.dolphin.common.security.jwt; import io.jsonwebtoken.Claims; -import io.jsonwebtoken.ClaimsBuilder; import io.jsonwebtoken.Jwts; import io.jsonwebtoken.security.Keys; @@ -9,25 +8,11 @@ import javax.crypto.SecretKey; import java.nio.charset.StandardCharsets; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; -import java.util.Date; -import java.util.function.Function; -public final class JWT { +public class JWT { - private JWT() {} - - public static String generate(String secret, long expiration, Function func) { - return JWT.generate(secret, expiration, func.apply(Jwts.claims())); - } - - public static String generate(String secret, long expiration, Claims claims) { - return Jwts.builder() - .id(UUIDv7.randomUUID().toString()) - .claims(claims) - .issuedAt(new Date()) - .expiration(new Date(System.currentTimeMillis() + expiration)) - .signWith(getSecretKey(secret)) - .compact(); + public static String generate(String secret, Claims claims) { + return Jwts.builder().claims(claims).signWith(getSecretKey(secret)).compact(); } public static Claims parse(String secret, String token) { diff --git a/dolphin-commons/dolphin-common-security/src/main/java/day/gitlab/dolphin/common/security/jwt/JwtAuthenticationInitialize.java b/dolphin-commons/dolphin-common-security/src/main/java/day/gitlab/dolphin/common/security/jwt/JwtAuthenticationInitialize.java index a30a82e..e1f099a 100644 --- a/dolphin-commons/dolphin-common-security/src/main/java/day/gitlab/dolphin/common/security/jwt/JwtAuthenticationInitialize.java +++ b/dolphin-commons/dolphin-common-security/src/main/java/day/gitlab/dolphin/common/security/jwt/JwtAuthenticationInitialize.java @@ -1,19 +1,19 @@ package day.gitlab.dolphin.common.security.jwt; -import com.fasterxml.jackson.databind.ObjectMapper; -import day.gitlab.dolphin.common.core.i18n.MessagesHelper; -import day.gitlab.dolphin.common.core.util.JWT; import day.gitlab.dolphin.common.security.Authentication; import day.gitlab.dolphin.common.security.AuthenticationInitialize; import day.gitlab.dolphin.common.security.AuthenticationProvider; import day.gitlab.dolphin.common.security.UserPrincipal; import day.gitlab.dolphin.common.security.config.SecurityConfig; import day.gitlab.dolphin.common.security.constants.Exceptions; +import day.gitlab.dolphin.common.web.i18n.MessagesHelper; import io.jsonwebtoken.Claims; import jakarta.servlet.http.HttpServletRequest; +import lombok.RequiredArgsConstructor; import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.stereotype.Component; import org.springframework.util.StringUtils; +import tools.jackson.databind.ObjectMapper; import java.util.Date; import java.util.List; @@ -21,6 +21,7 @@ import java.util.Objects; import java.util.stream.Collectors; @Component +@RequiredArgsConstructor public class JwtAuthenticationInitialize implements AuthenticationInitialize { private final SecurityConfig securityConfig; @@ -31,16 +32,6 @@ public class JwtAuthenticationInitialize implements AuthenticationInitialize { private final MessagesHelper messagesHelper; - public JwtAuthenticationInitialize(SecurityConfig securityConfig, - StringRedisTemplate stringRedisTemplate, - AuthenticationProvider authenticationProvider, - MessagesHelper messagesHelper) { - this.securityConfig = securityConfig; - this.stringRedisTemplate = stringRedisTemplate; - this.authenticationProvider = authenticationProvider; - this.messagesHelper = messagesHelper; - } - @Override public Authentication initialize(HttpServletRequest request) { // 1、获取Token diff --git a/dolphin-commons/dolphin-common-security/src/main/java/day/gitlab/dolphin/common/security/jwt/JwtInfo.java b/dolphin-commons/dolphin-common-security/src/main/java/day/gitlab/dolphin/common/security/jwt/JwtInfo.java index fc652af..dc7f5c2 100644 --- a/dolphin-commons/dolphin-common-security/src/main/java/day/gitlab/dolphin/common/security/jwt/JwtInfo.java +++ b/dolphin-commons/dolphin-common-security/src/main/java/day/gitlab/dolphin/common/security/jwt/JwtInfo.java @@ -1,12 +1,16 @@ package day.gitlab.dolphin.common.security.jwt; -import day.gitlab.dolphin.common.core.util.JWT; import day.gitlab.dolphin.common.security.config.SecurityConfig; import io.jsonwebtoken.Claims; import io.jsonwebtoken.ClaimsBuilder; +import io.jsonwebtoken.Jwts; import jakarta.annotation.Resource; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import tools.jackson.databind.json.JsonMapper; +import java.util.Date; +import java.util.UUID; import java.util.function.Function; @Component @@ -18,23 +22,37 @@ public class JwtInfo { @Resource private SecurityConfig securityConfig; + @Autowired + private JsonMapper.Builder builder; - public String generate(long expiration, Claims claims) { - return JWT.generate(securityConfig.getSecret(), securityConfig.getExpire(), claims); + public String generate(Claims claims) { + return JWT.generate(securityConfig.getSecret(), claims); } - public String generate(long expiration, Function func) { - return JWT.generate(securityConfig.getSecret(), securityConfig.getExpire(), func); + public String generate(Function func) { + return JWT.generate(securityConfig.getSecret(), func.apply(Jwts.claims())); } public String generateAccessToken(String userId) { - return JWT.generate(securityConfig.getSecret(), securityConfig.getExpire(), (builder) -> - builder.subject(userId).add("type", "access").build()); + return generate(claims -> claims + .issuedAt(new Date()) + .expiration(new Date(System.currentTimeMillis() + securityConfig.getExpire())) + .id(UUID.randomUUID().toString()) + .subject(userId) + .issuer(securityConfig.getIssuer()) + .add("type", "access") + .build()); } public String generateRefreshToken(String userId) { - return JWT.generate(securityConfig.getSecret(), securityConfig.getRefreshTokenExpire(), (builder) -> - builder.subject(userId).add("type", "refresh").build()); + return generate(claims -> claims + .issuedAt(new Date()) + .expiration(new Date(System.currentTimeMillis() + securityConfig.getRefreshTokenExpire())) + .id(UUID.randomUUID().toString()) + .subject(userId) + .issuer(securityConfig.getIssuer()) + .add("type", "refresh") + .build()); } public Claims parse(String token) { diff --git a/dolphin-commons/dolphin-common-web/pom.xml b/dolphin-commons/dolphin-common-web/pom.xml new file mode 100644 index 0000000..0a88c85 --- /dev/null +++ b/dolphin-commons/dolphin-common-web/pom.xml @@ -0,0 +1,43 @@ + + + 4.0.0 + + + day.gitlab + dolphin-commons + 0.0.1-SNAPSHOT + + + dolphin-common-web + jar + + + + + day.gitlab + dolphin-common-core + ${project.version} + + + + org.springframework.boot + spring-boot-starter-webmvc + + + + org.projectlombok + lombok + true + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + + + diff --git a/dolphin-commons/dolphin-common-web/src/main/java/day/gitlab/dolphin/common/web/entity/ApiResponse.java b/dolphin-commons/dolphin-common-web/src/main/java/day/gitlab/dolphin/common/web/entity/ApiResponse.java new file mode 100644 index 0000000..4c34010 --- /dev/null +++ b/dolphin-commons/dolphin-common-web/src/main/java/day/gitlab/dolphin/common/web/entity/ApiResponse.java @@ -0,0 +1,43 @@ +package day.gitlab.dolphin.common.web.entity; + +import day.gitlab.dolphin.common.web.exception.BusinessException; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class ApiResponse { + + public static final String SUCCESS = "00000000"; + public static final String FAILURE = "99999999"; + + public static final String SUCCESS_MESSAGE = "success"; + public static final String FAILURE_MESSAGE = "failure"; + + private String code; + private String message; + private T data; + + public static ApiResponse success() { + return ApiResponse.builder().code(SUCCESS).message(SUCCESS_MESSAGE).build(); + } + + public static ApiResponse success(T data) { + return new ApiResponse<>(SUCCESS, SUCCESS_MESSAGE, data); + } + + public static ApiResponse failure(String code, String message) { + return ApiResponse.builder().code(code).message(message).build(); + } + + public static ApiResponse failure(Exception e) { + if (e instanceof BusinessException) { + return ApiResponse.builder().code(((BusinessException) e).getCode()).message(e.getMessage()).build(); + } + return ApiResponse.builder().code(FAILURE).message(e.getMessage()).build(); + } +} diff --git a/dolphin-commons/dolphin-common-web/src/main/java/day/gitlab/dolphin/common/web/entity/PageRequest.java b/dolphin-commons/dolphin-common-web/src/main/java/day/gitlab/dolphin/common/web/entity/PageRequest.java new file mode 100644 index 0000000..cfcccb1 --- /dev/null +++ b/dolphin-commons/dolphin-common-web/src/main/java/day/gitlab/dolphin/common/web/entity/PageRequest.java @@ -0,0 +1,16 @@ +package day.gitlab.dolphin.common.web.entity; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@NoArgsConstructor +@AllArgsConstructor +public class PageRequest { + + private Long pageIndex; + private Long pageSize; + + private T query; +} diff --git a/dolphin-commons/dolphin-common-web/src/main/java/day/gitlab/dolphin/common/web/entity/PageResponse.java b/dolphin-commons/dolphin-common-web/src/main/java/day/gitlab/dolphin/common/web/entity/PageResponse.java new file mode 100644 index 0000000..c09fa46 --- /dev/null +++ b/dolphin-commons/dolphin-common-web/src/main/java/day/gitlab/dolphin/common/web/entity/PageResponse.java @@ -0,0 +1,18 @@ +package day.gitlab.dolphin.common.web.entity; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + +@Data +@NoArgsConstructor +@AllArgsConstructor +public class PageResponse { + + private Long pageIndex; + private Long pageSize; + private Long total; + private List records; +} diff --git a/dolphin-commons/dolphin-common-core/src/main/java/day/gitlab/dolphin/common/core/exception/BusinessException.java b/dolphin-commons/dolphin-common-web/src/main/java/day/gitlab/dolphin/common/web/exception/BusinessException.java similarity index 82% rename from dolphin-commons/dolphin-common-core/src/main/java/day/gitlab/dolphin/common/core/exception/BusinessException.java rename to dolphin-commons/dolphin-common-web/src/main/java/day/gitlab/dolphin/common/web/exception/BusinessException.java index 6a710eb..72e225a 100644 --- a/dolphin-commons/dolphin-common-core/src/main/java/day/gitlab/dolphin/common/core/exception/BusinessException.java +++ b/dolphin-commons/dolphin-common-web/src/main/java/day/gitlab/dolphin/common/web/exception/BusinessException.java @@ -1,4 +1,4 @@ -package day.gitlab.dolphin.common.core.exception; +package day.gitlab.dolphin.common.web.exception; import lombok.Getter; diff --git a/dolphin-commons/dolphin-common-web/src/main/java/day/gitlab/dolphin/common/web/exception/GlobalExceptionHandler.java b/dolphin-commons/dolphin-common-web/src/main/java/day/gitlab/dolphin/common/web/exception/GlobalExceptionHandler.java new file mode 100644 index 0000000..5396223 --- /dev/null +++ b/dolphin-commons/dolphin-common-web/src/main/java/day/gitlab/dolphin/common/web/exception/GlobalExceptionHandler.java @@ -0,0 +1,19 @@ +package day.gitlab.dolphin.common.web.exception; + +import day.gitlab.dolphin.common.web.entity.ApiResponse; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.bind.annotation.RestControllerAdvice; + +@RestControllerAdvice +public class GlobalExceptionHandler { + + @ExceptionHandler(value = BusinessException.class) + public ApiResponse handleBusinessException(BusinessException e) { + return ApiResponse.failure(e); + } + + @ExceptionHandler(value = Exception.class) + public ApiResponse handleException(Exception e) { + return ApiResponse.failure(e); + } +} diff --git a/dolphin-commons/dolphin-common-core/src/main/java/day/gitlab/dolphin/common/core/i18n/MessagesConfiguration.java b/dolphin-commons/dolphin-common-web/src/main/java/day/gitlab/dolphin/common/web/i18n/MessagesConfiguration.java similarity index 95% rename from dolphin-commons/dolphin-common-core/src/main/java/day/gitlab/dolphin/common/core/i18n/MessagesConfiguration.java rename to dolphin-commons/dolphin-common-web/src/main/java/day/gitlab/dolphin/common/web/i18n/MessagesConfiguration.java index 4b2c72a..226b543 100644 --- a/dolphin-commons/dolphin-common-core/src/main/java/day/gitlab/dolphin/common/core/i18n/MessagesConfiguration.java +++ b/dolphin-commons/dolphin-common-web/src/main/java/day/gitlab/dolphin/common/web/i18n/MessagesConfiguration.java @@ -1,4 +1,4 @@ -package day.gitlab.dolphin.common.core.i18n; +package day.gitlab.dolphin.common.web.i18n; import org.springframework.context.MessageSource; import org.springframework.context.annotation.Bean; diff --git a/dolphin-commons/dolphin-common-core/src/main/java/day/gitlab/dolphin/common/core/i18n/MessagesHelper.java b/dolphin-commons/dolphin-common-web/src/main/java/day/gitlab/dolphin/common/web/i18n/MessagesHelper.java similarity index 74% rename from dolphin-commons/dolphin-common-core/src/main/java/day/gitlab/dolphin/common/core/i18n/MessagesHelper.java rename to dolphin-commons/dolphin-common-web/src/main/java/day/gitlab/dolphin/common/web/i18n/MessagesHelper.java index 94aa084..f1544b4 100644 --- a/dolphin-commons/dolphin-common-core/src/main/java/day/gitlab/dolphin/common/core/i18n/MessagesHelper.java +++ b/dolphin-commons/dolphin-common-web/src/main/java/day/gitlab/dolphin/common/web/i18n/MessagesHelper.java @@ -1,7 +1,7 @@ -package day.gitlab.dolphin.common.core.i18n; +package day.gitlab.dolphin.common.web.i18n; -import day.gitlab.dolphin.common.core.entity.Result; -import day.gitlab.dolphin.common.core.exception.BusinessException; +import day.gitlab.dolphin.common.web.entity.ApiResponse; +import day.gitlab.dolphin.common.web.exception.BusinessException; import lombok.Getter; import org.springframework.context.MessageSource; import org.springframework.context.i18n.LocaleContextHolder; @@ -33,16 +33,6 @@ public class MessagesHelper { return messageSource.getMessage(code, args, defaultMessage, getCurrentLocale()); } - // ========== 成功响应方法 ========== - - public Result success() { - return Result.success(); - } - - public Result success(T data) { - return Result.success(data); - } - // ========== 业务异常快捷方法 ========== public BusinessException newBusinessException(String code, Object... args) { diff --git a/dolphin-commons/pom.xml b/dolphin-commons/pom.xml index 7cbd690..e38a0cc 100644 --- a/dolphin-commons/pom.xml +++ b/dolphin-commons/pom.xml @@ -1,19 +1,21 @@ - 4.0.0 - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + + day.gitlab dolphin-backend 0.0.1-SNAPSHOT - dolphin-commons - pom + dolphin-commons + pom - - dolphin-common-core - dolphin-common-mybatis - dolphin-common-security - + + dolphin-common-core + dolphin-common-web + dolphin-common-mybatis + dolphin-common-security + diff --git a/dolphin-compose/pom.xml b/dolphin-compose/pom.xml index d1d55a9..74f9218 100644 --- a/dolphin-compose/pom.xml +++ b/dolphin-compose/pom.xml @@ -1,85 +1,118 @@ - 4.0.0 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + day.gitlab dolphin-backend 0.0.1-SNAPSHOT - dolphin-compose - jar + dolphin-compose + jar - - day.gitlab - dolphin-module-core - ${project.version} - - - day.gitlab - dolphin-module-rbac - ${project.version} - - - day.gitlab - dolphin-module-auth - ${project.version} - + + day.gitlab + dolphin-authorize + 0.0.1-SNAPSHOT + + + day.gitlab + dolphin-module-core + ${project.version} + + + day.gitlab + dolphin-module-rbac + ${project.version} + org.springframework.boot - spring-boot-starter-web + spring-boot-starter-webmvc - org.springframework.boot - spring-boot-starter-jdbc - + org.springframework.boot + spring-boot-starter-data-redis + - org.springframework.boot - spring-boot-starter-data-redis - + org.springframework.boot + spring-boot-starter-validation + + + + org.mybatis.spring.boot + mybatis-spring-boot-starter + - com.mysql - mysql-connector-j - runtime - - - com.oracle.database.jdbc - ojdbc11 - runtime - - - org.postgresql - postgresql - runtime - - - - io.jsonwebtoken - jjwt-api - - - io.jsonwebtoken - jjwt-impl - - - io.jsonwebtoken - jjwt-jackson - + com.h2database + h2 + runtime + + + com.mysql + mysql-connector-j + runtime + + + com.oracle.database.jdbc + ojdbc11 + runtime + + + org.postgresql + postgresql + runtime + + + + io.jsonwebtoken + jjwt-api + + + io.jsonwebtoken + jjwt-impl + + + io.jsonwebtoken + jjwt-jackson + - org.projectlombok - lombok - true - + org.projectlombok + lombok + true + + + + org.springframework.boot + spring-boot-starter-webmvc-test + test + + + org.mybatis.spring.boot + mybatis-spring-boot-starter-test + 4.0.0 + test + + + org.springframework.boot + spring-boot-starter-data-redis-test + test + + + org.springframework.boot + spring-boot-starter-validation-test + test + - - + + org.apache.maven.plugins maven-compiler-plugin @@ -89,5 +122,5 @@ spring-boot-maven-plugin - + diff --git a/dolphin-compose/src/main/java/day/gitlab/dolphin/DolphinApplication.java b/dolphin-compose/src/main/java/day/gitlab/dolphin/DolphinApplication.java index 2c31c6f..ebc8dc7 100644 --- a/dolphin-compose/src/main/java/day/gitlab/dolphin/DolphinApplication.java +++ b/dolphin-compose/src/main/java/day/gitlab/dolphin/DolphinApplication.java @@ -6,7 +6,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; @SpringBootApplication public class DolphinApplication { - public static void main(String[] args) { - SpringApplication.run(DolphinApplication.class, args); + static void main() { + SpringApplication.run(DolphinApplication.class); } } diff --git a/dolphin-compose/src/main/resources/application.yml b/dolphin-compose/src/main/resources/application.yml index 42114c6..4559456 100644 --- a/dolphin-compose/src/main/resources/application.yml +++ b/dolphin-compose/src/main/resources/application.yml @@ -1,22 +1,28 @@ server: - port: 8080 - servlet: - context-path: / + port: 8080 + servlet: + context-path: / spring: - application: - name: dolphin-compose - datasource: - type: com.zaxxer.hikari.HikariDataSource - driver-class-name: org.postgresql.Driver - url: jdbc:postgresql://110.42.60.129:10002/postgres - username: postgres - password: postgres - data: - redis: - host: 110.42.60.129 - port: 10001 - database: 0 - password: 123456 - jackson: - date-format: yyyy-MM-dd HH:mm:ss - + application: + name: dolphin-compose + datasource: + type: com.zaxxer.hikari.HikariDataSource + driver-class-name: org.postgresql.Driver + url: jdbc:postgresql://110.42.60.129:10002/postgres + username: postgres + password: postgres + data: + redis: + host: 110.42.60.129 + port: 10001 + database: 0 + password: 123456 + jackson: + time-zone: Asia/Shanghai + date-format: yyyy-MM-dd HH:mm:ss +mybatis-plus: + configuration: + map-underscore-to-camel-case: true + global-config: + db-config: + id-type: assign_uuid diff --git a/dolphin-modules/dolphin-module-auth/pom.xml b/dolphin-modules/dolphin-module-auth/pom.xml deleted file mode 100644 index cca468d..0000000 --- a/dolphin-modules/dolphin-module-auth/pom.xml +++ /dev/null @@ -1,65 +0,0 @@ - - - 4.0.0 - - day.gitlab - dolphin-modules - 0.0.1-SNAPSHOT - - - dolphin-module-auth - jar - - - - - day.gitlab - dolphin-common-security - ${project.version} - - - day.gitlab - dolphin-common-mybatis - ${project.version} - - - day.gitlab - dolphin-module-rbac - ${project.version} - - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-validation - - - org.springframework.boot - spring-boot-starter-jdbc - - - - com.mybatis-flex - mybatis-flex-spring-boot3-starter - - - - org.projectlombok - lombok - true - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - - - diff --git a/dolphin-modules/dolphin-module-auth/src/main/java/day/gitlab/dolphin/auth/controller/AuthController.java b/dolphin-modules/dolphin-module-auth/src/main/java/day/gitlab/dolphin/auth/controller/AuthController.java deleted file mode 100644 index 65e9d4c..0000000 --- a/dolphin-modules/dolphin-module-auth/src/main/java/day/gitlab/dolphin/auth/controller/AuthController.java +++ /dev/null @@ -1,29 +0,0 @@ -package day.gitlab.dolphin.auth.controller; - -import day.gitlab.dolphin.auth.entity.dto.LoginDTO; -import day.gitlab.dolphin.auth.entity.vo.LoginVO; -import day.gitlab.dolphin.auth.entity.vo.UserInfoVO; -import day.gitlab.dolphin.auth.service.AuthService; -import day.gitlab.dolphin.common.core.entity.Result; -import day.gitlab.dolphin.common.security.annotation.AuthorityIgnore; -import jakarta.annotation.Resource; -import org.springframework.web.bind.annotation.*; - -@RestController -@RequestMapping("/auth") -public class AuthController { - - @Resource - private AuthService authService; - - @AuthorityIgnore - @PostMapping("/login") - public Result login(@RequestBody LoginDTO loginDTO) { - return Result.success(authService.login(loginDTO)); - } - - @GetMapping("/getUserInfo") - public Result getUserInfo() { - return Result.success(authService.getUserInfo()); - } -} diff --git a/dolphin-modules/dolphin-module-auth/src/main/java/day/gitlab/dolphin/auth/entity/dto/LoginDTO.java b/dolphin-modules/dolphin-module-auth/src/main/java/day/gitlab/dolphin/auth/entity/dto/LoginDTO.java deleted file mode 100644 index 231658e..0000000 --- a/dolphin-modules/dolphin-module-auth/src/main/java/day/gitlab/dolphin/auth/entity/dto/LoginDTO.java +++ /dev/null @@ -1,14 +0,0 @@ -package day.gitlab.dolphin.auth.entity.dto; - -import jakarta.validation.constraints.NotNull; -import lombok.Data; - -@Data -public class LoginDTO { - - @NotNull - private String username; - - @NotNull - private String password; -} diff --git a/dolphin-modules/dolphin-module-auth/src/main/java/day/gitlab/dolphin/auth/service/AuthService.java b/dolphin-modules/dolphin-module-auth/src/main/java/day/gitlab/dolphin/auth/service/AuthService.java deleted file mode 100644 index b77ac10..0000000 --- a/dolphin-modules/dolphin-module-auth/src/main/java/day/gitlab/dolphin/auth/service/AuthService.java +++ /dev/null @@ -1,12 +0,0 @@ -package day.gitlab.dolphin.auth.service; - -import day.gitlab.dolphin.auth.entity.dto.LoginDTO; -import day.gitlab.dolphin.auth.entity.vo.LoginVO; -import day.gitlab.dolphin.auth.entity.vo.UserInfoVO; - -public interface AuthService { - - LoginVO login(LoginDTO loginDTO); - - UserInfoVO getUserInfo(); -} diff --git a/dolphin-modules/dolphin-module-auth/src/main/java/day/gitlab/dolphin/auth/service/impl/AuthServiceImpl.java b/dolphin-modules/dolphin-module-auth/src/main/java/day/gitlab/dolphin/auth/service/impl/AuthServiceImpl.java deleted file mode 100644 index cb63161..0000000 --- a/dolphin-modules/dolphin-module-auth/src/main/java/day/gitlab/dolphin/auth/service/impl/AuthServiceImpl.java +++ /dev/null @@ -1,86 +0,0 @@ -package day.gitlab.dolphin.auth.service.impl; - -import day.gitlab.dolphin.auth.constants.Exceptions; -import day.gitlab.dolphin.auth.entity.dto.LoginDTO; -import day.gitlab.dolphin.auth.entity.vo.LoginVO; -import day.gitlab.dolphin.auth.entity.vo.UserInfoVO; -import day.gitlab.dolphin.auth.service.AuthService; -import day.gitlab.dolphin.common.core.i18n.MessagesHelper; -import day.gitlab.dolphin.common.core.util.BCrypt; -import day.gitlab.dolphin.common.security.Authentication; -import day.gitlab.dolphin.common.security.AuthenticationProvider; -import day.gitlab.dolphin.common.security.SecurityContextHolder; -import day.gitlab.dolphin.common.security.UserPrincipal; -import day.gitlab.dolphin.common.security.jwt.JwtInfo; -import day.gitlab.dolphin.rbac.constants.UserEnabled; -import day.gitlab.dolphin.rbac.entity.Role; -import day.gitlab.dolphin.rbac.entity.User; -import day.gitlab.dolphin.rbac.mapper.UserMapper; -import jakarta.annotation.Resource; -import org.springframework.stereotype.Service; - -import java.util.Collections; -import java.util.List; -import java.util.stream.Collectors; - -@Service -public class AuthServiceImpl implements AuthService, AuthenticationProvider { - - @Resource - private UserMapper userMapper; - - @Resource - private MessagesHelper messagesHelper; - - @Resource - private JwtInfo jwtInfo; - - @Override - public LoginVO login(LoginDTO loginDTO) { - User dbUser = userMapper.findByUsername(loginDTO.getUsername()); - if (dbUser == null || !BCrypt.checkpw(loginDTO.getPassword(), dbUser.getPassword())) { - throw messagesHelper.newBusinessException(Exceptions.USERNAME_OR_PASSWORD_INCORRECT); - } - if (!UserEnabled.ENABLED.equals(dbUser.getEnabled())) { - throw messagesHelper.newBusinessException(Exceptions.USER_NOT_ENABLED); - } - - return LoginVO.builder() - .accessToken(jwtInfo.generateAccessToken(dbUser.getId())) - .refreshToken(jwtInfo.generateRefreshToken(dbUser.getId())) - .build(); - } - - @Override - public UserInfoVO getUserInfo() { - Authentication authentication = SecurityContextHolder.getAuthentication(); - return UserInfoVO.builder() - .id(authentication.getUserPrincipal().getId()) - .username(authentication.getUserPrincipal().getNickname()) - .authorities(authentication.getUserAuthorities()) - .build(); - } - - @Override - public UserPrincipal getUserPrincipal(String userId) { - User user = userMapper.selectOneById(userId); - - return UserPrincipal.builder() - .id(user.getId()) - .username(user.getUsername()) - .nickname(user.getNickname()) - .build(); - } - - @Override - public List getUserAuthorities(String userId) { - User user = userMapper.selectOneWithRelationsById(userId); - - List roles = user.getRoles(); - if (roles == null || roles.isEmpty()) { - return Collections.emptyList(); - } - - return roles.stream().map(Role::getCode).collect(Collectors.toList()); - } -} diff --git a/dolphin-modules/dolphin-module-core/pom.xml b/dolphin-modules/dolphin-module-core/pom.xml index 1344611..9568628 100644 --- a/dolphin-modules/dolphin-module-core/pom.xml +++ b/dolphin-modules/dolphin-module-core/pom.xml @@ -1,60 +1,43 @@ - 4.0.0 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + day.gitlab dolphin-modules 0.0.1-SNAPSHOT - dolphin-module-core - jar + dolphin-module-core + jar - + day.gitlab dolphin-common-security ${project.version} - - day.gitlab - dolphin-common-mybatis - ${project.version} - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-validation - - - org.springframework.boot - spring-boot-starter-jdbc - - - - com.mybatis-flex - mybatis-flex-spring-boot3-starter + spring-boot-starter-webmvc - org.projectlombok - lombok - true - + org.projectlombok + lombok + true + - - + + org.apache.maven.plugins maven-compiler-plugin - + diff --git a/dolphin-modules/dolphin-module-core/src/main/java/day/gitlab/dolphin/core/constants/Exceptions.java b/dolphin-modules/dolphin-module-core/src/main/java/day/gitlab/dolphin/core/constants/Exceptions.java deleted file mode 100644 index f1d4603..0000000 --- a/dolphin-modules/dolphin-module-core/src/main/java/day/gitlab/dolphin/core/constants/Exceptions.java +++ /dev/null @@ -1,6 +0,0 @@ -package day.gitlab.dolphin.core.constants; - -public class Exceptions { - - public static final String FIELD_REQUIRED = "00020101"; -} diff --git a/dolphin-modules/dolphin-module-core/src/main/java/day/gitlab/dolphin/core/controller/DictionaryController.java b/dolphin-modules/dolphin-module-core/src/main/java/day/gitlab/dolphin/core/controller/DictionaryController.java deleted file mode 100644 index 40a40f1..0000000 --- a/dolphin-modules/dolphin-module-core/src/main/java/day/gitlab/dolphin/core/controller/DictionaryController.java +++ /dev/null @@ -1,65 +0,0 @@ -package day.gitlab.dolphin.core.controller; - -import day.gitlab.dolphin.common.core.entity.PageResponse; -import day.gitlab.dolphin.common.core.entity.QueryPageRequest; -import day.gitlab.dolphin.common.core.entity.Result; -import day.gitlab.dolphin.common.security.annotation.AuthorityCheck; -import day.gitlab.dolphin.common.security.annotation.AuthorityType; -import day.gitlab.dolphin.core.entity.dto.DictionaryDTO; -import day.gitlab.dolphin.core.entity.vo.DictionaryVO; -import jakarta.annotation.Resource; -import org.springframework.web.bind.annotation.*; -import day.gitlab.dolphin.core.service.DictionaryService; - -/** - * 字典 控制层。 - * - * @author jiangyc - * @since 2025-11-28 - */ -@RestController -@RequestMapping("/dictionary") -public class DictionaryController { - - @Resource - private DictionaryService dictionaryService; - - /** - * 分页查询字典。 - * - * @param pageRequest 分页请求参数 - * @return 分页对象 - */ - @PostMapping("page") - public Result> page(@RequestBody QueryPageRequest pageRequest) { - return Result.success(dictionaryService.page(pageRequest)); - } - - @PostMapping("add") - @AuthorityCheck(type = AuthorityType.OR, value = {"ROLE00001"}) - public Result add(@RequestBody DictionaryDTO dictionaryDTO) { - dictionaryService.add(dictionaryDTO); - return Result.success(); - } - - @PostMapping("edit") - @AuthorityCheck(type = AuthorityType.OR, value = {"ROLE00001"}) - public Result edit(@RequestBody DictionaryDTO dictionaryDTO) { - dictionaryService.edit(dictionaryDTO); - return Result.success(); - } - - @PostMapping("delete") - @AuthorityCheck(type = AuthorityType.OR, value = {"ROLE00001"}) - public Result delete(@RequestBody DictionaryDTO dictionaryDTO) { - dictionaryService.delete(dictionaryDTO.getId()); - return Result.success(); - } - - @PostMapping("deleteBatch") - @AuthorityCheck(type = AuthorityType.OR, value = {"ROLE00001"}) - public Result deleteBatch(@RequestBody DictionaryDTO dictionaryDTO) { - dictionaryService.deleteBatch(dictionaryDTO.getIds()); - return Result.success(); - } -} diff --git a/dolphin-modules/dolphin-module-core/src/main/java/day/gitlab/dolphin/core/controller/DictionaryItemController.java b/dolphin-modules/dolphin-module-core/src/main/java/day/gitlab/dolphin/core/controller/DictionaryItemController.java deleted file mode 100644 index 52a30a1..0000000 --- a/dolphin-modules/dolphin-module-core/src/main/java/day/gitlab/dolphin/core/controller/DictionaryItemController.java +++ /dev/null @@ -1,15 +0,0 @@ -package day.gitlab.dolphin.core.controller; - -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - * 字典项 控制层。 - * - * @author jiangyc - * @since 2025-11-28 - */ -@RestController -@RequestMapping("/dictionaryItem") -public class DictionaryItemController { -} diff --git a/dolphin-modules/dolphin-module-core/src/main/java/day/gitlab/dolphin/core/entity/Dictionary.java b/dolphin-modules/dolphin-module-core/src/main/java/day/gitlab/dolphin/core/entity/Dictionary.java deleted file mode 100644 index c27deaa..0000000 --- a/dolphin-modules/dolphin-module-core/src/main/java/day/gitlab/dolphin/core/entity/Dictionary.java +++ /dev/null @@ -1,68 +0,0 @@ -package day.gitlab.dolphin.core.entity; - -import com.mybatisflex.annotation.Id; -import com.mybatisflex.annotation.KeyType; -import com.mybatisflex.annotation.Table; -import java.io.Serializable; -import java.sql.Timestamp; - -import java.io.Serial; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * 字典 实体类。 - * - * @author jiangyc - * @since 2025-11-28 - */ -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -@Table("sys_core_dictionary") -public class Dictionary implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - @Id - private String id; - - /** - * 字典名称 - */ - private String name; - - /** - * 字典代码 - */ - private String code; - - /** - * 字典类型: enum-枚举、tree-树型 - */ - private String type; - - /** - * 字典描述 - */ - private String description; - - /** - * 创建时间 - */ - private Timestamp createTime; - - /** - * 修改时间 - */ - private Timestamp updateTime; - -} diff --git a/dolphin-modules/dolphin-module-core/src/main/java/day/gitlab/dolphin/core/entity/DictionaryItem.java b/dolphin-modules/dolphin-module-core/src/main/java/day/gitlab/dolphin/core/entity/DictionaryItem.java deleted file mode 100644 index a5aadd2..0000000 --- a/dolphin-modules/dolphin-module-core/src/main/java/day/gitlab/dolphin/core/entity/DictionaryItem.java +++ /dev/null @@ -1,77 +0,0 @@ -package day.gitlab.dolphin.core.entity; - -import com.mybatisflex.annotation.Id; -import com.mybatisflex.annotation.Table; -import java.io.Serializable; -import java.sql.Timestamp; - -import java.io.Serial; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * 字典项 实体类。 - * - * @author jiangyc - * @since 2025-11-28 - */ -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -@Table("sys_core_dictionary_item") -public class DictionaryItem implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - @Id - private String id; - - /** - * 字典ID - */ - private String dictionaryId; - - /** - * 父级ID，如果为空则为根节点 - */ - private String parentId; - - /** - * 字典项名称 - */ - private String name; - - /** - * 字典项代码 - */ - private String code; - - /** - * 字典项排序，升序排列 - */ - private Integer sort; - - /** - * 字典项描述 - */ - private String description; - - /** - * 创建时间 - */ - private Timestamp createTime; - - /** - * 修改时间 - */ - private Timestamp updateTime; - -} diff --git a/dolphin-modules/dolphin-module-core/src/main/java/day/gitlab/dolphin/core/entity/dto/DictionarySearchParamsDTO.java b/dolphin-modules/dolphin-module-core/src/main/java/day/gitlab/dolphin/core/entity/dto/DictionarySearchParamsDTO.java deleted file mode 100644 index 20cb963..0000000 --- a/dolphin-modules/dolphin-module-core/src/main/java/day/gitlab/dolphin/core/entity/dto/DictionarySearchParamsDTO.java +++ /dev/null @@ -1,27 +0,0 @@ -package day.gitlab.dolphin.core.entity.dto; - -import jakarta.validation.constraints.Min; -import jakarta.validation.constraints.NotNull; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@NoArgsConstructor -@AllArgsConstructor -public class DictionarySearchParamsDTO { - - @Min(1) - @NotNull - private Long current; - - @Min(1) - @NotNull - private Long size; - - private String name; - - private String code; - - private String type; -} diff --git a/dolphin-modules/dolphin-module-core/src/main/java/day/gitlab/dolphin/core/entity/table/DictionaryItemTableDef.java b/dolphin-modules/dolphin-module-core/src/main/java/day/gitlab/dolphin/core/entity/table/DictionaryItemTableDef.java deleted file mode 100644 index 7ec8cf6..0000000 --- a/dolphin-modules/dolphin-module-core/src/main/java/day/gitlab/dolphin/core/entity/table/DictionaryItemTableDef.java +++ /dev/null @@ -1,92 +0,0 @@ -package day.gitlab.dolphin.core.entity.table; - -import com.mybatisflex.core.query.QueryColumn; -import com.mybatisflex.core.table.TableDef; - -import java.io.Serial; - -/** - * 字典项 表定义层。 - * - * @author jiangyc - * @since 2025-11-28 - */ -public class DictionaryItemTableDef extends TableDef { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 字典项 - */ - public static final DictionaryItemTableDef DICTIONARY_ITEM = new DictionaryItemTableDef(); - - /** - * 主键 - */ - public final QueryColumn ID = new QueryColumn(this, "id"); - - /** - * 字典项代码 - */ - public final QueryColumn CODE = new QueryColumn(this, "code"); - - /** - * 字典项名称 - */ - public final QueryColumn NAME = new QueryColumn(this, "name"); - - /** - * 字典项排序，升序排列 - */ - public final QueryColumn SORT = new QueryColumn(this, "sort"); - - /** - * 父级ID，如果为空则为根节点 - */ - public final QueryColumn PARENT_ID = new QueryColumn(this, "parent_id"); - - /** - * 创建时间 - */ - public final QueryColumn CREATE_TIME = new QueryColumn(this, "create_time"); - - /** - * 修改时间 - */ - public final QueryColumn UPDATE_TIME = new QueryColumn(this, "update_time"); - - /** - * 字典项描述 - */ - public final QueryColumn DESCRIPTION = new QueryColumn(this, "description"); - - /** - * 字典ID - */ - public final QueryColumn DICTIONARY_ID = new QueryColumn(this, "dictionary_id"); - - /** - * 所有字段。 - */ - public final QueryColumn ALL_COLUMNS = new QueryColumn(this, "*"); - - /** - * 默认字段，不包含逻辑删除或者 large 等字段。 - */ - public final QueryColumn[] DEFAULT_COLUMNS = new QueryColumn[]{ID, DICTIONARY_ID, PARENT_ID, NAME, CODE, SORT, DESCRIPTION, CREATE_TIME, UPDATE_TIME}; - - public DictionaryItemTableDef() { - super("", "sys_core_dictionary_item"); - } - - private DictionaryItemTableDef(String schema, String name, String alisa) { - super(schema, name, alisa); - } - - public DictionaryItemTableDef as(String alias) { - String key = getNameWithSchema() + "." + alias; - return getCache(key, k -> new DictionaryItemTableDef("", "sys_core_dictionary_item", alias)); - } - -} diff --git a/dolphin-modules/dolphin-module-core/src/main/java/day/gitlab/dolphin/core/entity/table/DictionaryTableDef.java b/dolphin-modules/dolphin-module-core/src/main/java/day/gitlab/dolphin/core/entity/table/DictionaryTableDef.java deleted file mode 100644 index 6e7f4f9..0000000 --- a/dolphin-modules/dolphin-module-core/src/main/java/day/gitlab/dolphin/core/entity/table/DictionaryTableDef.java +++ /dev/null @@ -1,82 +0,0 @@ -package day.gitlab.dolphin.core.entity.table; - -import com.mybatisflex.core.query.QueryColumn; -import com.mybatisflex.core.table.TableDef; - -import java.io.Serial; - -/** - * 字典 表定义层。 - * - * @author jiangyc - * @since 2025-11-28 - */ -public class DictionaryTableDef extends TableDef { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 字典 - */ - public static final DictionaryTableDef DICTIONARY = new DictionaryTableDef(); - - /** - * 主键 - */ - public final QueryColumn ID = new QueryColumn(this, "id"); - - /** - * 字典代码 - */ - public final QueryColumn CODE = new QueryColumn(this, "code"); - - /** - * 字典名称 - */ - public final QueryColumn NAME = new QueryColumn(this, "name"); - - /** - * 字典类型: enum-枚举、tree-树型 - */ - public final QueryColumn TYPE = new QueryColumn(this, "type"); - - /** - * 创建时间 - */ - public final QueryColumn CREATE_TIME = new QueryColumn(this, "create_time"); - - /** - * 修改时间 - */ - public final QueryColumn UPDATE_TIME = new QueryColumn(this, "update_time"); - - /** - * 字典描述 - */ - public final QueryColumn DESCRIPTION = new QueryColumn(this, "description"); - - /** - * 所有字段。 - */ - public final QueryColumn ALL_COLUMNS = new QueryColumn(this, "*"); - - /** - * 默认字段，不包含逻辑删除或者 large 等字段。 - */ - public final QueryColumn[] DEFAULT_COLUMNS = new QueryColumn[]{ID, NAME, CODE, TYPE, DESCRIPTION, CREATE_TIME, UPDATE_TIME}; - - public DictionaryTableDef() { - super("", "sys_core_dictionary"); - } - - private DictionaryTableDef(String schema, String name, String alisa) { - super(schema, name, alisa); - } - - public DictionaryTableDef as(String alias) { - String key = getNameWithSchema() + "." + alias; - return getCache(key, k -> new DictionaryTableDef("", "sys_core_dictionary", alias)); - } - -} diff --git a/dolphin-modules/dolphin-module-core/src/main/java/day/gitlab/dolphin/core/mapper/DictionaryItemMapper.java b/dolphin-modules/dolphin-module-core/src/main/java/day/gitlab/dolphin/core/mapper/DictionaryItemMapper.java deleted file mode 100644 index 1785dc7..0000000 --- a/dolphin-modules/dolphin-module-core/src/main/java/day/gitlab/dolphin/core/mapper/DictionaryItemMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package day.gitlab.dolphin.core.mapper; - -import org.apache.ibatis.annotations.Mapper; -import com.mybatisflex.core.BaseMapper; -import day.gitlab.dolphin.core.entity.DictionaryItem; - -/** - * 字典项 映射层。 - * - * @author jiangyc - * @since 2025-11-28 - */ -@Mapper -public interface DictionaryItemMapper extends BaseMapper { - -} diff --git a/dolphin-modules/dolphin-module-core/src/main/java/day/gitlab/dolphin/core/mapper/DictionaryMapper.java b/dolphin-modules/dolphin-module-core/src/main/java/day/gitlab/dolphin/core/mapper/DictionaryMapper.java deleted file mode 100644 index 9e1ae2e..0000000 --- a/dolphin-modules/dolphin-module-core/src/main/java/day/gitlab/dolphin/core/mapper/DictionaryMapper.java +++ /dev/null @@ -1,37 +0,0 @@ -package day.gitlab.dolphin.core.mapper; - -import com.mybatisflex.core.paginate.Page; -import day.gitlab.dolphin.common.core.entity.QueryPageRequest; -import day.gitlab.dolphin.common.mybatis.Pages; -import day.gitlab.dolphin.core.entity.dto.DictionaryDTO; -import day.gitlab.dolphin.core.entity.table.DictionaryTableDef; -import org.apache.ibatis.annotations.Mapper; -import com.mybatisflex.core.BaseMapper; -import day.gitlab.dolphin.core.entity.Dictionary; -import org.springframework.util.StringUtils; - -/** - * 字典 映射层。 - * - * @author jiangyc - * @since 2025-11-28 - */ -@Mapper -public interface DictionaryMapper extends BaseMapper { - - default Page page(QueryPageRequest pageRequest) { - return Pages.paginate(this, pageRequest, (dict, wrapper) -> { - if (StringUtils.hasText(dict.getName())) { - wrapper.and(DictionaryTableDef.DICTIONARY.NAME.like(dict.getName())); - } - if (StringUtils.hasText(dict.getCode())) { - wrapper.and(DictionaryTableDef.DICTIONARY.CODE.like(dict.getCode())); - } - if (StringUtils.hasText(dict.getType())) { - wrapper.and(DictionaryTableDef.DICTIONARY.TYPE.eq(dict.getType())); - } - - return wrapper; - }); - } -} diff --git a/dolphin-modules/dolphin-module-core/src/main/java/day/gitlab/dolphin/core/service/DictionaryItemService.java b/dolphin-modules/dolphin-module-core/src/main/java/day/gitlab/dolphin/core/service/DictionaryItemService.java deleted file mode 100644 index 8c0b0dd..0000000 --- a/dolphin-modules/dolphin-module-core/src/main/java/day/gitlab/dolphin/core/service/DictionaryItemService.java +++ /dev/null @@ -1,11 +0,0 @@ -package day.gitlab.dolphin.core.service; - -/** - * 字典项 服务层。 - * - * @author jiangyc - * @since 2025-11-28 - */ -public interface DictionaryItemService { - -} diff --git a/dolphin-modules/dolphin-module-core/src/main/java/day/gitlab/dolphin/core/service/DictionaryService.java b/dolphin-modules/dolphin-module-core/src/main/java/day/gitlab/dolphin/core/service/DictionaryService.java deleted file mode 100644 index 0e0b665..0000000 --- a/dolphin-modules/dolphin-module-core/src/main/java/day/gitlab/dolphin/core/service/DictionaryService.java +++ /dev/null @@ -1,27 +0,0 @@ -package day.gitlab.dolphin.core.service; - -import day.gitlab.dolphin.common.core.entity.PageResponse; -import day.gitlab.dolphin.common.core.entity.QueryPageRequest; -import day.gitlab.dolphin.core.entity.dto.DictionaryDTO; -import day.gitlab.dolphin.core.entity.vo.DictionaryVO; - -import java.util.List; - -/** - * 字典 服务层。 - * - * @author jiangyc - * @since 2025-11-28 - */ -public interface DictionaryService { - - PageResponse page(QueryPageRequest pageRequest); - - void add(DictionaryDTO dictionaryDTO); - - void edit(DictionaryDTO dictionaryDTO); - - void delete(String id); - - void deleteBatch(List ids); -} diff --git a/dolphin-modules/dolphin-module-core/src/main/java/day/gitlab/dolphin/core/service/impl/DictionaryItemServiceImpl.java b/dolphin-modules/dolphin-module-core/src/main/java/day/gitlab/dolphin/core/service/impl/DictionaryItemServiceImpl.java deleted file mode 100644 index a57f727..0000000 --- a/dolphin-modules/dolphin-module-core/src/main/java/day/gitlab/dolphin/core/service/impl/DictionaryItemServiceImpl.java +++ /dev/null @@ -1,15 +0,0 @@ -package day.gitlab.dolphin.core.service.impl; - -import day.gitlab.dolphin.core.service.DictionaryItemService; -import org.springframework.stereotype.Service; - -/** - * 字典项 服务层实现。 - * - * @author jiangyc - * @since 2025-11-28 - */ -@Service -public class DictionaryItemServiceImpl implements DictionaryItemService { - -} diff --git a/dolphin-modules/dolphin-module-core/src/main/java/day/gitlab/dolphin/core/service/impl/DictionaryServiceImpl.java b/dolphin-modules/dolphin-module-core/src/main/java/day/gitlab/dolphin/core/service/impl/DictionaryServiceImpl.java deleted file mode 100644 index 07694e5..0000000 --- a/dolphin-modules/dolphin-module-core/src/main/java/day/gitlab/dolphin/core/service/impl/DictionaryServiceImpl.java +++ /dev/null @@ -1,112 +0,0 @@ -package day.gitlab.dolphin.core.service.impl; - -import com.mybatisflex.core.paginate.Page; -import day.gitlab.dolphin.common.core.entity.PageResponse; -import day.gitlab.dolphin.common.core.entity.QueryPageRequest; -import day.gitlab.dolphin.common.core.i18n.MessagesHelper; -import day.gitlab.dolphin.common.mybatis.Pages; -import day.gitlab.dolphin.core.constants.Exceptions; -import day.gitlab.dolphin.core.entity.Dictionary; -import day.gitlab.dolphin.core.entity.dto.DictionaryDTO; -import day.gitlab.dolphin.core.entity.vo.DictionaryVO; -import day.gitlab.dolphin.core.mapper.DictionaryMapper; -import day.gitlab.dolphin.core.service.DictionaryService; -import jakarta.annotation.Resource; -import org.springframework.stereotype.Service; -import org.springframework.util.StringUtils; - -import java.sql.Timestamp; -import java.time.Instant; -import java.util.ArrayList; -import java.util.List; - -/** - * 字典 服务层实现。 - * - * @author jiangyc - * @since 2025-11-28 - */ -@Service -public class DictionaryServiceImpl implements DictionaryService { - - @Resource - private DictionaryMapper dictionaryMapper; - - @Resource - private MessagesHelper messagesHelper; - - @Override - public PageResponse page(QueryPageRequest pageRequest) { - Page page = dictionaryMapper.page(pageRequest); - - return Pages.toPageResponse(page, (rec) -> { - DictionaryVO vo = new DictionaryVO(); - vo.setId(rec.getId()); - vo.setName(rec.getName()); - vo.setCode(rec.getCode()); - vo.setType(rec.getType()); - vo.setDescription(rec.getDescription()); - vo.setCreateTime(rec.getCreateTime()); - vo.setUpdateTime(rec.getUpdateTime()); - return vo; - }); - } - - @Override - public void add(DictionaryDTO dictionaryDTO) { - validate(dictionaryDTO); - - Dictionary dict = Dictionary.builder() - .name(dictionaryDTO.getName()) - .code(dictionaryDTO.getCode()) - .type(dictionaryDTO.getType()) - .description(dictionaryDTO.getDescription()) - .createTime(Timestamp.from(Instant.now())) - .updateTime(Timestamp.from(Instant.now())) - .build(); - dictionaryMapper.insert(dict); - } - - @Override - public void edit(DictionaryDTO dictionaryDTO) { - validate(dictionaryDTO); - - Dictionary dict = Dictionary.builder() - .id(dictionaryDTO.getId()) - .name(dictionaryDTO.getName()) - .code(dictionaryDTO.getCode()) - .type(dictionaryDTO.getType()) - .description(dictionaryDTO.getDescription()) - .updateTime(Timestamp.from(Instant.now())) - .build(); - dictionaryMapper.update(dict); - } - - @Override - public void delete(String id) { - dictionaryMapper.deleteById(id); - } - - @Override - public void deleteBatch(List ids) { - dictionaryMapper.deleteBatchByIds(ids); - } - - private void validate(DictionaryDTO dictionaryDTO) { - List fields = new ArrayList<>(); - - if (!StringUtils.hasText(dictionaryDTO.getName())) { - fields.add("name"); - } - if (!StringUtils.hasText(dictionaryDTO.getCode())) { - fields.add("code"); - } - if (!StringUtils.hasText(dictionaryDTO.getType())) { - fields.add("type"); - } - - if (!fields.isEmpty()) { - throw messagesHelper.newBusinessException(Exceptions.FIELD_REQUIRED, String.join(",", fields)); - } - } -} diff --git a/dolphin-modules/dolphin-module-core/src/main/java/day/gitlab/dolphin/module/core/controller/DictionaryController.java b/dolphin-modules/dolphin-module-core/src/main/java/day/gitlab/dolphin/module/core/controller/DictionaryController.java new file mode 100644 index 0000000..250d962 --- /dev/null +++ b/dolphin-modules/dolphin-module-core/src/main/java/day/gitlab/dolphin/module/core/controller/DictionaryController.java @@ -0,0 +1,43 @@ +package day.gitlab.dolphin.module.core.controller; + +import day.gitlab.dolphin.common.web.entity.ApiResponse; +import day.gitlab.dolphin.common.web.entity.PageRequest; +import day.gitlab.dolphin.common.web.entity.PageResponse; +import day.gitlab.dolphin.module.core.controller.dto.DictionaryDTO; +import day.gitlab.dolphin.module.core.controller.vo.DictionaryVO; +import day.gitlab.dolphin.module.core.service.DictionaryService; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.HashMap; + +@RestController +@RequiredArgsConstructor +@RequestMapping("/dictionary") +public class DictionaryController { + + private final DictionaryService dictionaryService; + + @PostMapping("/paginate") + public ApiResponse> paginate(@RequestBody PageRequest pageRequest) { + return ApiResponse.success(dictionaryService.paginate(pageRequest)); + } + + @PostMapping("/update") + public ApiResponse update(@RequestBody DictionaryDTO record) { + return ApiResponse.success(dictionaryService.update(record)); + } + + @PostMapping("/delete") + public ApiResponse delete(@RequestBody DictionaryDTO record) { + return ApiResponse.success(dictionaryService.delete(record)); + } + + @PostMapping("/insert") + public ApiResponse insert(@RequestBody DictionaryDTO record) { + return ApiResponse.success(dictionaryService.insert(record)); + } +} diff --git a/dolphin-modules/dolphin-module-core/src/main/java/day/gitlab/dolphin/core/entity/dto/DictionaryDTO.java b/dolphin-modules/dolphin-module-core/src/main/java/day/gitlab/dolphin/module/core/controller/dto/DictionaryDTO.java similarity index 69% rename from dolphin-modules/dolphin-module-core/src/main/java/day/gitlab/dolphin/core/entity/dto/DictionaryDTO.java rename to dolphin-modules/dolphin-module-core/src/main/java/day/gitlab/dolphin/module/core/controller/dto/DictionaryDTO.java index 268077a..8b5c6a4 100644 --- a/dolphin-modules/dolphin-module-core/src/main/java/day/gitlab/dolphin/core/entity/dto/DictionaryDTO.java +++ b/dolphin-modules/dolphin-module-core/src/main/java/day/gitlab/dolphin/module/core/controller/dto/DictionaryDTO.java @@ -1,14 +1,10 @@ -package day.gitlab.dolphin.core.entity.dto; +package day.gitlab.dolphin.module.core.controller.dto; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import java.util.List; - @Data -@Builder @NoArgsConstructor @AllArgsConstructor public class DictionaryDTO { @@ -22,6 +18,4 @@ public class DictionaryDTO { private String type; private String description; - - private List ids; } diff --git a/dolphin-modules/dolphin-module-core/src/main/java/day/gitlab/dolphin/core/entity/vo/DictionaryVO.java b/dolphin-modules/dolphin-module-core/src/main/java/day/gitlab/dolphin/module/core/controller/vo/DictionaryVO.java similarity index 65% rename from dolphin-modules/dolphin-module-core/src/main/java/day/gitlab/dolphin/core/entity/vo/DictionaryVO.java rename to dolphin-modules/dolphin-module-core/src/main/java/day/gitlab/dolphin/module/core/controller/vo/DictionaryVO.java index d4135e7..7af4ceb 100644 --- a/dolphin-modules/dolphin-module-core/src/main/java/day/gitlab/dolphin/core/entity/vo/DictionaryVO.java +++ b/dolphin-modules/dolphin-module-core/src/main/java/day/gitlab/dolphin/module/core/controller/vo/DictionaryVO.java @@ -1,14 +1,15 @@ -package day.gitlab.dolphin.core.entity.vo; +package day.gitlab.dolphin.module.core.controller.vo; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; import java.sql.Timestamp; @Data -@Builder @NoArgsConstructor @AllArgsConstructor public class DictionaryVO { diff --git a/dolphin-modules/dolphin-module-core/src/main/java/day/gitlab/dolphin/module/core/entity/Dictionary.java b/dolphin-modules/dolphin-module-core/src/main/java/day/gitlab/dolphin/module/core/entity/Dictionary.java new file mode 100644 index 0000000..dd26ab2 --- /dev/null +++ b/dolphin-modules/dolphin-module-core/src/main/java/day/gitlab/dolphin/module/core/entity/Dictionary.java @@ -0,0 +1,31 @@ +package day.gitlab.dolphin.module.core.entity; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.sql.Timestamp; + +@Data +@NoArgsConstructor +@AllArgsConstructor +@TableName("sys_core_dictionary") +public class Dictionary { + + @TableId + private String id; + + private String name; + + private String code; + + private String type; + + private String description; + + private Timestamp createTime; + + private Timestamp updateTime; +} diff --git a/dolphin-modules/dolphin-module-core/src/main/java/day/gitlab/dolphin/module/core/mapper/DictionaryMapper.java b/dolphin-modules/dolphin-module-core/src/main/java/day/gitlab/dolphin/module/core/mapper/DictionaryMapper.java new file mode 100644 index 0000000..b5861cd --- /dev/null +++ b/dolphin-modules/dolphin-module-core/src/main/java/day/gitlab/dolphin/module/core/mapper/DictionaryMapper.java @@ -0,0 +1,9 @@ +package day.gitlab.dolphin.module.core.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import day.gitlab.dolphin.module.core.entity.Dictionary; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface DictionaryMapper extends BaseMapper { +} diff --git a/dolphin-modules/dolphin-module-core/src/main/java/day/gitlab/dolphin/module/core/service/DictionaryService.java b/dolphin-modules/dolphin-module-core/src/main/java/day/gitlab/dolphin/module/core/service/DictionaryService.java new file mode 100644 index 0000000..396c67e --- /dev/null +++ b/dolphin-modules/dolphin-module-core/src/main/java/day/gitlab/dolphin/module/core/service/DictionaryService.java @@ -0,0 +1,19 @@ +package day.gitlab.dolphin.module.core.service; + +import day.gitlab.dolphin.common.web.entity.PageRequest; +import day.gitlab.dolphin.common.web.entity.PageResponse; +import day.gitlab.dolphin.module.core.controller.dto.DictionaryDTO; +import day.gitlab.dolphin.module.core.controller.vo.DictionaryVO; + +import java.util.List; + +public interface DictionaryService { + + PageResponse paginate(PageRequest pageRequest); + + boolean update(DictionaryDTO record); + + boolean delete(DictionaryDTO record); + + boolean insert(DictionaryDTO record); +} diff --git a/dolphin-modules/dolphin-module-core/src/main/java/day/gitlab/dolphin/module/core/service/impl/DictionaryServiceImpl.java b/dolphin-modules/dolphin-module-core/src/main/java/day/gitlab/dolphin/module/core/service/impl/DictionaryServiceImpl.java new file mode 100644 index 0000000..e3eb438 --- /dev/null +++ b/dolphin-modules/dolphin-module-core/src/main/java/day/gitlab/dolphin/module/core/service/impl/DictionaryServiceImpl.java @@ -0,0 +1,90 @@ +package day.gitlab.dolphin.module.core.service.impl; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import day.gitlab.dolphin.common.core.util.Strings; +import day.gitlab.dolphin.common.mybatis.util.Pages; +import day.gitlab.dolphin.common.web.entity.PageRequest; +import day.gitlab.dolphin.common.web.entity.PageResponse; +import day.gitlab.dolphin.module.core.controller.dto.DictionaryDTO; +import day.gitlab.dolphin.module.core.controller.vo.DictionaryVO; +import day.gitlab.dolphin.module.core.entity.Dictionary; +import day.gitlab.dolphin.module.core.mapper.DictionaryMapper; +import day.gitlab.dolphin.module.core.service.DictionaryService; +import lombok.NonNull; +import lombok.RequiredArgsConstructor; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; + +import java.sql.Timestamp; +import java.time.Instant; + +@Service +@RequiredArgsConstructor +public class DictionaryServiceImpl implements DictionaryService { + + @NonNull + private final DictionaryMapper dictionaryMapper; + + @Override + public PageResponse paginate(PageRequest pageRequest) { + Page paginate = Pages.paginate(pageRequest, dictionaryMapper, (dto, wrapper) -> { + if (Strings.isNotBlank(dto.getName())) { + wrapper.like("name", dto.getName()); + } + if (Strings.isNotBlank(dto.getCode())) { + wrapper.eq("code", dto.getCode()); + } + if (Strings.isNotBlank(dto.getType())) { + wrapper.eq("type", dto.getType()); + } + + return wrapper; + }); + + return Pages.toPageResponse(paginate, (record) -> { + DictionaryVO dictionaryVO = new DictionaryVO(); + BeanUtils.copyProperties(record, dictionaryVO); + return dictionaryVO; + }); + } + + @Override + public boolean update(DictionaryDTO record) { + Dictionary dictionary = dictionaryMapper.selectById(record.getId()); + if (dictionary != null) { + if (Strings.isNotBlank(dictionary.getName())) { + dictionary.setName(dictionary.getName()); + } + if (Strings.isNotBlank(dictionary.getCode())) { + dictionary.setCode(dictionary.getCode()); + } + if (Strings.isNotBlank(dictionary.getType())) { + dictionary.setType(dictionary.getType()); + } + if (Strings.isNotBlank(dictionary.getDescription())) { + dictionary.setDescription(dictionary.getDescription()); + } + dictionary.setUpdateTime(Timestamp.from(Instant.now())); + return dictionaryMapper.updateById(dictionary) == 1; + } + return false; + } + + @Override + public boolean delete(DictionaryDTO record) { + Dictionary dictionary = dictionaryMapper.selectById(record.getId()); + if (dictionary != null) { + return dictionaryMapper.deleteById(dictionary.getId()) == 1; + } + return false; + } + + @Override + public boolean insert(DictionaryDTO record) { + Dictionary dictionary = new Dictionary(); + BeanUtils.copyProperties(record, dictionary); + dictionary.setCreateTime(Timestamp.from(Instant.now())); + dictionary.setUpdateTime(Timestamp.from(Instant.now())); + return dictionaryMapper.insert(dictionary) == 1; + } +} diff --git a/dolphin-modules/dolphin-module-core/src/main/resources/mapper/DictionaryMapper.xml b/dolphin-modules/dolphin-module-core/src/main/resources/mapper/DictionaryMapper.xml new file mode 100644 index 0000000..bc624a5 --- /dev/null +++ b/dolphin-modules/dolphin-module-core/src/main/resources/mapper/DictionaryMapper.xml @@ -0,0 +1,58 @@ + + + + + \ No newline at end of file diff --git a/dolphin-modules/dolphin-module-rbac/pom.xml b/dolphin-modules/dolphin-module-rbac/pom.xml index 690eade..56a5332 100644 --- a/dolphin-modules/dolphin-module-rbac/pom.xml +++ b/dolphin-modules/dolphin-module-rbac/pom.xml @@ -1,60 +1,43 @@ - 4.0.0 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + day.gitlab dolphin-modules 0.0.1-SNAPSHOT - dolphin-module-rbac - jar + dolphin-module-rbac + jar - + day.gitlab dolphin-common-security ${project.version} - - day.gitlab - dolphin-common-mybatis - ${project.version} - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-validation - - - org.springframework.boot - spring-boot-starter-jdbc - - - - com.mybatis-flex - mybatis-flex-spring-boot3-starter + spring-boot-starter-webmvc - org.projectlombok - lombok - true - + org.projectlombok + lombok + true + - - + + org.apache.maven.plugins maven-compiler-plugin - + diff --git a/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/module/rbac/entity/Department.java b/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/module/rbac/entity/Department.java new file mode 100644 index 0000000..55618b1 --- /dev/null +++ b/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/module/rbac/entity/Department.java @@ -0,0 +1,59 @@ +package day.gitlab.dolphin.module.rbac.entity; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import java.util.Date; +import lombok.Data; + +/** + * 部门表 + */ +@Data +@TableName(value ="sys_rbac_department") +public class Department { + /** + * 主键 + */ + @TableId + private String id; + + /** + * 区划ID + */ + private String regionId; + + /** + * 上级部门ID + */ + private String parentId; + + /** + * 部门名称 + */ + private String name; + + /** + * 部门代码 + */ + private String code; + + /** + * 部门排序 + */ + private Integer sort; + + /** + * 描述 + */ + private String description; + + /** + * 创建时间 + */ + private Date createTime; + + /** + * 修改时间 + */ + private Date updateTime; +} \ No newline at end of file diff --git a/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/rbac/entity/Region.java b/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/module/rbac/entity/Region.java similarity index 55% rename from dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/rbac/entity/Region.java rename to dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/module/rbac/entity/Region.java index e9f6436..1e58cf0 100644 --- a/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/rbac/entity/Region.java +++ b/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/module/rbac/entity/Region.java @@ -1,37 +1,20 @@ -package day.gitlab.dolphin.rbac.entity; +package day.gitlab.dolphin.module.rbac.entity; -import com.mybatisflex.annotation.Id; -import com.mybatisflex.annotation.Table; -import java.io.Serializable; -import java.sql.Timestamp; - -import java.io.Serial; - -import lombok.AllArgsConstructor; -import lombok.Builder; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import java.util.Date; import lombok.Data; -import lombok.NoArgsConstructor; /** - * 区划项 实体类。 - * - * @author jiangyc - * @since 2025-11-28 + * 区划项 */ @Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -@Table("sys_rbac_region") -public class Region implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - +@TableName(value ="sys_rbac_region") +public class Region { /** * 主键 */ - @Id + @TableId private String id; /** @@ -82,11 +65,10 @@ public class Region implements Serializable { /** * 创建时间 */ - private Timestamp createTime; + private Date createTime; /** * 修改时间 */ - private Timestamp updateTime; - -} + private Date updateTime; +} \ No newline at end of file diff --git a/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/module/rbac/entity/Role.java b/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/module/rbac/entity/Role.java new file mode 100644 index 0000000..a1cdce7 --- /dev/null +++ b/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/module/rbac/entity/Role.java @@ -0,0 +1,49 @@ +package day.gitlab.dolphin.module.rbac.entity; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import java.util.Date; +import lombok.Data; + +/** + * 角色表 + */ +@Data +@TableName(value ="sys_rbac_role") +public class Role { + /** + * 主键 + */ + @TableId + private String id; + + /** + * 角色名称 + */ + private String name; + + /** + * 角色代码 + */ + private String code; + + /** + * 角色排序 + */ + private Integer sort; + + /** + * 描述 + */ + private String description; + + /** + * 创建时间 + */ + private Date createTime; + + /** + * 修改时间 + */ + private Date updateTime; +} \ No newline at end of file diff --git a/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/module/rbac/entity/User.java b/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/module/rbac/entity/User.java new file mode 100644 index 0000000..d8da699 --- /dev/null +++ b/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/module/rbac/entity/User.java @@ -0,0 +1,56 @@ +package day.gitlab.dolphin.module.rbac.entity; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import java.util.Date; + +import day.gitlab.dolphin.module.rbac.enums.UserEnabled; +import lombok.Data; + +/** + * 用户表 + */ +@Data +@TableName(value ="sys_rbac_user") +public class User { + /** + * 主键 + */ + @TableId + private String id; + + /** + * 用户名称 + */ + private String username; + + /** + * 用户昵称 + */ + private String nickname; + + /** + * 用户密码 + */ + private String password; + + /** + * 是否启用：0-未启用/1-启用 + */ + private UserEnabled enabled; + + /** + * 描述 + */ + private String description; + + /** + * 创建时间 + */ + private Date createTime; + + /** + * 修改时间 + */ + private Date updateTime; +} \ No newline at end of file diff --git a/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/module/rbac/enums/UserEnabled.java b/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/module/rbac/enums/UserEnabled.java new file mode 100644 index 0000000..2c675cc --- /dev/null +++ b/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/module/rbac/enums/UserEnabled.java @@ -0,0 +1,15 @@ +package day.gitlab.dolphin.module.rbac.enums; + +import com.baomidou.mybatisplus.annotation.IEnum; +import lombok.AllArgsConstructor; +import lombok.Getter; + +@Getter +@AllArgsConstructor +public enum UserEnabled implements IEnum { + + ENABLED("1"), + DISABLED("0"); + + private final String value; +} diff --git a/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/module/rbac/mapper/DepartmentMapper.java b/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/module/rbac/mapper/DepartmentMapper.java new file mode 100644 index 0000000..35e4cfb --- /dev/null +++ b/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/module/rbac/mapper/DepartmentMapper.java @@ -0,0 +1,17 @@ +package day.gitlab.dolphin.module.rbac.mapper; + +import day.gitlab.dolphin.module.rbac.entity.Department; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * 针对表【sys_rbac_department(部门表)】的数据库操作Mapper + */ +@Mapper +public interface DepartmentMapper extends BaseMapper { + +} + + + + diff --git a/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/module/rbac/mapper/RegionMapper.java b/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/module/rbac/mapper/RegionMapper.java new file mode 100644 index 0000000..7b4d642 --- /dev/null +++ b/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/module/rbac/mapper/RegionMapper.java @@ -0,0 +1,17 @@ +package day.gitlab.dolphin.module.rbac.mapper; + +import day.gitlab.dolphin.module.rbac.entity.Region; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * 针对表【sys_rbac_region(区划项)】的数据库操作Mapper +*/ +@Mapper +public interface RegionMapper extends BaseMapper { + +} + + + + diff --git a/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/module/rbac/mapper/RoleMapper.java b/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/module/rbac/mapper/RoleMapper.java new file mode 100644 index 0000000..162061d --- /dev/null +++ b/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/module/rbac/mapper/RoleMapper.java @@ -0,0 +1,20 @@ +package day.gitlab.dolphin.module.rbac.mapper; + +import day.gitlab.dolphin.module.rbac.entity.Role; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +/** + * 针对表【sys_rbac_role(角色表)】的数据库操作Mapper + */ +@Mapper +public interface RoleMapper extends BaseMapper { + + List findAllByUserId(String userId); +} + + + + diff --git a/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/module/rbac/mapper/UserMapper.java b/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/module/rbac/mapper/UserMapper.java new file mode 100644 index 0000000..3913b8e --- /dev/null +++ b/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/module/rbac/mapper/UserMapper.java @@ -0,0 +1,24 @@ +package day.gitlab.dolphin.module.rbac.mapper; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import day.gitlab.dolphin.module.rbac.entity.User; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * 针对表【sys_rbac_user(用户表)】的数据库操作Mapper + */ +@Mapper +public interface UserMapper extends BaseMapper { + + default User findByUsername(String username) { + LambdaQueryWrapper wrapper = Wrappers.lambdaQuery() + .eq(User::getUsername, username); + return selectOne(wrapper); + } +} + + + + diff --git a/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/module/rbac/service/DepartmentService.java b/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/module/rbac/service/DepartmentService.java new file mode 100644 index 0000000..1359357 --- /dev/null +++ b/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/module/rbac/service/DepartmentService.java @@ -0,0 +1,8 @@ +package day.gitlab.dolphin.module.rbac.service; + +/** + * 针对表【sys_rbac_department(部门表)】的数据库操作Service + */ +public interface DepartmentService { + +} diff --git a/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/module/rbac/service/RegionService.java b/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/module/rbac/service/RegionService.java new file mode 100644 index 0000000..5e79676 --- /dev/null +++ b/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/module/rbac/service/RegionService.java @@ -0,0 +1,8 @@ +package day.gitlab.dolphin.module.rbac.service; + +/** + * 针对表【sys_rbac_region(区划项)】的数据库操作Service + */ +public interface RegionService { + +} diff --git a/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/module/rbac/service/RoleService.java b/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/module/rbac/service/RoleService.java new file mode 100644 index 0000000..e27c03d --- /dev/null +++ b/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/module/rbac/service/RoleService.java @@ -0,0 +1,8 @@ +package day.gitlab.dolphin.module.rbac.service; + +/** + * 针对表【sys_rbac_role(角色表)】的数据库操作Service + */ +public interface RoleService { + +} diff --git a/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/module/rbac/service/UserService.java b/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/module/rbac/service/UserService.java new file mode 100644 index 0000000..824b171 --- /dev/null +++ b/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/module/rbac/service/UserService.java @@ -0,0 +1,8 @@ +package day.gitlab.dolphin.module.rbac.service; + +/** + * 针对表【sys_rbac_user(用户表)】的数据库操作Service + */ +public interface UserService { + +} diff --git a/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/module/rbac/service/impl/DepartmentServiceImpl.java b/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/module/rbac/service/impl/DepartmentServiceImpl.java new file mode 100644 index 0000000..b914781 --- /dev/null +++ b/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/module/rbac/service/impl/DepartmentServiceImpl.java @@ -0,0 +1,16 @@ +package day.gitlab.dolphin.module.rbac.service.impl; + +import day.gitlab.dolphin.module.rbac.service.DepartmentService; +import org.springframework.stereotype.Service; + +/** + * 针对表【sys_rbac_department(部门表)】的数据库操作Service实现 + */ +@Service +public class DepartmentServiceImpl implements DepartmentService { + +} + + + + diff --git a/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/module/rbac/service/impl/RegionServiceImpl.java b/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/module/rbac/service/impl/RegionServiceImpl.java new file mode 100644 index 0000000..8a04f8d --- /dev/null +++ b/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/module/rbac/service/impl/RegionServiceImpl.java @@ -0,0 +1,16 @@ +package day.gitlab.dolphin.module.rbac.service.impl; + +import day.gitlab.dolphin.module.rbac.service.RegionService; +import org.springframework.stereotype.Service; + +/** + * 针对表【sys_rbac_region(区划项)】的数据库操作Service实现 + */ +@Service +public class RegionServiceImpl implements RegionService { + +} + + + + diff --git a/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/module/rbac/service/impl/RoleServiceImpl.java b/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/module/rbac/service/impl/RoleServiceImpl.java new file mode 100644 index 0000000..264d069 --- /dev/null +++ b/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/module/rbac/service/impl/RoleServiceImpl.java @@ -0,0 +1,16 @@ +package day.gitlab.dolphin.module.rbac.service.impl; + +import day.gitlab.dolphin.module.rbac.service.RoleService; +import org.springframework.stereotype.Service; + +/** + * 针对表【sys_rbac_role(角色表)】的数据库操作Service实现 + */ +@Service +public class RoleServiceImpl implements RoleService { + +} + + + + diff --git a/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/module/rbac/service/impl/UserServiceImpl.java b/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/module/rbac/service/impl/UserServiceImpl.java new file mode 100644 index 0000000..ec1a5c3 --- /dev/null +++ b/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/module/rbac/service/impl/UserServiceImpl.java @@ -0,0 +1,16 @@ +package day.gitlab.dolphin.module.rbac.service.impl; + +import day.gitlab.dolphin.module.rbac.service.UserService; +import org.springframework.stereotype.Service; + +/** + * 针对表【sys_rbac_user(用户表)】的数据库操作Service实现 + */ +@Service +public class UserServiceImpl implements UserService { + +} + + + + diff --git a/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/rbac/constants/UserEnabled.java b/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/rbac/constants/UserEnabled.java deleted file mode 100644 index 0b1f5a1..0000000 --- a/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/rbac/constants/UserEnabled.java +++ /dev/null @@ -1,8 +0,0 @@ -package day.gitlab.dolphin.rbac.constants; - -public class UserEnabled { - - public static final String ENABLED = "1"; - - public static final String DISABLED = "0"; -} diff --git a/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/rbac/controller/DepartmentController.java b/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/rbac/controller/DepartmentController.java deleted file mode 100644 index 8d872f7..0000000 --- a/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/rbac/controller/DepartmentController.java +++ /dev/null @@ -1,15 +0,0 @@ -package day.gitlab.dolphin.rbac.controller; - -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - * 部门表 控制层。 - * - * @author jiangyc - * @since 2025-11-28 - */ -@RestController -@RequestMapping("/department") -public class DepartmentController { -} diff --git a/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/rbac/controller/RegionController.java b/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/rbac/controller/RegionController.java deleted file mode 100644 index ca5cb29..0000000 --- a/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/rbac/controller/RegionController.java +++ /dev/null @@ -1,26 +0,0 @@ -package day.gitlab.dolphin.rbac.controller; - -import com.mybatisflex.core.paginate.Page; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.beans.factory.annotation.Autowired; -import day.gitlab.dolphin.rbac.entity.Region; -import day.gitlab.dolphin.rbac.service.RegionService; -import org.springframework.web.bind.annotation.RestController; -import java.util.List; - -/** - * 区划项 控制层。 - * - * @author jiangyc - * @since 2025-11-28 - */ -@RestController -@RequestMapping("/region") -public class RegionController { -} diff --git a/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/rbac/controller/RoleController.java b/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/rbac/controller/RoleController.java deleted file mode 100644 index 930fb13..0000000 --- a/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/rbac/controller/RoleController.java +++ /dev/null @@ -1,15 +0,0 @@ -package day.gitlab.dolphin.rbac.controller; - -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - * 角色表 控制层。 - * - * @author jiangyc - * @since 2025-11-28 - */ -@RestController -@RequestMapping("/role") -public class RoleController { -} diff --git a/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/rbac/controller/UserController.java b/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/rbac/controller/UserController.java deleted file mode 100644 index 582461a..0000000 --- a/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/rbac/controller/UserController.java +++ /dev/null @@ -1,15 +0,0 @@ -package day.gitlab.dolphin.rbac.controller; - -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - * 用户表 控制层。 - * - * @author jiangyc - * @since 2025-11-28 - */ -@RestController -@RequestMapping("/user") -public class UserController { -} diff --git a/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/rbac/entity/Department.java b/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/rbac/entity/Department.java deleted file mode 100644 index 8556800..0000000 --- a/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/rbac/entity/Department.java +++ /dev/null @@ -1,77 +0,0 @@ -package day.gitlab.dolphin.rbac.entity; - -import com.mybatisflex.annotation.Id; -import com.mybatisflex.annotation.Table; -import java.io.Serializable; -import java.sql.Timestamp; - -import java.io.Serial; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * 部门表 实体类。 - * - * @author jiangyc - * @since 2025-11-28 - */ -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -@Table("sys_rbac_department") -public class Department implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - @Id - private String id; - - /** - * 区划ID - */ - private String regionId; - - /** - * 上级部门ID - */ - private String parentId; - - /** - * 部门名称 - */ - private String name; - - /** - * 部门代码 - */ - private String code; - - /** - * 部门排序 - */ - private Integer sort; - - /** - * 描述 - */ - private String description; - - /** - * 创建时间 - */ - private Timestamp createTime; - - /** - * 修改时间 - */ - private Timestamp updateTime; - -} diff --git a/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/rbac/entity/Role.java b/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/rbac/entity/Role.java deleted file mode 100644 index 6e8c01c..0000000 --- a/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/rbac/entity/Role.java +++ /dev/null @@ -1,67 +0,0 @@ -package day.gitlab.dolphin.rbac.entity; - -import com.mybatisflex.annotation.Id; -import com.mybatisflex.annotation.Table; -import java.io.Serializable; -import java.sql.Timestamp; - -import java.io.Serial; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * 角色表 实体类。 - * - * @author jiangyc - * @since 2025-11-28 - */ -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -@Table("sys_rbac_role") -public class Role implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - @Id - private String id; - - /** - * 角色名称 - */ - private String name; - - /** - * 角色代码 - */ - private String code; - - /** - * 角色排序 - */ - private Integer sort; - - /** - * 描述 - */ - private String description; - - /** - * 创建时间 - */ - private Timestamp createTime; - - /** - * 修改时间 - */ - private Timestamp updateTime; - -} diff --git a/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/rbac/entity/User.java b/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/rbac/entity/User.java deleted file mode 100644 index b7cfe5d..0000000 --- a/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/rbac/entity/User.java +++ /dev/null @@ -1,78 +0,0 @@ -package day.gitlab.dolphin.rbac.entity; - -import com.mybatisflex.annotation.Id; -import com.mybatisflex.annotation.RelationOneToMany; -import com.mybatisflex.annotation.Table; -import java.io.Serializable; -import java.sql.Timestamp; - -import java.io.Serial; -import java.util.List; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * 用户表 实体类。 - * - * @author jiangyc - * @since 2025-11-28 - */ -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -@Table("sys_rbac_user") -public class User implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - @Id - private String id; - - /** - * 用户名称 - */ - private String username; - - /** - * 用户昵称 - */ - private String nickname; - - /** - * 用户密码 - */ - private String password; - - /** - * 是否启用：0-未启用/1-启用 - */ - private String enabled; - - /** - * 描述 - */ - private String description; - - /** - * 创建时间 - */ - private Timestamp createTime; - - /** - * 修改时间 - */ - private Timestamp updateTime; - - @RelationOneToMany(joinTable = "sys_rbac_user_role", - selfField = "id", joinSelfColumn = "user_id", - targetField = "id", joinTargetColumn = "role_id") - private List roles; -} diff --git a/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/rbac/entity/table/DepartmentTableDef.java b/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/rbac/entity/table/DepartmentTableDef.java deleted file mode 100644 index ba4c407..0000000 --- a/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/rbac/entity/table/DepartmentTableDef.java +++ /dev/null @@ -1,92 +0,0 @@ -package day.gitlab.dolphin.rbac.entity.table; - -import com.mybatisflex.core.query.QueryColumn; -import com.mybatisflex.core.table.TableDef; - -import java.io.Serial; - -/** - * 部门表 表定义层。 - * - * @author jiangyc - * @since 2025-11-28 - */ -public class DepartmentTableDef extends TableDef { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 部门表 - */ - public static final DepartmentTableDef DEPARTMENT = new DepartmentTableDef(); - - /** - * 主键 - */ - public final QueryColumn ID = new QueryColumn(this, "id"); - - /** - * 部门代码 - */ - public final QueryColumn CODE = new QueryColumn(this, "code"); - - /** - * 部门名称 - */ - public final QueryColumn NAME = new QueryColumn(this, "name"); - - /** - * 部门排序 - */ - public final QueryColumn SORT = new QueryColumn(this, "sort"); - - /** - * 上级部门ID - */ - public final QueryColumn PARENT_ID = new QueryColumn(this, "parent_id"); - - /** - * 区划ID - */ - public final QueryColumn REGION_ID = new QueryColumn(this, "region_id"); - - /** - * 创建时间 - */ - public final QueryColumn CREATE_TIME = new QueryColumn(this, "create_time"); - - /** - * 修改时间 - */ - public final QueryColumn UPDATE_TIME = new QueryColumn(this, "update_time"); - - /** - * 描述 - */ - public final QueryColumn DESCRIPTION = new QueryColumn(this, "description"); - - /** - * 所有字段。 - */ - public final QueryColumn ALL_COLUMNS = new QueryColumn(this, "*"); - - /** - * 默认字段，不包含逻辑删除或者 large 等字段。 - */ - public final QueryColumn[] DEFAULT_COLUMNS = new QueryColumn[]{ID, REGION_ID, PARENT_ID, NAME, CODE, SORT, DESCRIPTION, CREATE_TIME, UPDATE_TIME}; - - public DepartmentTableDef() { - super("", "sys_rbac_department"); - } - - private DepartmentTableDef(String schema, String name, String alisa) { - super(schema, name, alisa); - } - - public DepartmentTableDef as(String alias) { - String key = getNameWithSchema() + "." + alias; - return getCache(key, k -> new DepartmentTableDef("", "sys_rbac_department", alias)); - } - -} diff --git a/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/rbac/entity/table/RegionTableDef.java b/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/rbac/entity/table/RegionTableDef.java deleted file mode 100644 index b5eca1d..0000000 --- a/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/rbac/entity/table/RegionTableDef.java +++ /dev/null @@ -1,107 +0,0 @@ -package day.gitlab.dolphin.rbac.entity.table; - -import com.mybatisflex.core.query.QueryColumn; -import com.mybatisflex.core.table.TableDef; - -import java.io.Serial; - -/** - * 区划项 表定义层。 - * - * @author jiangyc - * @since 2025-11-28 - */ -public class RegionTableDef extends TableDef { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 区划项 - */ - public static final RegionTableDef REGION = new RegionTableDef(); - - /** - * 主键 - */ - public final QueryColumn ID = new QueryColumn(this, "id"); - - /** - * 区划代码 - */ - public final QueryColumn CODE = new QueryColumn(this, "code"); - - /** - * 区划名称 - */ - public final QueryColumn NAME = new QueryColumn(this, "name"); - - /** - * 区划排序 - */ - public final QueryColumn SORT = new QueryColumn(this, "sort"); - - /** - * 主区划ID - */ - public final QueryColumn ROOT_ID = new QueryColumn(this, "root_id"); - - /** - * 区划扩展代码 - */ - public final QueryColumn EXT_CODE = new QueryColumn(this, "ext_code"); - - /** - * 上级区划ID - */ - public final QueryColumn PARENT_ID = new QueryColumn(this, "parent_id"); - - /** - * 主区划代码 - */ - public final QueryColumn ROOT_CODE = new QueryColumn(this, "root_code"); - - /** - * 创建时间 - */ - public final QueryColumn CREATE_TIME = new QueryColumn(this, "create_time"); - - /** - * 上级区划代码 - */ - public final QueryColumn PARENT_CODE = new QueryColumn(this, "parent_code"); - - /** - * 修改时间 - */ - public final QueryColumn UPDATE_TIME = new QueryColumn(this, "update_time"); - - /** - * 区划描述 - */ - public final QueryColumn DESCRIPTION = new QueryColumn(this, "description"); - - /** - * 所有字段。 - */ - public final QueryColumn ALL_COLUMNS = new QueryColumn(this, "*"); - - /** - * 默认字段，不包含逻辑删除或者 large 等字段。 - */ - public final QueryColumn[] DEFAULT_COLUMNS = new QueryColumn[]{ID, PARENT_ID, PARENT_CODE, ROOT_ID, ROOT_CODE, NAME, CODE, EXT_CODE, SORT, DESCRIPTION, CREATE_TIME, UPDATE_TIME}; - - public RegionTableDef() { - super("", "sys_rbac_region"); - } - - private RegionTableDef(String schema, String name, String alisa) { - super(schema, name, alisa); - } - - public RegionTableDef as(String alias) { - String key = getNameWithSchema() + "." + alias; - return getCache(key, k -> new RegionTableDef("", "sys_rbac_region", alias)); - } - -} diff --git a/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/rbac/entity/table/RoleTableDef.java b/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/rbac/entity/table/RoleTableDef.java deleted file mode 100644 index 818a8b1..0000000 --- a/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/rbac/entity/table/RoleTableDef.java +++ /dev/null @@ -1,82 +0,0 @@ -package day.gitlab.dolphin.rbac.entity.table; - -import com.mybatisflex.core.query.QueryColumn; -import com.mybatisflex.core.table.TableDef; - -import java.io.Serial; - -/** - * 角色表 表定义层。 - * - * @author jiangyc - * @since 2025-11-28 - */ -public class RoleTableDef extends TableDef { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 角色表 - */ - public static final RoleTableDef ROLE = new RoleTableDef(); - - /** - * 主键 - */ - public final QueryColumn ID = new QueryColumn(this, "id"); - - /** - * 角色代码 - */ - public final QueryColumn CODE = new QueryColumn(this, "code"); - - /** - * 角色名称 - */ - public final QueryColumn NAME = new QueryColumn(this, "name"); - - /** - * 角色排序 - */ - public final QueryColumn SORT = new QueryColumn(this, "sort"); - - /** - * 创建时间 - */ - public final QueryColumn CREATE_TIME = new QueryColumn(this, "create_time"); - - /** - * 修改时间 - */ - public final QueryColumn UPDATE_TIME = new QueryColumn(this, "update_time"); - - /** - * 描述 - */ - public final QueryColumn DESCRIPTION = new QueryColumn(this, "description"); - - /** - * 所有字段。 - */ - public final QueryColumn ALL_COLUMNS = new QueryColumn(this, "*"); - - /** - * 默认字段，不包含逻辑删除或者 large 等字段。 - */ - public final QueryColumn[] DEFAULT_COLUMNS = new QueryColumn[]{ID, NAME, CODE, SORT, DESCRIPTION, CREATE_TIME, UPDATE_TIME}; - - public RoleTableDef() { - super("", "sys_rbac_role"); - } - - private RoleTableDef(String schema, String name, String alisa) { - super(schema, name, alisa); - } - - public RoleTableDef as(String alias) { - String key = getNameWithSchema() + "." + alias; - return getCache(key, k -> new RoleTableDef("", "sys_rbac_role", alias)); - } - -} diff --git a/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/rbac/entity/table/UserTableDef.java b/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/rbac/entity/table/UserTableDef.java deleted file mode 100644 index 5975701..0000000 --- a/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/rbac/entity/table/UserTableDef.java +++ /dev/null @@ -1,87 +0,0 @@ -package day.gitlab.dolphin.rbac.entity.table; - -import com.mybatisflex.core.query.QueryColumn; -import com.mybatisflex.core.table.TableDef; - -import java.io.Serial; - -/** - * 用户表 表定义层。 - * - * @author jiangyc - * @since 2025-11-28 - */ -public class UserTableDef extends TableDef { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 用户表 - */ - public static final UserTableDef USER = new UserTableDef(); - - /** - * 主键 - */ - public final QueryColumn ID = new QueryColumn(this, "id"); - - /** - * 是否启用：0-未启用/1-启用 - */ - public final QueryColumn ENABLED = new QueryColumn(this, "enabled"); - - /** - * 用户昵称 - */ - public final QueryColumn NICKNAME = new QueryColumn(this, "nickname"); - - /** - * 用户密码 - */ - public final QueryColumn PASSWORD = new QueryColumn(this, "password"); - - /** - * 用户名称 - */ - public final QueryColumn USERNAME = new QueryColumn(this, "username"); - - /** - * 创建时间 - */ - public final QueryColumn CREATE_TIME = new QueryColumn(this, "create_time"); - - /** - * 修改时间 - */ - public final QueryColumn UPDATE_TIME = new QueryColumn(this, "update_time"); - - /** - * 描述 - */ - public final QueryColumn DESCRIPTION = new QueryColumn(this, "description"); - - /** - * 所有字段。 - */ - public final QueryColumn ALL_COLUMNS = new QueryColumn(this, "*"); - - /** - * 默认字段，不包含逻辑删除或者 large 等字段。 - */ - public final QueryColumn[] DEFAULT_COLUMNS = new QueryColumn[]{ID, USERNAME, NICKNAME, PASSWORD, ENABLED, DESCRIPTION, CREATE_TIME, UPDATE_TIME}; - - public UserTableDef() { - super("", "sys_rbac_user"); - } - - private UserTableDef(String schema, String name, String alisa) { - super(schema, name, alisa); - } - - public UserTableDef as(String alias) { - String key = getNameWithSchema() + "." + alias; - return getCache(key, k -> new UserTableDef("", "sys_rbac_user", alias)); - } - -} diff --git a/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/rbac/mapper/DepartmentMapper.java b/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/rbac/mapper/DepartmentMapper.java deleted file mode 100644 index d7c90cd..0000000 --- a/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/rbac/mapper/DepartmentMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package day.gitlab.dolphin.rbac.mapper; - -import org.apache.ibatis.annotations.Mapper; -import com.mybatisflex.core.BaseMapper; -import day.gitlab.dolphin.rbac.entity.Department; - -/** - * 部门表 映射层。 - * - * @author jiangyc - * @since 2025-11-28 - */ -@Mapper -public interface DepartmentMapper extends BaseMapper { - -} diff --git a/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/rbac/mapper/RegionMapper.java b/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/rbac/mapper/RegionMapper.java deleted file mode 100644 index ea065a6..0000000 --- a/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/rbac/mapper/RegionMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package day.gitlab.dolphin.rbac.mapper; - -import org.apache.ibatis.annotations.Mapper; -import com.mybatisflex.core.BaseMapper; -import day.gitlab.dolphin.rbac.entity.Region; - -/** - * 区划项 映射层。 - * - * @author jiangyc - * @since 2025-11-28 - */ -@Mapper -public interface RegionMapper extends BaseMapper { - -} diff --git a/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/rbac/mapper/RoleMapper.java b/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/rbac/mapper/RoleMapper.java deleted file mode 100644 index b57cb1f..0000000 --- a/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/rbac/mapper/RoleMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package day.gitlab.dolphin.rbac.mapper; - -import org.apache.ibatis.annotations.Mapper; -import com.mybatisflex.core.BaseMapper; -import day.gitlab.dolphin.rbac.entity.Role; - -/** - * 角色表 映射层。 - * - * @author jiangyc - * @since 2025-11-28 - */ -@Mapper -public interface RoleMapper extends BaseMapper { - -} diff --git a/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/rbac/mapper/UserMapper.java b/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/rbac/mapper/UserMapper.java deleted file mode 100644 index c4e504f..0000000 --- a/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/rbac/mapper/UserMapper.java +++ /dev/null @@ -1,22 +0,0 @@ -package day.gitlab.dolphin.rbac.mapper; - -import com.mybatisflex.core.query.QueryCondition; -import day.gitlab.dolphin.rbac.entity.table.UserTableDef; -import org.apache.ibatis.annotations.Mapper; -import com.mybatisflex.core.BaseMapper; -import day.gitlab.dolphin.rbac.entity.User; - -/** - * 用户表 映射层。 - * - * @author jiangyc - * @since 2025-11-28 - */ -@Mapper -public interface UserMapper extends BaseMapper { - - default User findByUsername(String username) { - QueryCondition queryCondition = UserTableDef.USER.USERNAME.eq(username); - return selectOneByCondition(queryCondition); - } -} diff --git a/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/rbac/service/DepartmentService.java b/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/rbac/service/DepartmentService.java deleted file mode 100644 index 1a8ea23..0000000 --- a/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/rbac/service/DepartmentService.java +++ /dev/null @@ -1,11 +0,0 @@ -package day.gitlab.dolphin.rbac.service; - -/** - * 部门表 服务层。 - * - * @author jiangyc - * @since 2025-11-28 - */ -public interface DepartmentService { - -} diff --git a/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/rbac/service/RegionService.java b/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/rbac/service/RegionService.java deleted file mode 100644 index c1f09d2..0000000 --- a/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/rbac/service/RegionService.java +++ /dev/null @@ -1,11 +0,0 @@ -package day.gitlab.dolphin.rbac.service; - -/** - * 区划项 服务层。 - * - * @author jiangyc - * @since 2025-11-28 - */ -public interface RegionService { - -} diff --git a/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/rbac/service/RoleService.java b/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/rbac/service/RoleService.java deleted file mode 100644 index 753f759..0000000 --- a/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/rbac/service/RoleService.java +++ /dev/null @@ -1,11 +0,0 @@ -package day.gitlab.dolphin.rbac.service; - -/** - * 角色表 服务层。 - * - * @author jiangyc - * @since 2025-11-28 - */ -public interface RoleService { - -} diff --git a/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/rbac/service/UserService.java b/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/rbac/service/UserService.java deleted file mode 100644 index 81136b5..0000000 --- a/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/rbac/service/UserService.java +++ /dev/null @@ -1,11 +0,0 @@ -package day.gitlab.dolphin.rbac.service; - -/** - * 用户表 服务层。 - * - * @author jiangyc - * @since 2025-11-28 - */ -public interface UserService { - -} diff --git a/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/rbac/service/impl/DepartmentServiceImpl.java b/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/rbac/service/impl/DepartmentServiceImpl.java deleted file mode 100644 index 5bfd726..0000000 --- a/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/rbac/service/impl/DepartmentServiceImpl.java +++ /dev/null @@ -1,15 +0,0 @@ -package day.gitlab.dolphin.rbac.service.impl; - -import day.gitlab.dolphin.rbac.service.DepartmentService; -import org.springframework.stereotype.Service; - -/** - * 部门表 服务层实现。 - * - * @author jiangyc - * @since 2025-11-28 - */ -@Service -public class DepartmentServiceImpl implements DepartmentService { - -} diff --git a/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/rbac/service/impl/RegionServiceImpl.java b/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/rbac/service/impl/RegionServiceImpl.java deleted file mode 100644 index 736dd3a..0000000 --- a/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/rbac/service/impl/RegionServiceImpl.java +++ /dev/null @@ -1,15 +0,0 @@ -package day.gitlab.dolphin.rbac.service.impl; - -import day.gitlab.dolphin.rbac.service.RegionService; -import org.springframework.stereotype.Service; - -/** - * 区划项 服务层实现。 - * - * @author jiangyc - * @since 2025-11-28 - */ -@Service -public class RegionServiceImpl implements RegionService { - -} diff --git a/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/rbac/service/impl/RoleServiceImpl.java b/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/rbac/service/impl/RoleServiceImpl.java deleted file mode 100644 index 0c409a8..0000000 --- a/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/rbac/service/impl/RoleServiceImpl.java +++ /dev/null @@ -1,15 +0,0 @@ -package day.gitlab.dolphin.rbac.service.impl; - -import day.gitlab.dolphin.rbac.service.RoleService; -import org.springframework.stereotype.Service; - -/** - * 角色表 服务层实现。 - * - * @author jiangyc - * @since 2025-11-28 - */ -@Service -public class RoleServiceImpl implements RoleService { - -} diff --git a/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/rbac/service/impl/UserServiceImpl.java b/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/rbac/service/impl/UserServiceImpl.java deleted file mode 100644 index c9152b4..0000000 --- a/dolphin-modules/dolphin-module-rbac/src/main/java/day/gitlab/dolphin/rbac/service/impl/UserServiceImpl.java +++ /dev/null @@ -1,15 +0,0 @@ -package day.gitlab.dolphin.rbac.service.impl; - -import day.gitlab.dolphin.rbac.service.UserService; -import org.springframework.stereotype.Service; - -/** - * 用户表 服务层实现。 - * - * @author jiangyc - * @since 2025-11-28 - */ -@Service -public class UserServiceImpl implements UserService { - -} diff --git a/dolphin-modules/dolphin-module-rbac/src/main/resources/mapper/RoleMapper.xml b/dolphin-modules/dolphin-module-rbac/src/main/resources/mapper/RoleMapper.xml new file mode 100644 index 0000000..de0ec32 --- /dev/null +++ b/dolphin-modules/dolphin-module-rbac/src/main/resources/mapper/RoleMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + diff --git a/dolphin-modules/pom.xml b/dolphin-modules/pom.xml index 19a6dbc..8e9c7ff 100644 --- a/dolphin-modules/pom.xml +++ b/dolphin-modules/pom.xml @@ -1,19 +1,19 @@ - 4.0.0 - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + + day.gitlab dolphin-backend 0.0.1-SNAPSHOT - dolphin-modules - pom + dolphin-modules + pom - - dolphin-module-core - dolphin-module-rbac - dolphin-module-auth - + + dolphin-module-core + dolphin-module-rbac + diff --git a/pom.xml b/pom.xml index 6e488e5..5f07835 100644 --- a/pom.xml +++ b/pom.xml @@ -1,104 +1,120 @@ - 4.0.0 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 - day.gitlab - dolphin-backend - 0.0.1-SNAPSHOT - pom + day.gitlab + dolphin-backend + 0.0.1-SNAPSHOT + pom - - 21 - 3.5.8 - 1.11.4 - 0.13.0 - + dolphin-backend + dolphin-backend ${project.version} + https://gitlab.day/dolphin-projects/dolphin-backend.git - - dolphin-commons - dolphin-modules - dolphin-compose - + + + Yongchun Jiang + JSpringYC@gmail.com + https://gitlab.day + + - - - - - org.springframework.boot - spring-boot-dependencies - ${spring-boot.version} - pom - import - - - - com.mybatis-flex - mybatis-flex-dependencies - ${mybatis-flex.version} - pom - import - - - - io.jsonwebtoken - jjwt-api - ${jjwt.version} - - - io.jsonwebtoken - jjwt-impl - ${jjwt.version} - runtime - - - io.jsonwebtoken - jjwt-jackson - ${jjwt.version} - runtime - - - + + 25 + + 4.0.0 + + 4.0.0 + 3.5.15 + + 0.13.0 + - - - - - org.apache.maven.plugins - maven-compiler-plugin - - - - org.projectlombok - lombok - - - ${java.version} - ${java.version} - UTF-8 - - - - org.springframework.boot - spring-boot-maven-plugin - ${spring-boot.version} - + + dolphin-commons + dolphin-modules + dolphin-authorize + dolphin-compose + + + + + + + org.springframework.boot + spring-boot-dependencies + ${spring-boot.version} + pom + import + + + + org.mybatis.spring.boot + mybatis-spring-boot-starter + ${mybatis-spring.version} + + + com.baomidou + mybatis-plus-spring-boot4-starter + ${mybatis-plus.version} + + + + io.jsonwebtoken + jjwt-api + ${jjwt.version} + + + io.jsonwebtoken + jjwt-impl + ${jjwt.version} + + + io.jsonwebtoken + jjwt-jackson + ${jjwt.version} + + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + + + org.projectlombok + lombok + + + ${java.version} + ${java.version} + + + + org.springframework.boot + spring-boot-maven-plugin + repackage - - - - org.projectlombok - lombok - - - - - - - + + + + org.projectlombok + lombok + + + + + + +