From 95bf36338c6b779459e263b0fd667f384df6af14 Mon Sep 17 00:00:00 2001 From: "yadong.zhang" Date: Thu, 31 Jan 2019 17:42:21 +0800 Subject: [PATCH 01/10] Initial commit --- .gitignore | 23 ++ LICENSE | 674 +++++++++++++++++++++++++++++++++++++++++++++++++++++ README.md | 2 + 3 files changed, 699 insertions(+) create mode 100644 .gitignore create mode 100644 LICENSE create mode 100644 README.md diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..a1c2a23 --- /dev/null +++ b/.gitignore @@ -0,0 +1,23 @@ +# Compiled class file +*.class + +# Log file +*.log + +# BlueJ files +*.ctxt + +# Mobile Tools for Java (J2ME) +.mtj.tmp/ + +# Package Files # +*.jar +*.war +*.nar +*.ear +*.zip +*.tar.gz +*.rar + +# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml +hs_err_pid* diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..f288702 --- /dev/null +++ b/LICENSE @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 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. + + + Copyright (C) + + 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: + + Copyright (C) + 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 new file mode 100644 index 0000000..ba696b0 --- /dev/null +++ b/README.md @@ -0,0 +1,2 @@ +# JustAuth +史上最全的整合第三方登录的工具, Just Auth From ebc19eeadeee16c652358e63285f4534518b4746 Mon Sep 17 00:00:00 2001 From: "yadong.zhang" Date: Thu, 31 Jan 2019 18:00:31 +0800 Subject: [PATCH 02/10] =?UTF-8?q?:tada:=20=E5=88=9D=E5=A7=8B=E5=8C=96?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/me/zhyd/oauth/config/AuthConfig.java | 47 +++++++ .../me/zhyd/oauth/consts/ApiUrlConst.java | 59 ++++++++ .../zhyd/oauth/exception/AuthException.java | 36 +++++ .../me/zhyd/oauth/model/AuthResponse.java | 19 +++ .../java/me/zhyd/oauth/model/AuthSource.java | 16 +++ .../java/me/zhyd/oauth/model/AuthToken.java | 20 +++ .../java/me/zhyd/oauth/model/AuthUser.java | 26 ++++ .../me/zhyd/oauth/model/AuthUserGender.java | 40 ++++++ .../zhyd/oauth/request/AuthGiteeRequest.java | 83 +++++++++++ .../zhyd/oauth/request/AuthGithubRequest.java | 76 ++++++++++ .../me/zhyd/oauth/request/AuthRequest.java | 42 ++++++ .../zhyd/oauth/request/AuthWeiboRequest.java | 90 ++++++++++++ .../me/zhyd/oauth/request/ResponseStatus.java | 32 +++++ .../zhyd/oauth/utils/AuthConfigChecker.java | 60 ++++++++ .../java/me/zhyd/oauth/utils/IpUtils.java | 32 +++++ .../java/me/zhyd/oauth/utils/StringUtils.java | 19 +++ .../java/me/zhyd/oauth/utils/UrlBuilder.java | 132 ++++++++++++++++++ 17 files changed, 829 insertions(+) create mode 100644 src/main/java/me/zhyd/oauth/config/AuthConfig.java create mode 100644 src/main/java/me/zhyd/oauth/consts/ApiUrlConst.java create mode 100644 src/main/java/me/zhyd/oauth/exception/AuthException.java create mode 100644 src/main/java/me/zhyd/oauth/model/AuthResponse.java create mode 100644 src/main/java/me/zhyd/oauth/model/AuthSource.java create mode 100644 src/main/java/me/zhyd/oauth/model/AuthToken.java create mode 100644 src/main/java/me/zhyd/oauth/model/AuthUser.java create mode 100644 src/main/java/me/zhyd/oauth/model/AuthUserGender.java create mode 100644 src/main/java/me/zhyd/oauth/request/AuthGiteeRequest.java create mode 100644 src/main/java/me/zhyd/oauth/request/AuthGithubRequest.java create mode 100644 src/main/java/me/zhyd/oauth/request/AuthRequest.java create mode 100644 src/main/java/me/zhyd/oauth/request/AuthWeiboRequest.java create mode 100644 src/main/java/me/zhyd/oauth/request/ResponseStatus.java create mode 100644 src/main/java/me/zhyd/oauth/utils/AuthConfigChecker.java create mode 100644 src/main/java/me/zhyd/oauth/utils/IpUtils.java create mode 100644 src/main/java/me/zhyd/oauth/utils/StringUtils.java create mode 100644 src/main/java/me/zhyd/oauth/utils/UrlBuilder.java diff --git a/src/main/java/me/zhyd/oauth/config/AuthConfig.java b/src/main/java/me/zhyd/oauth/config/AuthConfig.java new file mode 100644 index 0000000..9ea8b3b --- /dev/null +++ b/src/main/java/me/zhyd/oauth/config/AuthConfig.java @@ -0,0 +1,47 @@ +package me.zhyd.oauth.config; + +/** + * @author yadong.zhang (yadong.zhang0415(a)gmail.com) + * @version 1.0 + * @website https://www.zhyd.me + * @date 2019/1/31 14:03 + * @since 1.8 + */ +public class AuthConfig { + /** + * github应用的Client ID + */ + public static String githubClientId = null; + /** + * github应用的Client Secret + */ + public static String githubClientSecret = null; + /** + * github应用的redirect_uri 登陆成功后的回调地址 + */ + public static String githubRedirectUri = null; + /** + * weibo应用的App Key + */ + public static String weiboClientId = null; + /** + * weibo应用的App Secret + */ + public static String weiboClientSecret = null; + /** + * weibo应用的redirect_uri 登陆成功后的回调地址 + */ + public static String weiboRedirectUri = null; + /** + * gitee应用的Client ID + */ + public static String giteeClientId = null; + /** + * gitee应用的Client Secret + */ + public static String giteeClientSecret = null; + /** + * gitee应用的redirect_uri 登陆成功后的回调地址 + */ + public static String giteeRedirectUri = null; +} diff --git a/src/main/java/me/zhyd/oauth/consts/ApiUrlConst.java b/src/main/java/me/zhyd/oauth/consts/ApiUrlConst.java new file mode 100644 index 0000000..36f1c89 --- /dev/null +++ b/src/main/java/me/zhyd/oauth/consts/ApiUrlConst.java @@ -0,0 +1,59 @@ +package me.zhyd.oauth.consts; + +/** + * 各api需要的url常量类 + * + * @author yadong.zhang (yadong.zhang0415(a)gmail.com) + * @version 1.0 + * @website https://www.zhyd.me + * @date 2019/1/31 12:26 + * @since 1.0 + */ +public class ApiUrlConst { + + /** + * 获取github access_token的地址 + */ + public static final String GITHUB_ACCESS_TOKEN_URL = "https://github.com/login/oauth/access_token"; + + /** + * 获取github用户信息的地址 + */ + public static final String GITHUB_USER_INFO_URL = "https://api.github.com/user"; + + /** + * 获取github授权地址 + */ + public static final String GITHUB_AUTHORIZE_URL = "https://github.com/login/oauth/authorize"; + + /** + * 获取weibo access_token的地址 + */ + public static final String WEIBO_ACCESS_TOKEN_URL = "https://api.weibo.com/oauth2/access_token"; + + /** + * 获取weibo用户信息的地址 + */ + public static final String WEIBO_USER_INFO_URL = "https://api.weibo.com/2/users/show.json"; + + /** + * 获取weibo授权地址 + */ + public static final String WEIBO_AUTHORIZE_URL = "https://api.weibo.com/oauth2/authorize"; + + /** + * 获取gitee access_token的地址 + */ + public static final String GITEE_ACCESS_TOKEN_URL = "https://gitee.com/oauth/token"; + + /** + * 获取gitee用户信息的地址 + */ + public static final String GITEE_USER_INFO_URL = "https://gitee.com/api/v5/user"; + + /** + * 获取gitee授权地址 + */ + public static final String GITEE_AUTHORIZE_URL = "https://gitee.com/oauth/authorize"; + +} diff --git a/src/main/java/me/zhyd/oauth/exception/AuthException.java b/src/main/java/me/zhyd/oauth/exception/AuthException.java new file mode 100644 index 0000000..a7a6c8f --- /dev/null +++ b/src/main/java/me/zhyd/oauth/exception/AuthException.java @@ -0,0 +1,36 @@ +package me.zhyd.oauth.exception; + +import me.zhyd.oauth.request.ResponseStatus; + +/** + * @author yadong.zhang (yadong.zhang0415(a)gmail.com) + * @version 1.0 + * @website https://www.zhyd.me + * @date 2019/1/31 16:05 + * @since 1.8 + */ +public class AuthException extends RuntimeException { + public AuthException() { + super(); + } + + public AuthException(String message) { + super(message); + } + + public AuthException(ResponseStatus status) { + super(status.getMsg()); + } + + public AuthException(String message, Throwable cause) { + super(message, cause); + } + + public AuthException(Throwable cause) { + super(cause); + } + + protected AuthException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) { + super(message, cause, enableSuppression, writableStackTrace); + } +} diff --git a/src/main/java/me/zhyd/oauth/model/AuthResponse.java b/src/main/java/me/zhyd/oauth/model/AuthResponse.java new file mode 100644 index 0000000..ecce59b --- /dev/null +++ b/src/main/java/me/zhyd/oauth/model/AuthResponse.java @@ -0,0 +1,19 @@ +package me.zhyd.oauth.model; + +import lombok.Builder; +import lombok.Data; + +/** + * @author yadong.zhang (yadong.zhang0415(a)gmail.com) + * @version 1.0 + * @website https://www.zhyd.me + * @date 2019/1/31 15:43 + * @since 1.8 + */ +@Builder +@Data +public class AuthResponse { + private int code = 200; + private String msg; + private T data; +} diff --git a/src/main/java/me/zhyd/oauth/model/AuthSource.java b/src/main/java/me/zhyd/oauth/model/AuthSource.java new file mode 100644 index 0000000..794ee48 --- /dev/null +++ b/src/main/java/me/zhyd/oauth/model/AuthSource.java @@ -0,0 +1,16 @@ +package me.zhyd.oauth.model; + +/** + * @author yadong.zhang (yadong.zhang0415(a)gmail.com) + * @version 1.0 + * @website https://www.zhyd.me + * @date 2019/1/31 13:52 + * @since 1.8 + */ +public enum AuthSource { + GITHUB, + GITEE, + WEIBO, + QQ, + WEIXIN +} diff --git a/src/main/java/me/zhyd/oauth/model/AuthToken.java b/src/main/java/me/zhyd/oauth/model/AuthToken.java new file mode 100644 index 0000000..5a3dd54 --- /dev/null +++ b/src/main/java/me/zhyd/oauth/model/AuthToken.java @@ -0,0 +1,20 @@ +package me.zhyd.oauth.model; + +import lombok.Builder; +import lombok.Data; + +/** + * @author yadong.zhang (yadong.zhang0415(a)gmail.com) + * @version 1.0 + * @website https://www.zhyd.me + * @date 2019/1/31 15:43 + * @since 1.8 + */ +@Data +@Builder +public class AuthToken { + private String accessToken; + private String expireIn; + private String refreshToken; + private String uid; +} diff --git a/src/main/java/me/zhyd/oauth/model/AuthUser.java b/src/main/java/me/zhyd/oauth/model/AuthUser.java new file mode 100644 index 0000000..c522dc2 --- /dev/null +++ b/src/main/java/me/zhyd/oauth/model/AuthUser.java @@ -0,0 +1,26 @@ +package me.zhyd.oauth.model; + +import lombok.Builder; +import lombok.Data; + +/** + * @author yadong.zhang (yadong.zhang0415(a)gmail.com) + * @version 1.0 + * @website https://www.zhyd.me + * @date 2019/1/31 13:47 + * @since 1.8 + */ +@Builder +@Data +public class AuthUser { + private String username; + private String avatar; + private String blog; + private String nickname; + private String company; + private String location; + private String email; + private String remark; + private AuthUserGender gender; + private AuthSource source; +} diff --git a/src/main/java/me/zhyd/oauth/model/AuthUserGender.java b/src/main/java/me/zhyd/oauth/model/AuthUserGender.java new file mode 100644 index 0000000..10c7cfa --- /dev/null +++ b/src/main/java/me/zhyd/oauth/model/AuthUserGender.java @@ -0,0 +1,40 @@ +package me.zhyd.oauth.model; + +/** + * @author yadong.zhang (yadong.zhang0415(a)gmail.com) + * @version 1.0 + * @website https://www.zhyd.me + * @date 2019/1/31 17:24 + * @since 1.8 + */ +public enum AuthUserGender { + MALE(1, "男"), FEMALE(0, "女"), UNKNOW(-1, ""); + private int code; + private String desc; + + AuthUserGender(int code, String desc) { + this.code = code; + this.desc = desc; + } + + public static AuthUserGender getRealGender(String code) { + if (code == null) { + return UNKNOW; + } + if ("m".equals(code) || "男".equals(code) || "1".equals(code) || "male".equalsIgnoreCase(code)) { + return MALE; + } + if ("f".equals(code) || "女".equals(code) || "0".equals(code) || "female".equalsIgnoreCase(code)) { + return FEMALE; + } + return UNKNOW; + } + + public int getCode() { + return code; + } + + public String getDesc() { + return desc; + } +} diff --git a/src/main/java/me/zhyd/oauth/request/AuthGiteeRequest.java b/src/main/java/me/zhyd/oauth/request/AuthGiteeRequest.java new file mode 100644 index 0000000..4d851e5 --- /dev/null +++ b/src/main/java/me/zhyd/oauth/request/AuthGiteeRequest.java @@ -0,0 +1,83 @@ +package me.zhyd.oauth.request; + +import cn.hutool.http.HttpRequest; +import cn.hutool.http.HttpResponse; +import com.alibaba.fastjson.JSONObject; +import me.zhyd.oauth.config.AuthConfig; +import me.zhyd.oauth.exception.AuthException; +import me.zhyd.oauth.model.AuthResponse; +import me.zhyd.oauth.model.AuthSource; +import me.zhyd.oauth.model.AuthUser; +import me.zhyd.oauth.utils.AuthConfigChecker; +import me.zhyd.oauth.utils.UrlBuilder; + +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; + +/** + * @author yadong.zhang (yadong.zhang0415(a)gmail.com) + * @version 1.0 + * @website https://www.zhyd.me + * @date 2019/1/31 16:31 + * @since 1.8 + */ +public class AuthGiteeRequest implements AuthRequest { + + @Override + public void authorize(HttpServletResponse response) { + if (!AuthConfigChecker.isSupportedGitee()) { + throw new AuthException(ResponseStatus.UNSUPPORTED); + } + String authorizeUrl = UrlBuilder.getGiteeAuthorizeUrl(AuthConfig.giteeClientId, AuthConfig.giteeRedirectUri); + try { + response.sendRedirect(authorizeUrl); + } catch (IOException e) { + e.printStackTrace(); + } + } + + @Override + public String authorize() { + if (!AuthConfigChecker.isSupportedGitee()) { + throw new AuthException(ResponseStatus.UNSUPPORTED); + } + return UrlBuilder.getGiteeAuthorizeUrl(AuthConfig.giteeClientId, AuthConfig.giteeRedirectUri); + } + + @Override + public AuthResponse login(String code) { + if (!AuthConfigChecker.isSupportedGitee()) { + return AuthResponse.builder() + .code(ResponseStatus.UNSUPPORTED.getCode()) + .msg(ResponseStatus.UNSUPPORTED.getMsg()) + .build(); + } + String accessTokenUrl = UrlBuilder.getGiteeAccessTokenUrl(AuthConfig.giteeClientId, AuthConfig.giteeClientSecret, code, AuthConfig.giteeRedirectUri); + HttpResponse response = HttpRequest.post(accessTokenUrl).execute(); + String accessTokenStr = response.body(); + JSONObject accessTokenObject = JSONObject.parseObject(accessTokenStr); + if (accessTokenObject.containsKey("error")) { + return AuthResponse.builder() + .code(500) + .msg("Unable to get token from gitee using code [" + code + "]") + .build(); + } + String accessToken = accessTokenObject.getString("access_token"); + response = HttpRequest.get(UrlBuilder.getGiteeUserInfoUrl(accessToken)).execute(); + String userInfo = response.body(); + JSONObject object = JSONObject.parseObject(userInfo); + return AuthResponse.builder() + .data(AuthUser.builder() + .username(object.getString("login")) + .avatar(object.getString("avatar_url")) + .blog(object.getString("blog")) + .nickname(object.getString("name")) + .company(object.getString("company")) + .location(object.getString("address")) + .email(object.getString("email")) + .remark(object.getString("bio")) + .source(AuthSource.GITEE) + .build()) + .build(); + } +} diff --git a/src/main/java/me/zhyd/oauth/request/AuthGithubRequest.java b/src/main/java/me/zhyd/oauth/request/AuthGithubRequest.java new file mode 100644 index 0000000..69e49f4 --- /dev/null +++ b/src/main/java/me/zhyd/oauth/request/AuthGithubRequest.java @@ -0,0 +1,76 @@ +package me.zhyd.oauth.request; + +import cn.hutool.http.HttpRequest; +import cn.hutool.http.HttpResponse; +import com.alibaba.fastjson.JSONObject; +import me.zhyd.oauth.config.AuthConfig; +import me.zhyd.oauth.exception.AuthException; +import me.zhyd.oauth.model.AuthResponse; +import me.zhyd.oauth.model.AuthSource; +import me.zhyd.oauth.model.AuthUser; +import me.zhyd.oauth.utils.AuthConfigChecker; +import me.zhyd.oauth.utils.UrlBuilder; + +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; + +/** + * @author yadong.zhang (yadong.zhang0415(a)gmail.com) + * @version 1.0 + * @website https://www.zhyd.me + * @date 2019/1/31 16:31 + * @since 1.8 + */ +public class AuthGithubRequest implements AuthRequest { + + @Override + public void authorize(HttpServletResponse response) { + if (!AuthConfigChecker.isSupportedGithub()) { + throw new AuthException(ResponseStatus.UNSUPPORTED); + } + String authorizeUrl = UrlBuilder.getGithubAuthorizeUrl(AuthConfig.githubClientId, AuthConfig.githubRedirectUri); + try { + response.sendRedirect(authorizeUrl); + } catch (IOException e) { + e.printStackTrace(); + } + } + + @Override + public String authorize() { + if (!AuthConfigChecker.isSupportedGithub()) { + throw new AuthException(ResponseStatus.UNSUPPORTED); + } + return UrlBuilder.getGithubAuthorizeUrl(AuthConfig.githubClientId, AuthConfig.githubRedirectUri); + } + + @Override + public AuthResponse login(String code) { + if (!AuthConfigChecker.isSupportedGithub()) { + return AuthResponse.builder() + .code(ResponseStatus.UNSUPPORTED.getCode()) + .msg(ResponseStatus.UNSUPPORTED.getMsg()) + .build(); + } + String accessTokenUrl = UrlBuilder.getGithubAccessTokenUrl(AuthConfig.githubClientId, AuthConfig.githubClientSecret, code, AuthConfig.githubRedirectUri); + HttpResponse response = HttpRequest.post(accessTokenUrl).execute(); + String accessTokenStr = response.body(); + String accessToken = accessTokenStr.split("&")[0]; + response = HttpRequest.get(UrlBuilder.getGithubUserInfoUrl(accessToken)).execute(); + String userInfo = response.body(); + JSONObject object = JSONObject.parseObject(userInfo); + return AuthResponse.builder() + .data(AuthUser.builder() + .username(object.getString("login")) + .avatar(object.getString("avatar_url")) + .blog(object.getString("blog")) + .nickname(object.getString("name")) + .company(object.getString("company")) + .location(object.getString("location")) + .email(object.getString("email")) + .remark(object.getString("bio")) + .source(AuthSource.GITHUB) + .build()) + .build(); + } +} diff --git a/src/main/java/me/zhyd/oauth/request/AuthRequest.java b/src/main/java/me/zhyd/oauth/request/AuthRequest.java new file mode 100644 index 0000000..76d10fa --- /dev/null +++ b/src/main/java/me/zhyd/oauth/request/AuthRequest.java @@ -0,0 +1,42 @@ +package me.zhyd.oauth.request; + +import me.zhyd.oauth.exception.AuthException; +import me.zhyd.oauth.model.AuthResponse; + +import javax.servlet.http.HttpServletResponse; + +/** + * @author yadong.zhang (yadong.zhang0415(a)gmail.com) + * @version 1.0 + * @website https://www.zhyd.me + * @date 2019/1/31 15:45 + * @since 1.8 + */ +public interface AuthRequest { + + /** + * 自动跳转到认证页面 + * + * @param response response + */ + default void authorize(HttpServletResponse response) { + throw new AuthException(ResponseStatus.NOT_IMPLEMENTED); + } + + /** + * 返回认证url，可自行跳转页面 + */ + default String authorize() { + throw new AuthException(ResponseStatus.NOT_IMPLEMENTED); + } + + /** + * 第三方登录 + * + * @param code 通过authorize换回的code + * @return 返回登陆成功后的用户信息 + */ + default AuthResponse login(String code) { + throw new AuthException(ResponseStatus.NOT_IMPLEMENTED); + } +} diff --git a/src/main/java/me/zhyd/oauth/request/AuthWeiboRequest.java b/src/main/java/me/zhyd/oauth/request/AuthWeiboRequest.java new file mode 100644 index 0000000..7862549 --- /dev/null +++ b/src/main/java/me/zhyd/oauth/request/AuthWeiboRequest.java @@ -0,0 +1,90 @@ +package me.zhyd.oauth.request; + +import cn.hutool.http.HttpRequest; +import cn.hutool.http.HttpResponse; +import com.alibaba.fastjson.JSONObject; +import me.zhyd.oauth.config.AuthConfig; +import me.zhyd.oauth.exception.AuthException; +import me.zhyd.oauth.model.AuthResponse; +import me.zhyd.oauth.model.AuthSource; +import me.zhyd.oauth.model.AuthUser; +import me.zhyd.oauth.model.AuthUserGender; +import me.zhyd.oauth.utils.AuthConfigChecker; +import me.zhyd.oauth.utils.IpUtils; +import me.zhyd.oauth.utils.StringUtils; +import me.zhyd.oauth.utils.UrlBuilder; + +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.net.InetAddress; + +/** + * @author yadong.zhang (yadong.zhang0415(a)gmail.com) + * @version 1.0 + * @website https://www.zhyd.me + * @date 2019/1/31 16:31 + * @since 1.8 + */ +public class AuthWeiboRequest implements AuthRequest { + + @Override + public void authorize(HttpServletResponse response) { + if (!AuthConfigChecker.isSupportedWeibo()) { + throw new AuthException(ResponseStatus.UNSUPPORTED); + } + String authorizeUrl = UrlBuilder.getWeiboAuthorizeUrl(AuthConfig.weiboClientId, AuthConfig.weiboRedirectUri); + try { + response.sendRedirect(authorizeUrl); + } catch (IOException e) { + e.printStackTrace(); + } + } + + @Override + public String authorize() { + if (!AuthConfigChecker.isSupportedWeibo()) { + throw new AuthException(ResponseStatus.UNSUPPORTED); + } + return UrlBuilder.getWeiboAuthorizeUrl(AuthConfig.weiboClientId, AuthConfig.weiboRedirectUri); + } + + @Override + public AuthResponse login(String code) { + if (!AuthConfigChecker.isSupportedWeibo()) { + return AuthResponse.builder() + .code(ResponseStatus.UNSUPPORTED.getCode()) + .msg(ResponseStatus.UNSUPPORTED.getMsg()) + .build(); + } + String accessTokenUrl = UrlBuilder.getWeiboAccessTokenUrl(AuthConfig.weiboClientId, AuthConfig.weiboClientSecret, code, AuthConfig.weiboRedirectUri); + HttpResponse response = HttpRequest.post(accessTokenUrl).execute(); + String accessTokenStr = response.body(); + JSONObject accessTokenObject = JSONObject.parseObject(accessTokenStr); + if (accessTokenObject.containsKey("error")) { + return AuthResponse.builder() + .code(500) + .msg("Unable to get token from gitee using code [" + code + "]") + .build(); + } + String accessToken = accessTokenObject.getString("access_token"); + String uid = accessTokenObject.getString("uid"); + response = HttpRequest.get(UrlBuilder.getWeiboUserInfoUrl(uid, accessToken)) + .header("Authorization", "OAuth2 " + accessToken) + .header("API-RemoteIP", IpUtils.getIp()) + .execute(); + String userInfo = response.body(); + JSONObject object = JSONObject.parseObject(userInfo); + return AuthResponse.builder() + .data(AuthUser.builder() + .username(object.getString("name")) + .avatar(object.getString("profile_image_url")) + .blog(StringUtils.isEmpty(object.getString("url")) ? "https://weibo.com/" + object.getString("profile_url") : object.getString("url")) + .nickname(object.getString("screen_name")) + .location(object.getString("location")) + .remark(object.getString("description")) + .gender(AuthUserGender.getRealGender(object.getString("gender"))) + .source(AuthSource.GITHUB) + .build()) + .build(); + } +} diff --git a/src/main/java/me/zhyd/oauth/request/ResponseStatus.java b/src/main/java/me/zhyd/oauth/request/ResponseStatus.java new file mode 100644 index 0000000..570c321 --- /dev/null +++ b/src/main/java/me/zhyd/oauth/request/ResponseStatus.java @@ -0,0 +1,32 @@ +package me.zhyd.oauth.request; + +/** + * @author yadong.zhang (yadong.zhang0415(a)gmail.com) + * @version 1.0 + * @website https://www.zhyd.me + * @date 2019/1/31 16:37 + * @since 1.8 + */ +public enum ResponseStatus { + FAILURE(5000, "Authentication failure"), + NOT_IMPLEMENTED(5001, "Not Implemented"), + UNSUPPORTED(5002, "Unsupported authentication, please check the configuration."), + ; + + private int code; + private String msg; + + ResponseStatus(int code, String msg) { + this.code = code; + this.msg = msg; + } + + public int getCode() { + return code; + } + + public String getMsg() { + return msg; + } +} + diff --git a/src/main/java/me/zhyd/oauth/utils/AuthConfigChecker.java b/src/main/java/me/zhyd/oauth/utils/AuthConfigChecker.java new file mode 100644 index 0000000..f4cc60a --- /dev/null +++ b/src/main/java/me/zhyd/oauth/utils/AuthConfigChecker.java @@ -0,0 +1,60 @@ +package me.zhyd.oauth.utils; + +import me.zhyd.oauth.config.AuthConfig; + +/** + * @author yadong.zhang (yadong.zhang0415(a)gmail.com) + * @version 1.0 + * @website https://www.zhyd.me + * @date 2019/1/31 15:46 + * @since 1.8 + */ +public class AuthConfigChecker { + + /** + * 是否支持微博 + * + * @return true or false + */ + public static boolean isSupportedWeibo() { + return StringUtils.isNotEmpty(AuthConfig.weiboClientId) && StringUtils.isNotEmpty(AuthConfig.weiboClientSecret) && StringUtils.isNotEmpty(AuthConfig.weiboRedirectUri); + } + + /** + * 是否支持Github + * + * @return true or false + */ + public static boolean isSupportedGithub() { + return StringUtils.isNotEmpty(AuthConfig.githubClientId) && StringUtils.isNotEmpty(AuthConfig.githubClientSecret) && StringUtils.isNotEmpty(AuthConfig.githubRedirectUri); + } + + /** + * 是否支持Gitee + * + * @return true or false + */ + public static boolean isSupportedGitee() { + return StringUtils.isNotEmpty(AuthConfig.giteeClientId) && StringUtils.isNotEmpty(AuthConfig.giteeClientSecret) && StringUtils.isNotEmpty(AuthConfig.giteeRedirectUri); + } + + /** + * 是否支持QQ + * + * @return true or false + */ + @Deprecated + public static boolean isSupportedQq() { + return false; + } + + /** + * 是否支持微信 + * + * @return true or false + */ + @Deprecated + public static boolean isSupportedWeixin() { + return false; + } +} diff --git a/src/main/java/me/zhyd/oauth/utils/IpUtils.java b/src/main/java/me/zhyd/oauth/utils/IpUtils.java new file mode 100644 index 0000000..da3dab9 --- /dev/null +++ b/src/main/java/me/zhyd/oauth/utils/IpUtils.java @@ -0,0 +1,32 @@ +package me.zhyd.oauth.utils; + +import lombok.extern.slf4j.Slf4j; + +import javax.servlet.http.HttpServletRequest; +import java.net.InetAddress; +import java.net.UnknownHostException; + +/** + * 获取IP的工具类 + * + * @author yadong.zhang (yadong.zhang0415(a)gmail.com) + * @version 1.0 + * @website https://www.zhyd.me + * @date 2019/1/31 16:31 + * @since 1.0 + */ +@Slf4j +public class IpUtils { + + /** + * 获取IP + */ + public static String getIp() { + try { + return InetAddress.getLocalHost().getHostAddress(); + } catch (UnknownHostException e) { + e.printStackTrace(); + return null; + } + } +} \ No newline at end of file diff --git a/src/main/java/me/zhyd/oauth/utils/StringUtils.java b/src/main/java/me/zhyd/oauth/utils/StringUtils.java new file mode 100644 index 0000000..2255c96 --- /dev/null +++ b/src/main/java/me/zhyd/oauth/utils/StringUtils.java @@ -0,0 +1,19 @@ +package me.zhyd.oauth.utils; + +/** + * @author yadong.zhang (yadong.zhang0415(a)gmail.com) + * @version 1.0 + * @website https://www.zhyd.me + * @date 2019/1/31 15:48 + * @since 1.8 + */ +public class StringUtils { + + public static boolean isEmpty(String str) { + return null == str || str.isEmpty(); + } + + public static boolean isNotEmpty(String str) { + return !isEmpty(str); + } +} diff --git a/src/main/java/me/zhyd/oauth/utils/UrlBuilder.java b/src/main/java/me/zhyd/oauth/utils/UrlBuilder.java new file mode 100644 index 0000000..5f69e3c --- /dev/null +++ b/src/main/java/me/zhyd/oauth/utils/UrlBuilder.java @@ -0,0 +1,132 @@ +package me.zhyd.oauth.utils; + +import me.zhyd.oauth.consts.ApiUrlConst; + +import java.text.MessageFormat; + +/** + * Url构建工具类 + * + * @author yadong.zhang (yadong.zhang0415(a)gmail.com) + * @version 1.0 + * @website https://www.zhyd.me + * @date 2019/1/31 12:26 + * @since 1.0 + */ +public class UrlBuilder { + + private static final String GITHUB_ACCESS_TOKEN_PATTERN = "{0}?client_id={1}&client_secret={2}&code={3}&redirect_uri={4}"; + private static final String GITHUB_USER_INFO_PATTERN = "{0}?{1}"; + private static final String GITHUB_AUTHORIZE_PATTERN = "{0}?client_id={1}&state=1&redirect_uri={2}"; + + private static final String WEIBO_ACCESS_TOKEN_PATTERN = "{0}?client_id={1}&client_secret={2}&grant_type=authorization_code&code={3}&redirect_uri={4}"; + private static final String WEIBO_USER_INFO_PATTERN = "{0}?uid={1}&access_token={2}"; + private static final String WEIBO_AUTHORIZE_PATTERN = "{0}?client_id={1}&response_type=code&redirect_uri={2}"; + + private static final String GITEE_ACCESS_TOKEN_PATTERN = "{0}?client_id={1}&client_secret={2}&grant_type=authorization_code&code={3}&redirect_uri={4}"; + private static final String GITEE_USER_INFO_PATTERN = "{0}?access_token={1}"; + private static final String GITEE_AUTHORIZE_PATTERN = "{0}?client_id={1}&response_type=code&redirect_uri={2}"; + + /** + * 获取githubtoken的接口地址 + * + * @param clientId github应用的Client ID + * @param clientSecret github应用的Client Secret + * @param code github授权前的code，用来换token + * @param redirectUri 待跳转的页面 + * @return 换取github授权token的真实地址 + */ + public static String getGithubAccessTokenUrl(String clientId, String clientSecret, String code, String redirectUri) { + return MessageFormat.format(GITHUB_ACCESS_TOKEN_PATTERN, ApiUrlConst.GITHUB_ACCESS_TOKEN_URL, clientId, clientSecret, code, redirectUri); + } + + /** + * 获取github用户详情的接口地址 + * + * @param token github 应用的token + * @return json + */ + public static String getGithubUserInfoUrl(String token) { + return MessageFormat.format(GITHUB_USER_INFO_PATTERN, ApiUrlConst.GITHUB_USER_INFO_URL, token); + } + + /** + * 获取github授权地址 + * + * @param clientId github 应用的Client ID + * @param redirectUrl github 应用授权成功后的回调地址 + * @return json + */ + public static String getGithubAuthorizeUrl(String clientId, String redirectUrl) { + return MessageFormat.format(GITHUB_AUTHORIZE_PATTERN, ApiUrlConst.GITHUB_AUTHORIZE_URL, clientId, redirectUrl); + } + + /** + * 获取weibo token的接口地址 + * + * @param clientId weibo应用的App Key + * @param clientSecret weibo应用的App Secret + * @param code weibo授权前的code，用来换token + * @param redirectUri 待跳转的页面 + * @return 换取weibo授权token的真实地址 + */ + public static String getWeiboAccessTokenUrl(String clientId, String clientSecret, String code, String redirectUri) { + return MessageFormat.format(WEIBO_ACCESS_TOKEN_PATTERN, ApiUrlConst.WEIBO_ACCESS_TOKEN_URL, clientId, clientSecret, code, redirectUri); + } + + /** + * 获取weibo用户详情的接口地址 + * + * @param uid 用户id + * @param token weibo 应用的token + * @return json + */ + public static String getWeiboUserInfoUrl(String uid, String token) { + return MessageFormat.format(WEIBO_USER_INFO_PATTERN, ApiUrlConst.WEIBO_USER_INFO_URL, uid, token); + } + + /** + * 获取weibo授权地址 + * + * @param clientId weibo 应用的Client ID + * @param redirectUrl weibo 应用授权成功后的回调地址 + * @return json + */ + public static String getWeiboAuthorizeUrl(String clientId, String redirectUrl) { + return MessageFormat.format(WEIBO_AUTHORIZE_PATTERN, ApiUrlConst.WEIBO_AUTHORIZE_URL, clientId, redirectUrl); + } + + /** + * 获取gitee token的接口地址 + * + * @param clientId gitee应用的Client ID + * @param clientSecret gitee应用的Client Secret + * @param code gitee授权前的code，用来换token + * @param redirectUri 待跳转的页面 + * @return 换取gitee授权token的真实地址 + */ + public static String getGiteeAccessTokenUrl(String clientId, String clientSecret, String code, String redirectUri) { + return MessageFormat.format(GITEE_ACCESS_TOKEN_PATTERN, ApiUrlConst.GITEE_ACCESS_TOKEN_URL, clientId, clientSecret, code, redirectUri); + } + + /** + * 获取gitee用户详情的接口地址 + * + * @param token gitee 应用的token + * @return json + */ + public static String getGiteeUserInfoUrl(String token) { + return MessageFormat.format(GITEE_USER_INFO_PATTERN, ApiUrlConst.GITEE_USER_INFO_URL, token); + } + + /** + * 获取gitee授权地址 + * + * @param clientId gitee 应用的Client ID + * @param redirectUrl gitee 应用授权成功后的回调地址 + * @return json + */ + public static String getGiteeAuthorizeUrl(String clientId, String redirectUrl) { + return MessageFormat.format(GITEE_AUTHORIZE_PATTERN, ApiUrlConst.GITEE_AUTHORIZE_URL, clientId, redirectUrl); + } +} From c89111c3b7cac39b0c832c506cc30029be36ef3d Mon Sep 17 00:00:00 2001 From: "yadong.zhang" Date: Thu, 31 Jan 2019 18:01:24 +0800 Subject: [PATCH 03/10] commit pom --- pom.xml | 110 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 110 insertions(+) create mode 100644 pom.xml diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..1a48a77 --- /dev/null +++ b/pom.xml @@ -0,0 +1,110 @@ + + + + 4.0.0 + + me.zhyd.oauth + JustAuth + 1.0.0-SNAPSHOT + + JustAuth + https://gitee.com/yadong.zhang/JustAuth + 史上最全的整合第三方登录的工具, Just Auth + + + + The Apache Software License, Version 2.0 + https://gitee.com/yadong.zhang/JustAuth/blob/master/LICENSE + + + + + + yadong.zhang + yadong.zhang0415@gmail.com + + + + + UTF-8 + 1.7 + 1.7 + 2.2.1 + 3.7.0 + true + 4.1.21 + 1.18.4 + 4.11 + 2.5 + 1.2.44 + + + + + org.projectlombok + lombok + ${lombok-version} + + + cn.hutool + hutool-http + ${hutool-version} + + + junit + junit + ${junit-version} + test + + + javax.servlet + servlet-api + ${servlet-api-version} + + + com.alibaba + fastjson + ${fastjson-version} + + + + + ${project.artifactId}-${project.version} + + + org.apache.maven.plugins + maven-compiler-plugin + ${maven-compiler.version} + + ${project.build.sourceEncoding} + ${java.version} + ${java.version} + + + + maven-source-plugin + ${maven-source.version} + true + + + package + + jar-no-fork + + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + + + org.apache.maven.plugins + maven-gpg-plugin + + + + From 790679ce3881c7b3a91c86cece003db24db79152 Mon Sep 17 00:00:00 2001 From: "yadong.zhang" Date: Thu, 31 Jan 2019 18:28:50 +0800 Subject: [PATCH 04/10] Update pom.xml --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 1a48a77..755c0b7 100644 --- a/pom.xml +++ b/pom.xml @@ -28,8 +28,8 @@ UTF-8 - 1.7 - 1.7 + 1.8 + 1.8 2.2.1 3.7.0 true From 8d77311aa2b93cb56bb4d23cb817a8724fb5c559 Mon Sep 17 00:00:00 2001 From: "yadong.zhang" Date: Thu, 31 Jan 2019 18:34:31 +0800 Subject: [PATCH 05/10] Update pom.xml --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index 755c0b7..bb9e4c7 100644 --- a/pom.xml +++ b/pom.xml @@ -28,6 +28,7 @@ UTF-8 + 1.8 1.8 1.8 2.2.1 From a08e16e1f43333a0b21ca64b39d21a001f33cf50 Mon Sep 17 00:00:00 2001 From: "yadong.zhang" Date: Mon, 18 Feb 2019 09:42:26 +0800 Subject: [PATCH 06/10] =?UTF-8?q?:tada:=20=E4=BF=AE=E6=94=B9=E8=AE=A4?= =?UTF-8?q?=E8=AF=81=E6=96=B9=E5=BC=8F=E4=B8=BA=E6=98=BE=E5=BC=8F=E7=9A=84?= =?UTF-8?q?=E4=BC=A0=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 288 +++++++++++------- .../java/me/zhyd/oauth/config/AuthConfig.java | 43 +-- .../me/zhyd/oauth/config/GiteeConfig.java | 16 + .../me/zhyd/oauth/config/GithubConfig.java | 16 + .../java/me/zhyd/oauth/config/QqConfig.java | 17 ++ .../me/zhyd/oauth/config/WechatConfig.java | 17 ++ .../me/zhyd/oauth/config/WeiboConfig.java | 16 + .../zhyd/oauth/request/AuthGiteeRequest.java | 12 +- .../zhyd/oauth/request/AuthGithubRequest.java | 12 +- .../me/zhyd/oauth/request/AuthRequest.java | 13 +- .../zhyd/oauth/request/AuthWeiboRequest.java | 13 +- .../java/me/zhyd/oauth/utils/IpUtils.java | 1 - 12 files changed, 295 insertions(+), 169 deletions(-) create mode 100644 src/main/java/me/zhyd/oauth/config/GiteeConfig.java create mode 100644 src/main/java/me/zhyd/oauth/config/GithubConfig.java create mode 100644 src/main/java/me/zhyd/oauth/config/QqConfig.java create mode 100644 src/main/java/me/zhyd/oauth/config/WechatConfig.java create mode 100644 src/main/java/me/zhyd/oauth/config/WeiboConfig.java diff --git a/pom.xml b/pom.xml index bb9e4c7..603b7ae 100644 --- a/pom.xml +++ b/pom.xml @@ -1,111 +1,177 @@ - - - - 4.0.0 - - me.zhyd.oauth - JustAuth - 1.0.0-SNAPSHOT - - JustAuth - https://gitee.com/yadong.zhang/JustAuth - 史上最全的整合第三方登录的工具, Just Auth - - - - The Apache Software License, Version 2.0 - https://gitee.com/yadong.zhang/JustAuth/blob/master/LICENSE - - - - - - yadong.zhang - yadong.zhang0415@gmail.com - - - - - UTF-8 - 1.8 - 1.8 - 1.8 - 2.2.1 - 3.7.0 - true - 4.1.21 - 1.18.4 - 4.11 - 2.5 - 1.2.44 - - - - - org.projectlombok - lombok - ${lombok-version} - - - cn.hutool - hutool-http - ${hutool-version} - - - junit - junit - ${junit-version} - test - - - javax.servlet - servlet-api - ${servlet-api-version} - - - com.alibaba - fastjson - ${fastjson-version} - - - - - ${project.artifactId}-${project.version} - - - org.apache.maven.plugins - maven-compiler-plugin - ${maven-compiler.version} - - ${project.build.sourceEncoding} - ${java.version} - ${java.version} - - - - maven-source-plugin - ${maven-source.version} - true - - - package - - jar-no-fork - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - - - - org.apache.maven.plugins - maven-gpg-plugin - - - - + + + + 4.0.0 + + me.zhyd.oauth + JustAuth + 1.0.0-SNAPSHOT + + JustAuth + https://gitee.com/yadong.zhang/JustAuth + 史上最全的整合第三方登录的工具, Just Auth + + + + The Apache Software License, Version 2.0 + https://gitee.com/yadong.zhang/JustAuth/blob/master/LICENSE + + + + + scm:git:https://gitee.com/yadong.zhang/JustAuth.git + scm:git:https://gitee.com/yadong.zhang/JustAuth.git + https://gitee.com/yadong.zhang/JustAuth + + + + + yadong.zhang + yadong.zhang0415@gmail.com + + + + + UTF-8 + 1.8 + 1.8 + 1.8 + 2.2.1 + 3.7.0 + true + 4.1.21 + 1.18.4 + 4.11 + 2.5 + 1.2.44 + + + + + org.projectlombok + lombok + ${lombok-version} + + + cn.hutool + hutool-http + ${hutool-version} + + + junit + junit + ${junit-version} + test + + + javax.servlet + servlet-api + ${servlet-api-version} + + + com.alibaba + fastjson + ${fastjson-version} + + + + + ${project.artifactId}-${project.version} + + + org.apache.maven.plugins + maven-compiler-plugin + ${maven-compiler.version} + + ${project.build.sourceEncoding} + ${java.version} + ${java.version} + + + + maven-source-plugin + ${maven-source.version} + true + + + package + + jar-no-fork + + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + + + org.apache.maven.plugins + maven-gpg-plugin + + + + + + release + + + + + org.apache.maven.plugins + maven-source-plugin + ${maven-source.version} + true + + + package + + jar-no-fork + + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + + package + + jar + + + + + + + org.apache.maven.plugins + maven-gpg-plugin + + + verify + + sign + + + + + + + + + sonatype-oss + https://oss.sonatype.org/content/repositories/snapshots/ + + + sonatype-oss + https://oss.sonatype.org/service/local/staging/deploy/maven2/ + + + + + diff --git a/src/main/java/me/zhyd/oauth/config/AuthConfig.java b/src/main/java/me/zhyd/oauth/config/AuthConfig.java index 9ea8b3b..d880afb 100644 --- a/src/main/java/me/zhyd/oauth/config/AuthConfig.java +++ b/src/main/java/me/zhyd/oauth/config/AuthConfig.java @@ -1,5 +1,8 @@ package me.zhyd.oauth.config; +import lombok.Builder; +import lombok.Getter; + /** * @author yadong.zhang (yadong.zhang0415(a)gmail.com) * @version 1.0 @@ -7,41 +10,13 @@ package me.zhyd.oauth.config; * @date 2019/1/31 14:03 * @since 1.8 */ +@Getter +@Builder public class AuthConfig { + private String clientId; + private String clientSecret; /** - * github应用的Client ID + * 登陆成功后的回调地址 */ - public static String githubClientId = null; - /** - * github应用的Client Secret - */ - public static String githubClientSecret = null; - /** - * github应用的redirect_uri 登陆成功后的回调地址 - */ - public static String githubRedirectUri = null; - /** - * weibo应用的App Key - */ - public static String weiboClientId = null; - /** - * weibo应用的App Secret - */ - public static String weiboClientSecret = null; - /** - * weibo应用的redirect_uri 登陆成功后的回调地址 - */ - public static String weiboRedirectUri = null; - /** - * gitee应用的Client ID - */ - public static String giteeClientId = null; - /** - * gitee应用的Client Secret - */ - public static String giteeClientSecret = null; - /** - * gitee应用的redirect_uri 登陆成功后的回调地址 - */ - public static String giteeRedirectUri = null; + private String redirectUri; } diff --git a/src/main/java/me/zhyd/oauth/config/GiteeConfig.java b/src/main/java/me/zhyd/oauth/config/GiteeConfig.java new file mode 100644 index 0000000..f5ad3fd --- /dev/null +++ b/src/main/java/me/zhyd/oauth/config/GiteeConfig.java @@ -0,0 +1,16 @@ +package me.zhyd.oauth.config; + +import lombok.Builder; +import lombok.Getter; + +/** + * @author yadong.zhang (yadong.zhang0415(a)gmail.com) + * @version 1.0 + * @website https://www.zhyd.me + * @date 2019/2/14 13:34 + * @since 1.8 + */ +@Getter +@Builder +public class GiteeConfig extends AuthConfig { +} diff --git a/src/main/java/me/zhyd/oauth/config/GithubConfig.java b/src/main/java/me/zhyd/oauth/config/GithubConfig.java new file mode 100644 index 0000000..73de971 --- /dev/null +++ b/src/main/java/me/zhyd/oauth/config/GithubConfig.java @@ -0,0 +1,16 @@ +package me.zhyd.oauth.config; + +import lombok.Builder; +import lombok.Getter; + +/** + * @author yadong.zhang (yadong.zhang0415(a)gmail.com) + * @version 1.0 + * @website https://www.zhyd.me + * @date 2019/2/14 13:34 + * @since 1.8 + */ +@Getter +@Builder +public class GithubConfig extends AuthConfig { +} diff --git a/src/main/java/me/zhyd/oauth/config/QqConfig.java b/src/main/java/me/zhyd/oauth/config/QqConfig.java new file mode 100644 index 0000000..d1057b1 --- /dev/null +++ b/src/main/java/me/zhyd/oauth/config/QqConfig.java @@ -0,0 +1,17 @@ +package me.zhyd.oauth.config; + +import lombok.Builder; +import lombok.Getter; + +/** + * @author yadong.zhang (yadong.zhang0415(a)gmail.com) + * @version 1.0 + * @website https://www.zhyd.me + * @date 2019/2/14 13:34 + * @since 1.8 + */ +@Getter +@Builder +@Deprecated +public class QqConfig extends AuthConfig { +} diff --git a/src/main/java/me/zhyd/oauth/config/WechatConfig.java b/src/main/java/me/zhyd/oauth/config/WechatConfig.java new file mode 100644 index 0000000..9625067 --- /dev/null +++ b/src/main/java/me/zhyd/oauth/config/WechatConfig.java @@ -0,0 +1,17 @@ +package me.zhyd.oauth.config; + +import lombok.Builder; +import lombok.Getter; + +/** + * @author yadong.zhang (yadong.zhang0415(a)gmail.com) + * @version 1.0 + * @website https://www.zhyd.me + * @date 2019/2/14 13:34 + * @since 1.8 + */ +@Getter +@Builder +@Deprecated +public class WechatConfig extends AuthConfig { +} diff --git a/src/main/java/me/zhyd/oauth/config/WeiboConfig.java b/src/main/java/me/zhyd/oauth/config/WeiboConfig.java new file mode 100644 index 0000000..8ea0984 --- /dev/null +++ b/src/main/java/me/zhyd/oauth/config/WeiboConfig.java @@ -0,0 +1,16 @@ +package me.zhyd.oauth.config; + +import lombok.Builder; +import lombok.Getter; + +/** + * @author yadong.zhang (yadong.zhang0415(a)gmail.com) + * @version 1.0 + * @website https://www.zhyd.me + * @date 2019/2/14 13:34 + * @since 1.8 + */ +@Getter +@Builder +public class WeiboConfig extends AuthConfig { +} diff --git a/src/main/java/me/zhyd/oauth/request/AuthGiteeRequest.java b/src/main/java/me/zhyd/oauth/request/AuthGiteeRequest.java index 4d851e5..9f23061 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthGiteeRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthGiteeRequest.java @@ -24,11 +24,11 @@ import java.io.IOException; public class AuthGiteeRequest implements AuthRequest { @Override - public void authorize(HttpServletResponse response) { + public void authorize(AuthConfig config, HttpServletResponse response) { if (!AuthConfigChecker.isSupportedGitee()) { throw new AuthException(ResponseStatus.UNSUPPORTED); } - String authorizeUrl = UrlBuilder.getGiteeAuthorizeUrl(AuthConfig.giteeClientId, AuthConfig.giteeRedirectUri); + String authorizeUrl = UrlBuilder.getGiteeAuthorizeUrl(config.getClientId(), config.getRedirectUri()); try { response.sendRedirect(authorizeUrl); } catch (IOException e) { @@ -37,22 +37,22 @@ public class AuthGiteeRequest implements AuthRequest { } @Override - public String authorize() { + public String authorize(AuthConfig config) { if (!AuthConfigChecker.isSupportedGitee()) { throw new AuthException(ResponseStatus.UNSUPPORTED); } - return UrlBuilder.getGiteeAuthorizeUrl(AuthConfig.giteeClientId, AuthConfig.giteeRedirectUri); + return UrlBuilder.getGiteeAuthorizeUrl(config.getClientId(), config.getRedirectUri()); } @Override - public AuthResponse login(String code) { + public AuthResponse login(AuthConfig config, String code) { if (!AuthConfigChecker.isSupportedGitee()) { return AuthResponse.builder() .code(ResponseStatus.UNSUPPORTED.getCode()) .msg(ResponseStatus.UNSUPPORTED.getMsg()) .build(); } - String accessTokenUrl = UrlBuilder.getGiteeAccessTokenUrl(AuthConfig.giteeClientId, AuthConfig.giteeClientSecret, code, AuthConfig.giteeRedirectUri); + String accessTokenUrl = UrlBuilder.getGiteeAccessTokenUrl(config.getClientId(), config.getClientSecret(), code, config.getRedirectUri()); HttpResponse response = HttpRequest.post(accessTokenUrl).execute(); String accessTokenStr = response.body(); JSONObject accessTokenObject = JSONObject.parseObject(accessTokenStr); diff --git a/src/main/java/me/zhyd/oauth/request/AuthGithubRequest.java b/src/main/java/me/zhyd/oauth/request/AuthGithubRequest.java index 69e49f4..97da27b 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthGithubRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthGithubRequest.java @@ -24,11 +24,11 @@ import java.io.IOException; public class AuthGithubRequest implements AuthRequest { @Override - public void authorize(HttpServletResponse response) { + public void authorize(AuthConfig config, HttpServletResponse response) { if (!AuthConfigChecker.isSupportedGithub()) { throw new AuthException(ResponseStatus.UNSUPPORTED); } - String authorizeUrl = UrlBuilder.getGithubAuthorizeUrl(AuthConfig.githubClientId, AuthConfig.githubRedirectUri); + String authorizeUrl = UrlBuilder.getGithubAuthorizeUrl(config.getClientId(), config.getRedirectUri()); try { response.sendRedirect(authorizeUrl); } catch (IOException e) { @@ -37,22 +37,22 @@ public class AuthGithubRequest implements AuthRequest { } @Override - public String authorize() { + public String authorize(AuthConfig config) { if (!AuthConfigChecker.isSupportedGithub()) { throw new AuthException(ResponseStatus.UNSUPPORTED); } - return UrlBuilder.getGithubAuthorizeUrl(AuthConfig.githubClientId, AuthConfig.githubRedirectUri); + return UrlBuilder.getGithubAuthorizeUrl(config.getClientId(), config.getRedirectUri()); } @Override - public AuthResponse login(String code) { + public AuthResponse login(AuthConfig config, String code) { if (!AuthConfigChecker.isSupportedGithub()) { return AuthResponse.builder() .code(ResponseStatus.UNSUPPORTED.getCode()) .msg(ResponseStatus.UNSUPPORTED.getMsg()) .build(); } - String accessTokenUrl = UrlBuilder.getGithubAccessTokenUrl(AuthConfig.githubClientId, AuthConfig.githubClientSecret, code, AuthConfig.githubRedirectUri); + String accessTokenUrl = UrlBuilder.getGithubAccessTokenUrl(config.getClientId(), config.getClientSecret(), code, config.getRedirectUri()); HttpResponse response = HttpRequest.post(accessTokenUrl).execute(); String accessTokenStr = response.body(); String accessToken = accessTokenStr.split("&")[0]; diff --git a/src/main/java/me/zhyd/oauth/request/AuthRequest.java b/src/main/java/me/zhyd/oauth/request/AuthRequest.java index 76d10fa..eb9d3d0 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthRequest.java @@ -1,5 +1,6 @@ package me.zhyd.oauth.request; +import me.zhyd.oauth.config.AuthConfig; import me.zhyd.oauth.exception.AuthException; import me.zhyd.oauth.model.AuthResponse; @@ -17,26 +18,30 @@ public interface AuthRequest { /** * 自动跳转到认证页面 * + * @param config 授权的配置，对应不同平台 * @param response response */ - default void authorize(HttpServletResponse response) { + default void authorize(AuthConfig config, HttpServletResponse response) { throw new AuthException(ResponseStatus.NOT_IMPLEMENTED); } /** * 返回认证url，可自行跳转页面 + * + * @param config 授权的配置，对应不同平台 */ - default String authorize() { + default String authorize(AuthConfig config) { throw new AuthException(ResponseStatus.NOT_IMPLEMENTED); } /** * 第三方登录 * - * @param code 通过authorize换回的code + * @param config 授权的配置，对应不同平台 + * @param code 通过authorize换回的code * @return 返回登陆成功后的用户信息 */ - default AuthResponse login(String code) { + default AuthResponse login(AuthConfig config, String code) { throw new AuthException(ResponseStatus.NOT_IMPLEMENTED); } } diff --git a/src/main/java/me/zhyd/oauth/request/AuthWeiboRequest.java b/src/main/java/me/zhyd/oauth/request/AuthWeiboRequest.java index 7862549..cc2a8c1 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthWeiboRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthWeiboRequest.java @@ -16,7 +16,6 @@ import me.zhyd.oauth.utils.UrlBuilder; import javax.servlet.http.HttpServletResponse; import java.io.IOException; -import java.net.InetAddress; /** * @author yadong.zhang (yadong.zhang0415(a)gmail.com) @@ -28,11 +27,11 @@ import java.net.InetAddress; public class AuthWeiboRequest implements AuthRequest { @Override - public void authorize(HttpServletResponse response) { + public void authorize(AuthConfig config, HttpServletResponse response) { if (!AuthConfigChecker.isSupportedWeibo()) { throw new AuthException(ResponseStatus.UNSUPPORTED); } - String authorizeUrl = UrlBuilder.getWeiboAuthorizeUrl(AuthConfig.weiboClientId, AuthConfig.weiboRedirectUri); + String authorizeUrl = UrlBuilder.getWeiboAuthorizeUrl(config.getClientId(), config.getRedirectUri()); try { response.sendRedirect(authorizeUrl); } catch (IOException e) { @@ -41,22 +40,22 @@ public class AuthWeiboRequest implements AuthRequest { } @Override - public String authorize() { + public String authorize(AuthConfig config) { if (!AuthConfigChecker.isSupportedWeibo()) { throw new AuthException(ResponseStatus.UNSUPPORTED); } - return UrlBuilder.getWeiboAuthorizeUrl(AuthConfig.weiboClientId, AuthConfig.weiboRedirectUri); + return UrlBuilder.getWeiboAuthorizeUrl(config.getClientId(), config.getRedirectUri()); } @Override - public AuthResponse login(String code) { + public AuthResponse login(AuthConfig config, String code) { if (!AuthConfigChecker.isSupportedWeibo()) { return AuthResponse.builder() .code(ResponseStatus.UNSUPPORTED.getCode()) .msg(ResponseStatus.UNSUPPORTED.getMsg()) .build(); } - String accessTokenUrl = UrlBuilder.getWeiboAccessTokenUrl(AuthConfig.weiboClientId, AuthConfig.weiboClientSecret, code, AuthConfig.weiboRedirectUri); + String accessTokenUrl = UrlBuilder.getWeiboAccessTokenUrl(config.getClientId(), config.getClientSecret(), code, config.getRedirectUri()); HttpResponse response = HttpRequest.post(accessTokenUrl).execute(); String accessTokenStr = response.body(); JSONObject accessTokenObject = JSONObject.parseObject(accessTokenStr); diff --git a/src/main/java/me/zhyd/oauth/utils/IpUtils.java b/src/main/java/me/zhyd/oauth/utils/IpUtils.java index da3dab9..eeec62c 100644 --- a/src/main/java/me/zhyd/oauth/utils/IpUtils.java +++ b/src/main/java/me/zhyd/oauth/utils/IpUtils.java @@ -15,7 +15,6 @@ import java.net.UnknownHostException; * @date 2019/1/31 16:31 * @since 1.0 */ -@Slf4j public class IpUtils { /** From 9f93e91c81f54377ae7b84f756dced1cfd8b2e7f Mon Sep 17 00:00:00 2001 From: "yadong.zhang" Date: Mon, 18 Feb 2019 10:39:05 +0800 Subject: [PATCH 07/10] Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 603b7ae..acce7b1 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ me.zhyd.oauth JustAuth - 1.0.0-SNAPSHOT + 1.0.0 JustAuth https://gitee.com/yadong.zhang/JustAuth From 8675f1f99c35372867a187dc31ae1fff90ba05bd Mon Sep 17 00:00:00 2001 From: "yadong.zhang" Date: Mon, 18 Feb 2019 10:40:26 +0800 Subject: [PATCH 08/10] =?UTF-8?q?:memo:=20=E7=BC=96=E5=86=99=E6=96=87?= =?UTF-8?q?=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index ba696b0..f694277 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,21 @@ -# JustAuth -史上最全的整合第三方登录的工具, Just Auth +

+ +

+

+ Login, so easy. +

+

+ + + + + + + + + +

+ +------------------------------------------------------------------------------- + +JustAuth，如你所见，它仅仅是一个**第三方授权登录**的**工具类库**，它可以让我们脱离繁琐的第三方登录SDK，让登录变得**So easy!** \ No newline at end of file From 3589878b369779598c94f577c4b0b7877350ec0a Mon Sep 17 00:00:00 2001 From: "yadong.zhang" Date: Mon, 18 Feb 2019 13:39:43 +0800 Subject: [PATCH 09/10] =?UTF-8?q?:alien:=20=E6=9B=B4=E6=96=B0api=E8=B0=83?= =?UTF-8?q?=E7=94=A8=E6=96=B9=E5=BC=8F=E3=80=81=E6=9B=B4=E6=96=B0=E6=96=87?= =?UTF-8?q?=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 63 ++++++++++++++++++- .../me/zhyd/oauth/config/GiteeConfig.java | 16 ----- .../me/zhyd/oauth/config/GithubConfig.java | 16 ----- .../java/me/zhyd/oauth/config/QqConfig.java | 17 ----- .../me/zhyd/oauth/config/WechatConfig.java | 17 ----- .../me/zhyd/oauth/config/WeiboConfig.java | 16 ----- .../zhyd/oauth/request/AuthGiteeRequest.java | 12 ++-- .../zhyd/oauth/request/AuthGithubRequest.java | 12 ++-- .../me/zhyd/oauth/request/AuthRequest.java | 13 ++-- .../zhyd/oauth/request/AuthWeiboRequest.java | 12 ++-- .../zhyd/oauth/request/BaseAuthRequest.java | 20 ++++++ .../java/me/zhyd/oauth/AuthRequestTest.java | 59 +++++++++++++++++ 12 files changed, 169 insertions(+), 104 deletions(-) delete mode 100644 src/main/java/me/zhyd/oauth/config/GiteeConfig.java delete mode 100644 src/main/java/me/zhyd/oauth/config/GithubConfig.java delete mode 100644 src/main/java/me/zhyd/oauth/config/QqConfig.java delete mode 100644 src/main/java/me/zhyd/oauth/config/WechatConfig.java delete mode 100644 src/main/java/me/zhyd/oauth/config/WeiboConfig.java create mode 100644 src/main/java/me/zhyd/oauth/request/BaseAuthRequest.java create mode 100644 src/test/java/me/zhyd/oauth/AuthRequestTest.java diff --git a/README.md b/README.md index f694277..876f33b 100644 --- a/README.md +++ b/README.md @@ -16,6 +16,67 @@

+
+ + + + + + + + + + + + + + + + + + + + + + + +
GiteeGithubWeiboCSDN钉钉QQ微信
+
------------------------------------------------------------------------------- -JustAuth，如你所见，它仅仅是一个**第三方授权登录**的**工具类库**，它可以让我们脱离繁琐的第三方登录SDK，让登录变得**So easy!** \ No newline at end of file + + +JustAuth，如你所见，它仅仅是一个**第三方授权登录**的**工具类库**，它可以让我们脱离繁琐的第三方登录SDK，让登录变得**So easy!** + +## 快速使用 +- 引入依赖 +```xml + + me.zhyd.oauth + JustAuth + 1.0.0 + +``` +- 调用api +```java +AuthRequest authRequest = new AuthGiteeRequest(AuthConfig.builder() + .clientId("clientId") + .clientSecret("clientSecret") + .redirectUri("redirectUri") + .build()); +// 自动跳转到授权页面 +authRequest.authorize(response); +// 返回授权页面，可自行调整 +authRequest.authorize(); +``` + +#### API列表 +| :computer: 平台 | :coffee: API类 | :page_facing_up: SDK | +|:------:|:-------:|:-------:| +| | [AuthGiteeRequest](https://gitee.com/yadong.zhang/JustAuth/blob/master/src/main/java/me/zhyd/oauth/request/AuthGiteeRequest.java) | [https://github.com/settings/developers](https://github.com/settings/developers) | +| | [AuthGithubRequest](https://gitee.com/yadong.zhang/JustAuth/blob/master/src/main/java/me/zhyd/oauth/request/AuthGiteeRequest.java) | [https://gitee.com/api/v5/oauth_doc#list_1](https://gitee.com/api/v5/oauth_doc#list_1) | +| | [AuthWeiboRequest](https://gitee.com/yadong.zhang/JustAuth/blob/master/src/main/java/me/zhyd/oauth/request/AuthGiteeRequest.java) | [https://open.weibo.com/apps](https://open.weibo.com/apps) | +| | AuthCsdnRequest | [https://connect.qq.com/](https://connect.qq.com/) | +| | AuthDingTalkRequest | 待续 | +| | AuthQqRequest | 待续 | +| | AuthWechatRequest | 待续 | diff --git a/src/main/java/me/zhyd/oauth/config/GiteeConfig.java b/src/main/java/me/zhyd/oauth/config/GiteeConfig.java deleted file mode 100644 index f5ad3fd..0000000 --- a/src/main/java/me/zhyd/oauth/config/GiteeConfig.java +++ /dev/null @@ -1,16 +0,0 @@ -package me.zhyd.oauth.config; - -import lombok.Builder; -import lombok.Getter; - -/** - * @author yadong.zhang (yadong.zhang0415(a)gmail.com) - * @version 1.0 - * @website https://www.zhyd.me - * @date 2019/2/14 13:34 - * @since 1.8 - */ -@Getter -@Builder -public class GiteeConfig extends AuthConfig { -} diff --git a/src/main/java/me/zhyd/oauth/config/GithubConfig.java b/src/main/java/me/zhyd/oauth/config/GithubConfig.java deleted file mode 100644 index 73de971..0000000 --- a/src/main/java/me/zhyd/oauth/config/GithubConfig.java +++ /dev/null @@ -1,16 +0,0 @@ -package me.zhyd.oauth.config; - -import lombok.Builder; -import lombok.Getter; - -/** - * @author yadong.zhang (yadong.zhang0415(a)gmail.com) - * @version 1.0 - * @website https://www.zhyd.me - * @date 2019/2/14 13:34 - * @since 1.8 - */ -@Getter -@Builder -public class GithubConfig extends AuthConfig { -} diff --git a/src/main/java/me/zhyd/oauth/config/QqConfig.java b/src/main/java/me/zhyd/oauth/config/QqConfig.java deleted file mode 100644 index d1057b1..0000000 --- a/src/main/java/me/zhyd/oauth/config/QqConfig.java +++ /dev/null @@ -1,17 +0,0 @@ -package me.zhyd.oauth.config; - -import lombok.Builder; -import lombok.Getter; - -/** - * @author yadong.zhang (yadong.zhang0415(a)gmail.com) - * @version 1.0 - * @website https://www.zhyd.me - * @date 2019/2/14 13:34 - * @since 1.8 - */ -@Getter -@Builder -@Deprecated -public class QqConfig extends AuthConfig { -} diff --git a/src/main/java/me/zhyd/oauth/config/WechatConfig.java b/src/main/java/me/zhyd/oauth/config/WechatConfig.java deleted file mode 100644 index 9625067..0000000 --- a/src/main/java/me/zhyd/oauth/config/WechatConfig.java +++ /dev/null @@ -1,17 +0,0 @@ -package me.zhyd.oauth.config; - -import lombok.Builder; -import lombok.Getter; - -/** - * @author yadong.zhang (yadong.zhang0415(a)gmail.com) - * @version 1.0 - * @website https://www.zhyd.me - * @date 2019/2/14 13:34 - * @since 1.8 - */ -@Getter -@Builder -@Deprecated -public class WechatConfig extends AuthConfig { -} diff --git a/src/main/java/me/zhyd/oauth/config/WeiboConfig.java b/src/main/java/me/zhyd/oauth/config/WeiboConfig.java deleted file mode 100644 index 8ea0984..0000000 --- a/src/main/java/me/zhyd/oauth/config/WeiboConfig.java +++ /dev/null @@ -1,16 +0,0 @@ -package me.zhyd.oauth.config; - -import lombok.Builder; -import lombok.Getter; - -/** - * @author yadong.zhang (yadong.zhang0415(a)gmail.com) - * @version 1.0 - * @website https://www.zhyd.me - * @date 2019/2/14 13:34 - * @since 1.8 - */ -@Getter -@Builder -public class WeiboConfig extends AuthConfig { -} diff --git a/src/main/java/me/zhyd/oauth/request/AuthGiteeRequest.java b/src/main/java/me/zhyd/oauth/request/AuthGiteeRequest.java index 9f23061..aee139c 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthGiteeRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthGiteeRequest.java @@ -21,10 +21,14 @@ import java.io.IOException; * @date 2019/1/31 16:31 * @since 1.8 */ -public class AuthGiteeRequest implements AuthRequest { +public class AuthGiteeRequest extends BaseAuthRequest implements AuthRequest { + + public AuthGiteeRequest(AuthConfig config) { + super(config); + } @Override - public void authorize(AuthConfig config, HttpServletResponse response) { + public void authorize(HttpServletResponse response) { if (!AuthConfigChecker.isSupportedGitee()) { throw new AuthException(ResponseStatus.UNSUPPORTED); } @@ -37,7 +41,7 @@ public class AuthGiteeRequest implements AuthRequest { } @Override - public String authorize(AuthConfig config) { + public String authorize() { if (!AuthConfigChecker.isSupportedGitee()) { throw new AuthException(ResponseStatus.UNSUPPORTED); } @@ -45,7 +49,7 @@ public class AuthGiteeRequest implements AuthRequest { } @Override - public AuthResponse login(AuthConfig config, String code) { + public AuthResponse login(String code) { if (!AuthConfigChecker.isSupportedGitee()) { return AuthResponse.builder() .code(ResponseStatus.UNSUPPORTED.getCode()) diff --git a/src/main/java/me/zhyd/oauth/request/AuthGithubRequest.java b/src/main/java/me/zhyd/oauth/request/AuthGithubRequest.java index 97da27b..5483838 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthGithubRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthGithubRequest.java @@ -21,10 +21,14 @@ import java.io.IOException; * @date 2019/1/31 16:31 * @since 1.8 */ -public class AuthGithubRequest implements AuthRequest { +public class AuthGithubRequest extends BaseAuthRequest implements AuthRequest { + + public AuthGithubRequest(AuthConfig config) { + super(config); + } @Override - public void authorize(AuthConfig config, HttpServletResponse response) { + public void authorize(HttpServletResponse response) { if (!AuthConfigChecker.isSupportedGithub()) { throw new AuthException(ResponseStatus.UNSUPPORTED); } @@ -37,7 +41,7 @@ public class AuthGithubRequest implements AuthRequest { } @Override - public String authorize(AuthConfig config) { + public String authorize() { if (!AuthConfigChecker.isSupportedGithub()) { throw new AuthException(ResponseStatus.UNSUPPORTED); } @@ -45,7 +49,7 @@ public class AuthGithubRequest implements AuthRequest { } @Override - public AuthResponse login(AuthConfig config, String code) { + public AuthResponse login(String code) { if (!AuthConfigChecker.isSupportedGithub()) { return AuthResponse.builder() .code(ResponseStatus.UNSUPPORTED.getCode()) diff --git a/src/main/java/me/zhyd/oauth/request/AuthRequest.java b/src/main/java/me/zhyd/oauth/request/AuthRequest.java index eb9d3d0..76d10fa 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthRequest.java @@ -1,6 +1,5 @@ package me.zhyd.oauth.request; -import me.zhyd.oauth.config.AuthConfig; import me.zhyd.oauth.exception.AuthException; import me.zhyd.oauth.model.AuthResponse; @@ -18,30 +17,26 @@ public interface AuthRequest { /** * 自动跳转到认证页面 * - * @param config 授权的配置，对应不同平台 * @param response response */ - default void authorize(AuthConfig config, HttpServletResponse response) { + default void authorize(HttpServletResponse response) { throw new AuthException(ResponseStatus.NOT_IMPLEMENTED); } /** * 返回认证url，可自行跳转页面 - * - * @param config 授权的配置，对应不同平台 */ - default String authorize(AuthConfig config) { + default String authorize() { throw new AuthException(ResponseStatus.NOT_IMPLEMENTED); } /** * 第三方登录 * - * @param config 授权的配置，对应不同平台 - * @param code 通过authorize换回的code + * @param code 通过authorize换回的code * @return 返回登陆成功后的用户信息 */ - default AuthResponse login(AuthConfig config, String code) { + default AuthResponse login(String code) { throw new AuthException(ResponseStatus.NOT_IMPLEMENTED); } } diff --git a/src/main/java/me/zhyd/oauth/request/AuthWeiboRequest.java b/src/main/java/me/zhyd/oauth/request/AuthWeiboRequest.java index cc2a8c1..9dd0edf 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthWeiboRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthWeiboRequest.java @@ -24,10 +24,14 @@ import java.io.IOException; * @date 2019/1/31 16:31 * @since 1.8 */ -public class AuthWeiboRequest implements AuthRequest { +public class AuthWeiboRequest extends BaseAuthRequest implements AuthRequest { + + public AuthWeiboRequest(AuthConfig config) { + super(config); + } @Override - public void authorize(AuthConfig config, HttpServletResponse response) { + public void authorize(HttpServletResponse response) { if (!AuthConfigChecker.isSupportedWeibo()) { throw new AuthException(ResponseStatus.UNSUPPORTED); } @@ -40,7 +44,7 @@ public class AuthWeiboRequest implements AuthRequest { } @Override - public String authorize(AuthConfig config) { + public String authorize() { if (!AuthConfigChecker.isSupportedWeibo()) { throw new AuthException(ResponseStatus.UNSUPPORTED); } @@ -48,7 +52,7 @@ public class AuthWeiboRequest implements AuthRequest { } @Override - public AuthResponse login(AuthConfig config, String code) { + public AuthResponse login(String code) { if (!AuthConfigChecker.isSupportedWeibo()) { return AuthResponse.builder() .code(ResponseStatus.UNSUPPORTED.getCode()) diff --git a/src/main/java/me/zhyd/oauth/request/BaseAuthRequest.java b/src/main/java/me/zhyd/oauth/request/BaseAuthRequest.java new file mode 100644 index 0000000..03b7b95 --- /dev/null +++ b/src/main/java/me/zhyd/oauth/request/BaseAuthRequest.java @@ -0,0 +1,20 @@ +package me.zhyd.oauth.request; + +import lombok.Data; +import me.zhyd.oauth.config.AuthConfig; + +/** + * @author yadong.zhang (yadong.zhang0415(a)gmail.com) + * @version 1.0 + * @website https://www.zhyd.me + * @date 2019/2/18 13:11 + * @since 1.8 + */ +@Data +public abstract class BaseAuthRequest { + protected AuthConfig config; + + public BaseAuthRequest(AuthConfig config) { + this.config = config; + } +} diff --git a/src/test/java/me/zhyd/oauth/AuthRequestTest.java b/src/test/java/me/zhyd/oauth/AuthRequestTest.java new file mode 100644 index 0000000..f01b82a --- /dev/null +++ b/src/test/java/me/zhyd/oauth/AuthRequestTest.java @@ -0,0 +1,59 @@ +package me.zhyd.oauth; + +import me.zhyd.oauth.config.AuthConfig; +import me.zhyd.oauth.request.AuthGiteeRequest; +import me.zhyd.oauth.request.AuthGithubRequest; +import me.zhyd.oauth.request.AuthRequest; +import me.zhyd.oauth.request.AuthWeiboRequest; +import org.junit.Test; + +import javax.servlet.http.HttpServletResponse; + +/** + * @author yadong.zhang (yadong.zhang0415(a)gmail.com) + * @version 1.0 + * @website https://www.zhyd.me + * @date 2019/2/18 13:10 + * @since 1.8 + */ +public class AuthRequestTest { + + @Test + public void giteeTest(HttpServletResponse response) { + AuthRequest authRequest = new AuthGiteeRequest(AuthConfig.builder() + .clientId("clientId") + .clientSecret("clientSecret") + .redirectUri("redirectUri") + .build()); + // 自动跳转到授权页面 + authRequest.authorize(response); + // 返回授权页面，可自行调整 + authRequest.authorize(); + } + + @Test + public void githubTest(HttpServletResponse response) { + AuthRequest authRequest = new AuthGithubRequest(AuthConfig.builder() + .clientId("clientId") + .clientSecret("clientSecret") + .redirectUri("redirectUri") + .build()); + // 自动跳转到授权页面 + authRequest.authorize(response); + // 返回授权页面，可自行调整 + authRequest.authorize(); + } + + @Test + public void weiboTest(HttpServletResponse response) { + AuthRequest authRequest = new AuthWeiboRequest(AuthConfig.builder() + .clientId("clientId") + .clientSecret("clientSecret") + .redirectUri("redirectUri") + .build()); + // 自动跳转到授权页面 + authRequest.authorize(response); + // 返回授权页面，可自行调整 + authRequest.authorize(); + } +} From ebccbb2d2f568601ca9ed669048b2a52b1d58919 Mon Sep 17 00:00:00 2001 From: "yadong.zhang" Date: Mon, 18 Feb 2019 13:42:00 +0800 Subject: [PATCH 10/10] =?UTF-8?q?:alien:=20=E6=9B=B4=E6=96=B0=E6=96=87?= =?UTF-8?q?=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 ++ src/test/java/me/zhyd/oauth/AuthRequestTest.java | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/README.md b/README.md index 876f33b..bd07cbf 100644 --- a/README.md +++ b/README.md @@ -68,6 +68,8 @@ AuthRequest authRequest = new AuthGiteeRequest(AuthConfig.builder() authRequest.authorize(response); // 返回授权页面，可自行调整 authRequest.authorize(); +// 授权登陆后会返回一个code，用这个code进行登录 +authRequest.login("code"); ``` #### API列表 diff --git a/src/test/java/me/zhyd/oauth/AuthRequestTest.java b/src/test/java/me/zhyd/oauth/AuthRequestTest.java index f01b82a..76c4522 100644 --- a/src/test/java/me/zhyd/oauth/AuthRequestTest.java +++ b/src/test/java/me/zhyd/oauth/AuthRequestTest.java @@ -29,6 +29,8 @@ public class AuthRequestTest { authRequest.authorize(response); // 返回授权页面，可自行调整 authRequest.authorize(); + // 授权登陆后会返回一个code，用这个code进行登录 + authRequest.login("code"); } @Test @@ -42,6 +44,8 @@ public class AuthRequestTest { authRequest.authorize(response); // 返回授权页面，可自行调整 authRequest.authorize(); + // 授权登陆后会返回一个code，用这个code进行登录 + authRequest.login("code"); } @Test @@ -55,5 +59,7 @@ public class AuthRequestTest { authRequest.authorize(response); // 返回授权页面，可自行调整 authRequest.authorize(); + // 授权登陆后会返回一个code，用这个code进行登录 + authRequest.login("code"); } }