Merge remote-tracking branch 'origin/master'

# Conflicts:
#	.gitignore
#	README.md
#	pom.xml
#	src/main/java/io/qyi/e5/config/rabbitMQ/RabbitMQConfig.java
#	src/main/java/io/qyi/e5/config/security/UrlInvocationSecurityMetadataSourceService.java
#	src/main/java/io/qyi/e5/config/security/filter/GithubLoginAuthenticationFilter.java
#	src/main/java/io/qyi/e5/config/security/filter/LinkTokenAuthenticationFilter.java
#	src/main/java/io/qyi/e5/controller/admin/AdminController.java
#	src/main/java/io/qyi/e5/controller/web/WebController.java
#	src/main/java/io/qyi/e5/github/service/impl/GithubServiceImpl.java
#	src/main/java/io/qyi/e5/outlook/service/IOutlookService.java
#	src/main/java/io/qyi/e5/outlook/service/impl/OutlookServiceImpl.java
#	src/main/java/io/qyi/e5/outlook_log/controller/OutlookLogController.java
#	src/main/java/io/qyi/e5/service/rabbitMQ/impl/ListenerImpl.java
#	src/main/java/io/qyi/e5/service/task/impl/TaskImpl.java
#	src/main/java/io/qyi/e5/util/StringUtil.java
#	src/main/java/io/qyi/e5/util/netRequest/OkHttpClientUtil.java
#	src/main/java/io/qyi/e5/util/redis/RedisUtil.java
#	src/main/resources/application.properties

.gitignore

@@ -1,3 +1,5 @@
 # Created by .ignore support plugin (hsz.mobi)
 /.idea/
 /target/
+/src/main/resources/application-online.properties.bak
+/src/main/resources/application.properties

LICENSE

@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ 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.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 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 <https://www.gnu.org/licenses/>.
+
+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:
+
+    <program>  Copyright (C) <year>  <name of author>
+    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
+<https://www.gnu.org/licenses/>.
+
+  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
+<https://www.gnu.org/licenses/why-not-lgpl.html>.

README.md

@@ -1,18 +1,54 @@
-# e5
+# E5续订程序
-e5续订
+此项目为该网址的源代码(后端) https://e5.qyi.io/user/login 
-用到技术或框架
+(前端) https://github.com/luoye663/E5_vue
-<br>
+## 说明
-spring boot
+此项目为我的新手练手作，代码辣鸡，目前已经从3月份运行到至今。  
-<br>
+如果要自己搭建的话得自己研究下了，不提供技术支持(懒)，记得修改配置文件 
-rabbitMq
+src/main/resources/application.properties 
-<br>
+```
-Redis
+user.admin.githubId  - 自己的github id  
-<br>
+数据库配置  
-Mysql
+redis配置  
-<br>
+Rabbit配置  
-Mybatis Plus
+github.client_id  
-<br>
+github.client_secret  
-Security
+(这两个在https://github.com/settings/developers 申请一个apps就行了。)
-<br>
+```
-log4j2
+## 注意事项
+由于懒癌发作，在程序启动或者重启，是不会主动把数据库里面的用户加入队列，所以得手动处理。
+1. 在每次启动程序前，先清空延迟队列  
+rabbitmq-plugins disable rabbitmq_delayed_message_exchange
+rabbitmq-plugins enable rabbitmq_delayed_message_exchange  
+由于这个插件只能先禁用在启用，才能进行清空。
+2. 在每次启动程序前，清空未完成的队列。
+在rabbitmq web管理界面 - Queues - delay_queue1 - Purge - Purge Messages
+3. 启动后清空redis
+4. 登录后使用http访问工具访问  https://domain.com/admin/sendAll 这个链接，设置一个token头，为网站登录后的token，f12 看请求(需要设置的管理员github id访问才有能访问)。
+##### 如果不按照以上的来，会出现莫名其妙的问题哦，所以不建议自行搭建~
 
+## 用到技术或框架
+### spring boot  
+
+### rabbitMq  
+需要安装rabbitmq_delayed_message_exchange插件  
+同时新建一个用户来对接此程序，由于
+### Redis
+默认用1库，可自行在配置文件修改  
+
+### Mysql
+自行导入sql  
+没有写清空日志功能，后面加上。  
+按道理说日志因该存到MongoDB里，所以？
+### Mybatis Plus
+
+### Spring Security
+权限配置由于就那么几个，所以就没写到mysql里面。
+### log4j2
+日志框架
+
+## 鸣谢
+
+> [IntelliJ IDEA](https://zh.wikipedia.org/zh-hans/IntelliJ_IDEA) 是一个在各个方面都最大程度地提高开发人员的生产力的 IDE，适用于 JVM 平台语言。
+
+特别感谢 [JetBrains](https://www.jetbrains.com/?from=) 为开源项目提供免费的 [IntelliJ IDEA](https://www.jetbrains.com/idea/?from=) 等 IDE 的授权  
+[<img src=".github/jetbrains-variant-3.png" width="200"/>](https://www.jetbrains.com/)

pom.xml

@@ -95,7 +95,7 @@
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
-            <version>5.1.21</version>
+            <version>8.0.16</version>
         </dependency>
         <dependency>
             <groupId>com.baomidou</groupId>

src/main/java/io/qyi/e5/config/Start.java

@@ -0,0 +1,33 @@
+package io.qyi.e5.config;
+
+import io.qyi.e5.service.task.ITask;
+import io.qyi.e5.util.redis.RedisUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.PostConstruct;
+
+/**
+ * @program: e5
+ * @description:
+ * @author: 落叶随风
+ * @create: 2020-10-12 16:58
+ **/
+@Component
+@Slf4j
+public class Start {
+    @Autowired
+    RedisUtil redisUtil;
+    @Autowired
+    ITask Task;
+
+    @PostConstruct
+    public void initRedis() {
+        log.info("清空redis...... ");
+        redisUtil.delAll();
+       /* log.info("重新添加队列...... ");
+        Task.sendTaskOutlookMQALL();*/
+
+    }
+}

src/main/java/io/qyi/e5/config/rabbitMQ/RabbitMQConfig.java

@@ -75,7 +75,6 @@ public class RabbitMQConfig {
         factory.setConcurrentConsumers(1);
         factory.setMaxConcurrentConsumers(50);
         factory.setPrefetchCount(20);
-
         factory.setConnectionFactory(connectionFactory);
         factory.setMessageConverter(new Jackson2JsonMessageConverter());
         return factory;

src/main/java/io/qyi/e5/config/security/UrlInvocationSecurityMetadataSourceService.java

@@ -1,5 +1,7 @@
 package io.qyi.e5.config.security;
 
+import io.qyi.e5.config.security.bean.CollectionBean;
+import io.qyi.e5.config.security.bean.dto.PermissionListDto;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.security.access.ConfigAttribute;
@@ -22,40 +24,42 @@ import java.util.*;
 @Service
 public class UrlInvocationSecurityMetadataSourceService implements FilterInvocationSecurityMetadataSource {
 
-    @Value("web.security.admin")
+    @Value("${web.security.admin}")
     private String[] securityAdmin;
-    @Value("web.security.user")
+    @Value("${web.security.user}")
     private String[] securityUser;
-    @Value("web.security.role_anonymous")
+    @Value("${web.security.role_anonymous}")
     private String[] securitAnonymous;
 
-    private HashMap<String, Collection<ConfigAttribute>> map =null;
+    private List<CollectionBean> map = null;
     /**
      * 加载权限表中所有权限
      * 这里有一个坑，如果map返回是null，是不会AccessDecisionManager，默认放行。
      */
     public void loadResourceDefine(){
         log.info("加载权限表中所有权限");
-        map = new HashMap<>();
+        map = new ArrayList<>();
         Collection<ConfigAttribute> array;
         ConfigAttribute cfg;
         Map<String, String []> permissions = new HashMap<>();
         /*这里只是简单的配置*/
-        permissions.put("admin", securityAdmin);
+        List<PermissionListDto> permissionList = new ArrayList<>();
-        permissions.put("user",  securityUser);
+        Arrays.stream(securityAdmin).forEach(s -> permissionList.add(new PermissionListDto("admin",s)));
-        permissions.put("ROLE_ANONYMOUS", securitAnonymous);
+        Arrays.stream(securityUser).forEach(s -> permissionList.add(new PermissionListDto("user",s)));
+        Arrays.stream(securitAnonymous).forEach(s -> permissionList.add(new PermissionListDto("ROLE_ANONYMOUS",s)));
+
+        Iterator<PermissionListDto> iterator1 = permissionList.iterator();
+        while (iterator1.hasNext()) {
+            PermissionListDto next = iterator1.next();
+            String role_name = next.getRoleName();
+            String url = next.getUrl();
 
-        Iterator<Map.Entry<String, String[]>> iterator = permissions.entrySet().iterator();
-        while (iterator.hasNext()) {
-            Map.Entry<String, String[]> next = iterator.next();
-            String key = next.getKey();
-            String[] value = next.getValue();
             array = new ArrayList<>();
-            for (int i = 0; i < value.length; i++) {
+            cfg = new SecurityConfig(role_name);
-                cfg = new SecurityConfig(value[i]);
             array.add(cfg);
-            }
+            /* url -> N x roleName*/
-            map.put(key, array);
+            CollectionBean collectionBean = new CollectionBean(url,array);
+            map.add(collectionBean);
         }
 
     }
@@ -67,14 +71,28 @@ public class UrlInvocationSecurityMetadataSourceService implements FilterInvocat
         HttpServletRequest request = ((FilterInvocation) o).getHttpRequest();
         AntPathRequestMatcher matcher;
         String resUrl;
-        for(Iterator<String> iter = map.keySet().iterator(); iter.hasNext(); ) {
+        Collection<ConfigAttribute> collection = new LinkedList<>();
-            resUrl = iter.next();
+        Iterator<CollectionBean> iterator1 = map.iterator();
+        while (iterator1.hasNext()) {
+            CollectionBean next = iterator1.next();
+            resUrl = next.getUrl();
             matcher = new AntPathRequestMatcher(resUrl);
             if (matcher.matches(request)) {
-                return map.get(resUrl);
+                Iterator<ConfigAttribute> iterator = next.getConfigAttributes().iterator();
+                while (iterator.hasNext()) {
+                    collection.add(iterator.next());
+                }
+//                collection.add(map.get(resUrl))
+//                return map.get(resUrl);
             }
         }
-        return null;
+        if (collection.size() > 0) {
+            return collection;
+        }
+        /*防止数据库中没有数据，不能进行权限拦截*/
+        ConfigAttribute configAttribute = new SecurityConfig("ROLE_NO_USER");
+        collection.add(configAttribute);
+        return collection;
     }
 
 

src/main/java/io/qyi/e5/config/security/bean/CollectionBean.java

@@ -0,0 +1,23 @@
+package io.qyi.e5.config.security.bean;
+
+import lombok.Data;
+import org.springframework.security.access.ConfigAttribute;
+
+import java.util.Collection;
+
+/**
+ * @program: wds
+ * @description:
+ * @author: 落叶随风
+ * @create: 2020-07-09 00:59
+ **/
+@Data
+public class CollectionBean {
+    private String url;
+    private Collection<ConfigAttribute> configAttributes;
+
+    public CollectionBean(String url, Collection<ConfigAttribute> configAttributes) {
+        this.url = url;
+        this.configAttributes = configAttributes;
+    }
+}

src/main/java/io/qyi/e5/config/security/bean/dto/PermissionDto.java

@@ -0,0 +1,15 @@
+package io.qyi.e5.config.security.bean.dto;
+
+import lombok.Data;
+
+/**
+ * @program: wds
+ * @description:
+ * @author: 落叶随风
+ * @create: 2020-07-10 16:55
+ **/
+@Data
+public class PermissionDto {
+    private int roleId;
+    private String roleName;
+}

src/main/java/io/qyi/e5/config/security/bean/dto/PermissionListDto.java

@@ -0,0 +1,23 @@
+package io.qyi.e5.config.security.bean.dto;
+
+import lombok.Data;
+
+/**
+ * @program: demo
+ * @description:
+ * @author: 落叶随风
+ * @create: 2020-07-08 15:59
+ **/
+@Data
+public class PermissionListDto {
+    String roleName;
+    String url;
+
+    public PermissionListDto(String roleName, String url) {
+        this.roleName = roleName;
+        this.url = url;
+    }
+
+    public PermissionListDto() {
+    }
+}

src/main/java/io/qyi/e5/config/security/bean/dto/RoleMenuDto.java

@@ -0,0 +1,25 @@
+package io.qyi.e5.config.security.bean.dto;
+
+import lombok.Data;
+
+import java.util.LinkedList;
+import java.util.List;
+
+/**
+ * @program: wds
+ * @description:
+ * @author: 落叶随风
+ * @create: 2020-07-09 17:09
+ **/
+@Data
+public class RoleMenuDto {
+    private int id;
+    /*菜单名*/
+    private String name;
+    /*url*/
+    private String url;
+    /*父id*/
+    private int pid;
+
+    private List<Object> data = new LinkedList<>();
+}

src/main/java/io/qyi/e5/config/security/filter/GithubLoginAuthenticationFilter.java

@@ -69,7 +69,6 @@ public class GithubLoginAuthenticationFilter extends AbstractAuthenticationProce
             UsernamePasswordAuthenticationToken authRequest = new UsernamePasswordAuthenticationToken(code, state);
 //            设置身份认证的详情信息
             this.setDetails(httpServletRequest, authRequest);
-
 //            通过AuthenticationManager调用相应的AuthenticationProvider进行用户认证
             return this.getAuthenticationManager().authenticate(authRequest);
     }

src/main/java/io/qyi/e5/config/security/filter/LinkTokenAuthenticationFilter.java

@@ -48,7 +48,7 @@ public class LinkTokenAuthenticationFilter extends OncePerRequestFilter {
             }
         }
         log.info("--------------Token鉴权---------------");
-        /*设置跨域*/
+        /*设置跨域 最好在nginx处设置*/
         HttpServletResponse response = httpServletResponse;
         response.setHeader("Access-Control-Allow-Origin", "*");
         response.setHeader("Access-Control-Allow-Credentials", "true");
@@ -57,7 +57,6 @@ public class LinkTokenAuthenticationFilter extends OncePerRequestFilter {
         response.setHeader("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept, token");
         /*如果是OPTIONS则结束请求*/
         if (HttpMethod.OPTIONS.toString().equals(httpServletRequest.getMethod())) {
-            log.debug("OPTIONS请求");
             response.setStatus(HttpStatus.NO_CONTENT.value());
         } else {
             filterChain.doFilter(httpServletRequest, response);

src/main/java/io/qyi/e5/controller/admin/AdminController.java

@@ -1,27 +1,27 @@
 package io.qyi.e5.controller.admin;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import io.qyi.e5.config.security.UsernamePasswordAuthenticationToken;
-import com.google.gson.Gson;
-import io.qyi.e5.outlook.entity.Outlook;
 import io.qyi.e5.outlook.service.IOutlookService;
 import io.qyi.e5.service.task.ITask;
+import io.qyi.e5.util.EncryptUtil;
+import io.qyi.e5.util.StringUtil;
 import io.qyi.e5.util.redis.RedisUtil;
-import org.springframework.amqp.core.MessageProperties;
-import org.springframework.amqp.rabbit.connection.CorrelationData;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.annotation.Secured;
+import org.springframework.beans.factory.annotation.Value;
-import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.security.core.authority.AuthorityUtils;
-import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
+import org.springframework.util.ResourceUtils;
-import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.UUID;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.util.*;
 
 /**
- * @program: e5
+ * @program: 此类里大多都是测试
  * @description:
  * @author: 落叶随风
  * @create: 2020-03-16 01:01
@@ -41,17 +41,47 @@ public class AdminController {
     @Autowired
     RedisUtil redisUtil;
 
+    @Value("user.admin.githubId")
+    String adminGithubId;
+
+    @Value("${user.admin.debug.passwd}")
+    String userAdminDebugPasswd;
+
+    @Value("${redis.user.token}")
+    String token_;
+
+    @Value("${user.token.expire}")
+    private int tokenExpire;
+
+    /**
+     * 测试队列
+     * @Author: 落叶随风
+     * @Date: 2020/9/7  14:44
+     * @Return: * @return: void
+     */
     @GetMapping("/send")
     public void send() {
-        Task.sendTaskOutlookMQ(19658189);
+        Task.sendTaskOutlookMQ(Integer.valueOf(adminGithubId) );
     }
 
+    /**
+     * 对所有队列重新添加
+     * @Author: 落叶随风
+     * @Date: 2020/9/7  14:43
+     * @Return: * @return: java.lang.String
+     */
     @GetMapping("/sendAll")
     public String sendAll() {
         Task.sendTaskOutlookMQALL();
         return "ok";
     }
 
+    /**
+     * 清空redis
+     * @Author: 落叶随风
+     * @Date: 2020/9/7  14:41
+     * @Return: * @return: java.lang.String
+     */
     @GetMapping("/emptyRedis")
     public String emptyRedis() {
         redisUtil.deleteALL();
@@ -63,6 +93,39 @@ public class AdminController {
         return "ok";
     }
 
+    @RequestMapping("setAnnouncement")
+    public String setAnnouncement(String text) throws IOException {
+        File file = ResourceUtils.getFile("classpath:announcement.txt");
+        FileWriter writer = new FileWriter(file);
+        writer.write(text);
+        writer.close();
+        return "ok";
+    }
 
+    @RequestMapping("getDebugAdminToken")
+    public String getDebugAdminToken(String passwd) {
+        if (userAdminDebugPasswd.equals(passwd)) {
+            String token = EncryptUtil.getInstance().SHA1Hex(UUID.randomUUID().toString());
+            /*配置角色,这里只是简单的配置，实际上需要从数据库中读取角色*/
+            List<String> list_Authority = new ArrayList<>();
+            list_Authority.add("user");
+            list_Authority.add("admin");
+            String[] Authority = list_Authority.toArray(new String[list_Authority.size()]);
+            /*写token信息到redis*/
+            Map<String, Object> userInfo_redis = new HashMap<>();
+            userInfo_redis.put("github_name", "admin");
+            userInfo_redis.put("github_id", 0000);
+            userInfo_redis.put("avatar_url", "https://www.baidu.com");
+            userInfo_redis.put("authority", list_Authority);
+            redisUtil.hmset(token_ + token, userInfo_redis, tokenExpire);
+
+
+//       创建一个已认证的token
+//            UsernamePasswordAuthenticationToken authenticationToken1 = new UsernamePasswordAuthenticationToken(userInfo_redis.get("github_name").toString(),
+//                    userInfo_redis.get("github_name").toString(), (int)userInfo_redis.get("github_name"), token, "user", AuthorityUtils.createAuthorityList(Authority));
+            return token;
+        }
+        return "la la la";
+    }
 
 }

src/main/java/io/qyi/e5/controller/web/WebController.java

@@ -6,13 +6,17 @@ import io.qyi.e5.github.service.IGithubService;
 import io.qyi.e5.outlook.service.IOutlookService;
 import io.qyi.e5.outlook_log.service.IOutlookLogService;
 import io.qyi.e5.util.ResultUtil;
+import io.qyi.e5.util.StringUtil;
 import io.qyi.e5.util.redis.RedisUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.util.ResourceUtils;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.io.FileNotFoundException;
+import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -72,4 +76,10 @@ public class WebController {
 
     }
 
+    @RequestMapping("getAnnouncement")
+    public String getAnnouncement() throws IOException {
+        String s = StringUtil.readTxt(ResourceUtils.getFile("classpath:announcement.txt"));
+        return s;
+    }
+
 }

src/main/java/io/qyi/e5/github/service/impl/GithubServiceImpl.java

@@ -3,15 +3,14 @@ package io.qyi.e5.github.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import io.qyi.e5.github.entity.Github;
 import io.qyi.e5.github.entity.UserInfo;
 import io.qyi.e5.github.mapper.GithubMapper;
 import io.qyi.e5.github.service.IGithubService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import io.qyi.e5.util.StringUtil;
-import io.qyi.e5.util.netRequest.OkHttpRequestUtils;
+import io.qyi.e5.util.netRequest.OkHttpClientUtil;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
@@ -43,7 +42,7 @@ public class GithubServiceImpl extends ServiceImpl<GithubMapper, Github> impleme
         head.put("Content-Type", "application/x-www-form-urlencoded");
         String s = null;
         try {
-            s = OkHttpRequestUtils.doPost("https://github.com/login/oauth/access_token", head, par);
+            s = OkHttpClientUtil.doPost("https://github.com/login/oauth/access_token", head, par);
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -54,10 +53,10 @@ public class GithubServiceImpl extends ServiceImpl<GithubMapper, Github> impleme
 
     @Override
     public String getUserEmail(String access_token) throws Exception {
-        Map<String, Object> head = new HashMap<>();
+        Map<String, String> head = new HashMap<>();
         head.put("Authorization", "token " + access_token);
         head.put("Content-Type", "application/vnd.github.machine-man-preview+json");
-        String s = OkHttpRequestUtils.doGet("https://api.github.com/user/emails", head, null);
+        String s = OkHttpClientUtil.doGet("https://api.github.com/user/emails", null,head, null);
         System.out.println(s);
         JSONArray jsonArray = JSON.parseArray(s);
         if (!jsonArray.isEmpty()) {
@@ -74,11 +73,11 @@ public class GithubServiceImpl extends ServiceImpl<GithubMapper, Github> impleme
 
     @Override
     public UserInfo getUserInfo(String access_token)  {
-        Map<String, Object> head = new HashMap<>();
+        Map<String, String> head = new HashMap<>();
         head.put("Authorization", "token " + access_token);
         head.put("Content-Type", "application/vnd.github.machine-man-preview+json");
         try {
-            String s = OkHttpRequestUtils.doGet("https://api.github.com/user", head, null);
+            String s = OkHttpClientUtil.doGet("https://api.github.com/user",null, head, null);
             JSONObject jsonObject = JSON.parseObject(s);
             UserInfo userInfo = new UserInfo();
             if (!jsonObject.isEmpty()) {

src/main/java/io/qyi/e5/outlook/service/IOutlookService.java

@@ -21,7 +21,7 @@ public interface IOutlookService extends IService<Outlook> {
 
     boolean saveRandomTime(int github_id,int cron_time,int cron_time_random_start,int cron_time_random_end);
 
-    boolean getMailList(Outlook outlook);
+    int getMailList(Outlook outlook) throws Exception;
 
     List<Outlook> findAll();
 

src/main/java/io/qyi/e5/outlook/service/impl/OutlookServiceImpl.java

@@ -11,12 +11,10 @@ import com.google.gson.JsonObject;
 import io.qyi.e5.outlook.entity.Outlook;
 import io.qyi.e5.outlook.mapper.OutlookMapper;
 import io.qyi.e5.outlook.service.IOutlookService;
-import io.qyi.e5.outlook_log.service.IOutlookLogService;
 import io.qyi.e5.util.netRequest.OkHttpClientUtil;
 import io.qyi.e5.util.netRequest.OkHttpRequestUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
@@ -37,8 +35,6 @@ import java.util.Map;
 public class OutlookServiceImpl extends ServiceImpl<OutlookMapper, Outlook> implements IOutlookService {
     private final Logger logger = LoggerFactory.getLogger(this.getClass());
 
-    @Autowired
-    IOutlookLogService outlookLogService;
 
     @Value("${outlook.errorMsg}")
     private String[] errorMsg;
@@ -134,6 +130,7 @@ public class OutlookServiceImpl extends ServiceImpl<OutlookMapper, Outlook> impl
 
     /**
      * 删除用户outlook
+     *
      * @Description:
      * @param: * @param github_id
      * @return: int
@@ -148,42 +145,35 @@ public class OutlookServiceImpl extends ServiceImpl<OutlookMapper, Outlook> impl
     }
 
     @Override
-    public boolean getMailList(Outlook outlook) {
+    public int getMailList(Outlook outlook) throws Exception {
-        try {
         String s = MailList(outlook.getAccessToken());
         JSONObject json = JSON.parseObject(s);
         /*错误情况，一般是令牌过期*/
         if (json.containsKey("error")) {
             String code = json.getJSONObject("error").getString("code");
             String message = json.getJSONObject("error").getString("message");
-                /*如果出现得错误是没有message中收集的，那么就认为是无法刷新的情况。比如 用户取消了授权、删除了key*/
+            /*如果出现的错误是没有message中收集的，那么就认为是无法刷新的情况。比如 用户取消了授权、删除了key*/
             if (!errorCheck(message)) {
-                    outlookLogService.addLog(outlook.getGithubId(), "无法刷新令牌!code:3", 0, message);
+                throw new Exception("无法刷新令牌!code:3"  + message);
-                    return false;
             }
             logger.info("令牌过期!");
             /*刷新令牌*/
             String token = refresh_token(outlook);
             if (token == null) {
-                    return false;
+                throw new Exception("刷新令牌失败! refresh_token 为空!");
             }
             /*再次获取邮件列表*/
             s = MailList(token);
             json = JSON.parseObject(s);
             if (json.containsKey("error")) {
-                    outlookLogService.addLog(outlook.getGithubId(), "无法刷新令牌!code:2", 1, json.getJSONObject("error").getString("message"));
+                throw new Exception("无法刷新令牌!code:2,错误消息: "+ json.getJSONObject("error").getString("message"));
-                    return false;
             }
         }
         logger.info("邮件列表请求成功!" + s);
         int mail_count = getMailBody(5, s, outlook.getAccessToken());
         logger.info("读取邮件数量: {}", mail_count);
-            outlookLogService.addLog(outlook.getGithubId(), "ok", 1, "读取邮件数量:" + mail_count);
+
-            return true;
+        return mail_count;
-        } catch (Exception e) {
-            e.printStackTrace();
-            return false;
-        }
     }
 
     /**
@@ -213,27 +203,27 @@ public class OutlookServiceImpl extends ServiceImpl<OutlookMapper, Outlook> impl
             JsonObject mail = value.get(i).getAsJsonObject();
             String id = mail.get("id").getAsString();
 
-            Map<String, Object> head = new HashMap<>();
+            Map<String, String> head = new HashMap<>();
             head.put("Content-Type", "application/json");
             head.put("Authorization", access_token);
             /*不用管邮件内容*/
-            OkHttpRequestUtils.doGet("https://graph.microsoft.com/v1.0/me/messages/" + id, head, null);
+            OkHttpClientUtil.doGet("https://graph.microsoft.com/v1.0/me/messages/" + id, null,head, null);
         }
         return count;
     }
 
     public String MailList(String access_token) throws Exception {
-        Map<String, Object> head = new HashMap<>();
+        Map<String, String> head = new HashMap<>();
         head.put("Content-Type", "application/json");
         head.put("Authorization", access_token);
-        String s = OkHttpRequestUtils.doGet("https://graph.microsoft.com/v1.0/me/messages?$select=sender,subject", head, null);
+        String s = OkHttpClientUtil.doGet("https://graph.microsoft.com/v1.0/me/messages?$select=sender,subject",null, head, null);
         logger.debug("请求邮件列表返回数据：" + s);
         return s;
     }
 
 
     // 刷新令牌，同时更新数据库中的令牌
-    public String refresh_token(Outlook outlook) {
+    public String refresh_token(Outlook outlook) throws Exception {
         Map<String, Object> head = new HashMap<>();
         head.put("Content-Type", "application/x-www-form-urlencoded");
         Map<String, Object> par = new HashMap<>();
@@ -243,15 +233,12 @@ public class OutlookServiceImpl extends ServiceImpl<OutlookMapper, Outlook> impl
         par.put("grant_type", "refresh_token");
         par.put("refresh_token", outlook.getRefreshToken());
         String s = null;
-        try {
         s = OkHttpClientUtil.doPost("https://login.microsoftonline.com/common/oauth2/v2.0/token", head, par);
         logger.info("请求刷新列表返回数据：" + s);
         JSONObject jsonObject = JSON.parseObject(s);
         if (!jsonObject.containsKey("access_token")) {
             logger.info("返回的access_token字段不存在");
-                outlookLogService.addLog(outlook.getGithubId(), "无法刷新令牌! 需要重新授权!", 0, s);
+            throw new Exception("返回的access_token字段不存在,无法刷新令牌! 需要重新授权!" );
-//              字段不存在
-                return null;
         }
         outlook.setRefreshToken(jsonObject.getString("refresh_token"));
         outlook.setAccessToken(jsonObject.getString("access_token"));
@@ -260,16 +247,10 @@ public class OutlookServiceImpl extends ServiceImpl<OutlookMapper, Outlook> impl
         queryWrapper.eq("client_id", outlook.getClientId());
         if (baseMapper.update(outlook, queryWrapper) != 1) {
             logger.info("返更新行数不为1");
-                outlookLogService.addLog(outlook.getGithubId(), "更新数据库时发现有重复的key", 0, "");
+            throw new Exception("更新数据库时发现有重复的key");
-                return null;
         }
         return outlook.getAccessToken();
 //            更新数据库
-        } catch (Exception e) {
-            e.printStackTrace();
-            outlookLogService.addLog(outlook.getGithubId(), e.getMessage(), 0, e.getMessage());
-            return null;
-        }
     }
 
     /**

src/main/java/io/qyi/e5/outlook_log/controller/OutlookLogController.java

@@ -73,7 +73,7 @@ public class OutlookLogController {
     }
 
     @GetMapping("/exec111111")
-    public void s(){
+    public void s() throws Exception {
         List<Outlook> list = outlookService.findAll();
         logger.info(String.valueOf(list.size()));
         for (Outlook outlook :list) {

src/main/java/io/qyi/e5/service/rabbitMQ/impl/ListenerImpl.java

@@ -36,7 +36,6 @@ public class ListenerImpl {
         System.out.println("消费者1开始处理消息："+System.currentTimeMillis());
         int github_id = Integer.valueOf(new String(message.getBody()));
         boolean b = Task.executeE5(github_id);
-
         channel.basicAck(message.getMessageProperties().getDeliveryTag(), true);
         /*再次进行添加任务*/
         if (b) {

src/main/java/io/qyi/e5/service/task/impl/TaskImpl.java

@@ -12,6 +12,7 @@ import org.springframework.amqp.core.MessageProperties;
 import org.springframework.amqp.rabbit.connection.CorrelationData;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
@@ -41,6 +42,9 @@ public class TaskImpl implements ITask {
     @Autowired
     IOutlookLogService outlookLogService;
 
+    @Value("${outlook.error.countMax}")
+    int errorCountMax;
+
     @Override
     @Async
     public void sendTaskOutlookMQ(int github_id) {
@@ -82,11 +86,34 @@ public class TaskImpl implements ITask {
             logger.warn("未找到此用户,github_id: {}", github_id);
             return false;
         }
-        boolean mailList = outlookService.getMailList(Outlook);
+        boolean isExecuteE5 ;
-        if (!mailList) {
+        String errorKey = "user.mq:" + github_id + ":error";
-            outlookLogService.addLog(github_id, "error", 0, "检测到错误，下次将不再自动调用，请修正错误后再授权开启续订。" );
+        try {
+            int mail_count = outlookService.getMailList(Outlook);
+            outlookLogService.addLog(github_id, "ok", 1, "读取邮件数量:" + mail_count);
+            if (redisUtil.hasKey(errorKey)) {
+                redisUtil.del(errorKey);
             }
-        return mailList;
+            isExecuteE5 = true;
+        } catch (Exception e) {
+            e.printStackTrace();
+            /*连续错误判断*/
+            if (!redisUtil.hasKey(errorKey)) {
+                redisUtil.set(errorKey, 1);
+                isExecuteE5 = true;
+            } else {
+                int error_count = (int)redisUtil.get(errorKey);
+                if (error_count >= errorCountMax) {
+                    outlookLogService.addLog(github_id, "error", 0, e.getMessage());
+                    outlookLogService.addLog(github_id, "error", 0, "检测到3次连续错误，下次将不再自动调用，请修正错误后再授权开启续订。");
+                    isExecuteE5 = false;
+                } else {
+                    redisUtil.incr(errorKey, 1);
+                    isExecuteE5 = true;
+                }
+            }
+        }
+        return isExecuteE5;
     }
 
     /**

src/main/java/io/qyi/e5/util/StringUtil.java

@@ -1,5 +1,6 @@
 package io.qyi.e5.util;
 
+import java.io.*;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -24,4 +25,15 @@ public class StringUtil {
         }
         return map;
     }
+
+    public static String readTxt(File file) throws IOException {
+        String s = "";
+        InputStreamReader in = new InputStreamReader(new FileInputStream(file),"UTF-8");
+        BufferedReader br = new BufferedReader(in);
+        StringBuffer content = new StringBuffer();
+        while ((s=br.readLine())!=null){
+            content = content.append(s);
+        }
+        return content.toString();
+    }
 }

src/main/java/io/qyi/e5/util/netRequest/OkHttpClientUtil.java

@@ -1,33 +1,22 @@
 package io.qyi.e5.util.netRequest;
 
-import com.alibaba.fastjson.JSON;
+import okhttp3.*;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
 
-import java.text.SimpleDateFormat;
-import java.util.Date;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
-import okhttp3.FormBody;
-import okhttp3.MediaType;
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.RequestBody;
-import okhttp3.Response;
-
 public class OkHttpClientUtil {
-    private static int connTimeOut = 5;
+    private static int connTimeOut = 5 * 1000;
-    private static int readTimeOut = 20;
+    private static int readTimeOut = 20 * 1000;
-    private static int writeTimeOut = 10;
+    private static int writeTimeOut = 10 * 1000;
     public static OkHttpClient client = null;
 
     static {
         client = new OkHttpClient.Builder()
-                .connectTimeout(5L, TimeUnit.SECONDS)
+                .connectTimeout(connTimeOut, TimeUnit.SECONDS)
-                .readTimeout(20L, TimeUnit.SECONDS)
+                .readTimeout(readTimeOut, TimeUnit.SECONDS)
-                .writeTimeout(10L, TimeUnit.SECONDS)
+                .writeTimeout(writeTimeOut, TimeUnit.SECONDS)
                 .retryOnConnectionFailure(true)
                 .build();
     }

src/main/java/io/qyi/e5/util/redis/RedisUtil.java

@@ -51,11 +51,12 @@ public class RedisUtil {
 
     /**
      * 删除所有键值对
+     *
+     * @throws
      * @title deleteALl
      * @description
      * @author 落叶随风
      * @updateTime 2020/4/22 22:53
-     * @throws
      */
     public void deleteALL() {
         Set<String> keys = redisTemplate.keys("*");
@@ -581,7 +582,9 @@ public class RedisUtil {
             return 0;
         }
     }
+
     /**
+     * @throws
      * @title lRemove
      * @description
      * @author 落叶随风
@@ -590,7 +593,6 @@ public class RedisUtil {
      * @param: value
      * @updateTime 2020/2/4 14:59
      * @return: long
-     * @throws
      */
     public boolean lTrim(String key, long start, long end) {
         try {
@@ -602,4 +604,12 @@ public class RedisUtil {
         }
     }
 
+    public void reName(String old, String new_key) {
+        redisTemplate.rename(old, new_key);
+    }
+
+    public void delAll() {
+        Set<String> keys = redisTemplate.keys("*");
+        redisTemplate.delete(keys);
+    }
 }

src/main/resources/announcement.txt

@@ -0,0 +1 @@
+点击小猫咪头像进行登录。