[Version] 更新版本(2.5.2-20200618.1-SNAPSHOT -> 2.5.2-20200630.1-SNAPSHOT);

[Fix] LocalHashCacheStore 修复clean方法抛出'ConcurrentModificationException'异常的问题;
[Change] CacheStoreCentral 调整PreLoadData的热点缓存时间;
[Change] HotDataCacheStore 将最近获取的Key重置其过期时间, 调整clean过程;

Dockerfile.sample

@@ -1,10 +1,10 @@
-FROM openjdk:8u252-jre
+FROM openjdk:14
 
+COPY --from=hengyunabc/arthas:latest /opt/arthas /opt/arthas
 ENV jarFileName=ContentGrabbingJi-exec.jar
 ENV CGJ_REDIS_URI="127.0.0.1:6379"
 ENV CGJ_PROXY=""
 RUN mkdir /data/
+CMD [java, "-Dcgj.logsPath=/data/logs", "-jar", "/CGJ.jar", "botMode", "-botDataDir=/data"]
 
 COPY ${jarFileName} /CGJ.jar
-
-CMD ["java", "-Dcgj.logsPath=/data/logs", "-jar", "/CGJ.jar", "botMode", "-botDataDir=/data"]

LICENSE

@@ -1,165 +1,661 @@
-                   GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
+                    GNU AFFERO GENERAL PUBLIC LICENSE
+                       Version 3, 19 November 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
 
-  This version of the GNU Lesser General Public License incorporates
-the terms and conditions of version 3 of the GNU General Public
-License, supplemented by the additional permissions listed below.
+  The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
 
-  0. Additional Definitions.
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+our General Public Licenses are 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.
 
-  As used herein, "this License" refers to version 3 of the GNU Lesser
-General Public License, and the "GNU GPL" refers to version 3 of the GNU
-General Public License.
+  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.
 
-  "The Library" refers to a covered work governed by this License,
-other than an Application or a Combined Work as defined below.
+  Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
 
-  An "Application" is any work that makes use of an interface provided
-by the Library, but which is not otherwise based on the Library.
-Defining a subclass of a class defined by the Library is deemed a mode
-of using an interface provided by the Library.
+  A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate.  Many developers of free software are heartened and
+encouraged by the resulting cooperation.  However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
 
-  A "Combined Work" is a work produced by combining or linking an
-Application with the Library.  The particular version of the Library
-with which the Combined Work was made is also called the "Linked
-Version".
+  The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community.  It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server.  Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
 
-  The "Minimal Corresponding Source" for a Combined Work means the
-Corresponding Source for the Combined Work, excluding any source code
-for portions of the Combined Work that, considered in isolation, are
-based on the Application, and not on the Linked Version.
+  An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals.  This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
 
-  The "Corresponding Application Code" for a Combined Work means the
-object code and/or source code for the Application, including any data
-and utility programs needed for reproducing the Combined Work from the
-Application, but excluding the System Libraries of the Combined Work.
+  The precise terms and conditions for copying, distribution and
+modification follow.
 
-  1. Exception to Section 3 of the GNU GPL.
+                       TERMS AND CONDITIONS
 
-  You may convey a covered work under sections 3 and 4 of this License
-without being bound by section 3 of the GNU GPL.
+  0. Definitions.
 
-  2. Conveying Modified Versions.
+  "This License" refers to version 3 of the GNU Affero General Public License.
 
-  If you modify a copy of the Library, and, in your modifications, a
-facility refers to a function or data to be supplied by an Application
-that uses the facility (other than as an argument passed when the
-facility is invoked), then you may convey a copy of the modified
-version:
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
 
-   a) under this License, provided that you make a good faith effort to
-   ensure that, in the event an Application does not supply the
-   function or data, the facility still operates, and performs
-   whatever part of its purpose remains meaningful, or
+  "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.
 
-   b) under the GNU GPL, with none of the additional permissions of
-   this License applicable to that copy.
+  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.
 
-  3. Object Code Incorporating Material from Library Header Files.
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
 
-  The object code form of an Application may incorporate material from
-a header file that is part of the Library.  You may convey such object
-code under terms of your choice, provided that, if the incorporated
-material is not limited to numerical parameters, data structure
-layouts and accessors, or small macros, inline functions and templates
-(ten or fewer lines in length), you do both of the following:
+  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.
 
-   a) Give prominent notice with each copy of the object code that the
-   Library is used in it and that the Library and its use are
-   covered by this License.
+  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.
 
-   b) Accompany the object code with a copy of the GNU GPL and this license
-   document.
+  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.
 
-  4. Combined Works.
+  1. Source Code.
 
-  You may convey a Combined Work under terms of your choice that,
-taken together, effectively do not restrict modification of the
-portions of the Library contained in the Combined Work and reverse
-engineering for debugging such modifications, if you also do each of
-the following:
+  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) Give prominent notice with each copy of the Combined Work that
-   the Library is used in it and that the Library and its use are
-   covered by this License.
+  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.
 
-   b) Accompany the Combined Work with a copy of the GNU GPL and this license
-   document.
+  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.
 
-   c) For a Combined Work that displays copyright notices during
-   execution, include the copyright notice for the Library among
-   these notices, as well as a reference directing the user to the
-   copies of the GNU GPL and this license document.
+  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.
 
-   d) Do one of the following:
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
 
-       0) Convey the Minimal Corresponding Source under the terms of this
-       License, and the Corresponding Application Code in a form
-       suitable for, and under terms that permit, the user to
-       recombine or relink the Application with a modified version of
-       the Linked Version to produce a modified Combined Work, in the
-       manner specified by section 6 of the GNU GPL for conveying
-       Corresponding Source.
+  The Corresponding Source for a work in source code form is that
+same work.
 
-       1) Use a suitable shared library mechanism for linking with the
-       Library.  A suitable mechanism is one that (a) uses at run time
-       a copy of the Library already present on the user's computer
-       system, and (b) will operate properly with a modified version
-       of the Library that is interface-compatible with the Linked
-       Version.
+  2. Basic Permissions.
 
-   e) Provide Installation Information, but only if you would otherwise
-   be required to provide such information under section 6 of the
-   GNU GPL, and only to the extent that such information is
-   necessary to install and execute a modified version of the
-   Combined Work produced by recombining or relinking the
-   Application with a modified version of the Linked Version. (If
-   you use option 4d0, the Installation Information must accompany
-   the Minimal Corresponding Source and Corresponding Application
-   Code. If you use option 4d1, you must provide the Installation
-   Information in the manner specified by section 6 of the GNU GPL
-   for conveying Corresponding Source.)
+  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.
 
-  5. Combined Libraries.
+  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.
 
-  You may place library facilities that are a work based on the
-Library side by side in a single library together with other library
-facilities that are not Applications and are not covered by this
-License, and convey such a combined library under terms of your
-choice, if you do both of the following:
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
 
-   a) Accompany the combined library with a copy of the same work based
-   on the Library, uncombined with any other library facilities,
-   conveyed under the terms of this License.
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
 
-   b) Give prominent notice with the combined library that part of it
-   is a work based on the Library, and explaining where to find the
-   accompanying uncombined form of the same work.
+  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.
 
-  6. Revised Versions of the GNU Lesser General Public License.
+  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.
 
-  The Free Software Foundation may publish revised and/or new versions
-of the GNU Lesser 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.
+  4. Conveying Verbatim Copies.
 
-  Each version is given a distinguishing version number. If the
-Library as you received it specifies that a certain numbered version
-of the GNU Lesser General Public License "or any later version"
-applies to it, you have the option of following the terms and
-conditions either of that published version or of any later version
-published by the Free Software Foundation. If the Library as you
-received it does not specify a version number of the GNU Lesser
-General Public License, you may choose any version of the GNU Lesser
-General Public License ever published by the Free Software Foundation.
+  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.
 
-  If the Library as you received it specifies that a proxy can decide
-whether future versions of the GNU Lesser General Public License shall
-apply, that proxy's public statement of acceptance of any version is
-permanent authorization for you to choose that version for the
-Library.
+  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. Remote Network Interaction; Use with the GNU General Public License.
+
+  Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software.  This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
+
+  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 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 work with which it is combined will remain governed by version
+3 of the GNU General Public License.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU Affero 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 Affero 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 Affero 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 Affero 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 Affero 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 Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero 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 your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source.  For example, if your program is a web application, its
+interface could display a "Source" link that leads users to an archive
+of the code.  There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for the
+specific requirements.
+
+  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 AGPL, see
+<https://www.gnu.org/licenses/>.

README.md

@@ -1,4 +1,4 @@
-# ContentGrabbingJi
+# ContentGrabbingJi #
 Pixiv爬虫一只，同时也是一个机器人/插件！
 
 ## 支持的机器人平台 ##
@@ -37,3 +37,25 @@ Pixiv爬虫一只，同时也是一个机器人/插件！
 
 > 注意: 除去机器人模式外, 其他功能后续可能会出现改动.
 
+## LICENSE ##
+本项目基于 `GNU Affero General Public License 3.0` 开源许可协议开源，  
+你可以在本项目目录下的 `LICENSE` 文件查阅协议副本，  
+或浏览 [https://www.gnu.org/licenses/agpl-3.0.html](https://www.gnu.org/licenses/agpl-3.0.html) 查阅协议副本。
+```
+    ContentGrabbingJi - A pixiv robot used in chat
+    Copyright (C) 2020  LamGC (lam827@lamgc.net)
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation, either version 3 of the
+    License, or 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 Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/agpl-3.0.html>.
+```
+尤其注意：根据协议，如果你基于本项目开发本项目的衍生版本并通过网络为他人提供服务，则必须遵守该协议，向 *服务的使用者* 提供 **为其服务的衍生版本** 的 **完整源代码**。

documents/interfaces/search.txt

@@ -1,24 +0,0 @@
-搜索标签信息：https://www.pixiv.net/ajax/search/tags/标签名
-
-搜索接口：
-https://www.pixiv.net/ajax/search/{Type}/搜索内容
-Type = illustrations(插画) / top(顶部?) / manga(漫画) / novels(小说)
-
-word=搜索内容 [参数可能不是必须的]
-s_mode=s_tag(标签-部分一致) / s_tag_full(标签-完全一致) / s_tc(标题、说明文字)
-type= all(插画、漫画、动图_动态插图) / illust_and_ugoira(插画、动图) / illust(插画) / manga(漫画) / ugoira(动图)
-p=页数 [超出页数的情况下将获取不到数据(即"body.illust.data"是空数组)]
-order=date(按旧排序) / date_d(按新排序) / Unknown(按热门度排序, 需要会员)
-mode= all(全部) / safe(全年龄) / r18(咳咳)
-
-可选参数：
-wlt=最小宽度像素
-wgt=最高宽度像素
-hlt=最小高度像素
-hgt=最高高度像素
-ratio=0.5(横图) / -0.5(纵图) / 0(正方形) [可能不能改变参数, 三个值是固定的]
-tool=使用工具, 不是很重要晚些再加
-scd=开始时间(yyyy-MM-dd)
-ecd=结束时间(yyyy-MM-dd)
-
-最小收藏数 = 收藏数限定参数为会员功能, 无法获取

pom.xml

@@ -6,7 +6,15 @@
 
     <groupId>net.lamgc</groupId>
     <artifactId>ContentGrabbingJi</artifactId>
-    <version>2.5.2-20200606.1-SNAPSHOT</version>
+    <version>2.5.2-20200630.1-SNAPSHOT</version>
+
+    <licenses>
+        <license>
+            <name>GNU Affero General Public License 3.0</name>
+            <url>https://www.gnu.org/licenses/agpl-3.0.txt</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
 
     <repositories>
         <repository>
@@ -19,7 +27,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
-        <mirai.CoreVersion>1.0-RC2-1</mirai.CoreVersion>
+        <mirai.CoreVersion>1.0.2</mirai.CoreVersion>
         <mirai.JaptVersion>1.1.1</mirai.JaptVersion>
         <kotlin.version>1.3.71</kotlin.version>
         <ktor.version>1.3.2</ktor.version>
@@ -110,21 +118,6 @@
             <artifactId>gson</artifactId>
             <version>2.8.5</version>
         </dependency>
-        <dependency>
-            <groupId>net.sourceforge.htmlunit</groupId>
-            <artifactId>htmlunit</artifactId>
-            <version>2.29</version>
-        </dependency>
-        <dependency>
-            <groupId>com.github.rholder</groupId>
-            <artifactId>guava-retrying</artifactId>
-            <version>2.0.0</version>
-        </dependency>
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-            <version>8.0.19</version>
-        </dependency>
         <dependency>
             <groupId>net.lz1998</groupId>
             <artifactId>spring-cq</artifactId>
@@ -169,16 +162,22 @@
             <artifactId>ktor-server-core</artifactId>
             <version>${ktor.version}</version>
         </dependency>
-        <dependency>
-            <groupId>net.lamgc</groupId>
-            <artifactId>PixivLoginProxyServer</artifactId>
-            <version>1.1.1</version>
-        </dependency>
         <dependency>
             <groupId>com.squareup</groupId>
             <artifactId>gifencoder</artifactId>
             <version>0.10.1</version>
         </dependency>
+        <dependency>
+            <groupId>org.jline</groupId>
+            <artifactId>jline</artifactId>
+            <version>3.15.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.inject</groupId>
+            <artifactId>guice</artifactId>
+            <version>4.2.3</version>
+        </dependency>
+
     </dependencies>
 
 </project>

src/main/java/net/lamgc/cgj/Main.java

@@ -1,7 +1,5 @@
 package net.lamgc.cgj;
 
-import com.github.monkeywie.proxyee.proxy.ProxyConfig;
-import com.github.monkeywie.proxyee.proxy.ProxyType;
 import com.google.common.base.Strings;
 import com.google.gson.Gson;
 import com.google.gson.JsonArray;
@@ -13,18 +11,18 @@ import net.lamgc.cgj.bot.framework.cli.ConsoleMain;
 import net.lamgc.cgj.bot.framework.coolq.CQConfig;
 import net.lamgc.cgj.bot.framework.mirai.MiraiMain;
 import net.lamgc.cgj.pixiv.PixivDownload;
-import net.lamgc.cgj.pixiv.PixivSearchBuilder;
+import net.lamgc.cgj.pixiv.PixivSearchLinkBuilder;
 import net.lamgc.cgj.pixiv.PixivURL;
-import net.lamgc.plps.PixivLoginProxyServer;
 import net.lamgc.utils.base.runner.Argument;
 import net.lamgc.utils.base.runner.ArgumentsRunner;
 import net.lamgc.utils.base.runner.Command;
-import org.apache.commons.io.IOUtils;
+import net.lamgc.utils.encrypt.MessageDigestUtils;
 import org.apache.http.HttpHost;
 import org.apache.http.HttpResponse;
 import org.apache.http.client.CookieStore;
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.util.EntityUtils;
+import org.apache.tomcat.util.http.fileupload.util.Streams;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.boot.SpringApplication;
@@ -52,7 +50,15 @@ public class Main {
     private static HttpHost proxy;
 
     public static void main(String[] args) throws IOException, ClassNotFoundException {
-        log.trace("ContentGrabbingJi 正在启动...");
+        if(args.length != 0 && args[0].equalsIgnoreCase("buildpassword")) {
+            ArgumentsRunner.run(Main.class, args);
+        } else {
+            standardStart(args);
+        }
+    }
+
+    private static void standardStart(String[] args) throws IOException, ClassNotFoundException {
+        log.info("ContentGrabbingJi 正在启动...");
         log.debug("Args: {}, LogsPath: {}", Arrays.toString(args), System.getProperty("cgj.logsPath"));
         log.debug("运行目录: {}", System.getProperty("user.dir"));
 
@@ -62,16 +68,9 @@ public class Main {
         proxy = BotGlobal.getGlobal().getProxy();
         File cookieStoreFile = new File(BotGlobal.getGlobal().getDataStoreDir(), "cookies.store");
         if(!cookieStoreFile.exists()) {
-            log.warn("未找到cookies.store文件, 是否启动PixivLoginProxyServer? (yes/no)");
-            try(Scanner scanner = new Scanner(System.in)) {
-                if(scanner.nextLine().trim().equalsIgnoreCase("yes")) {
-                    startPixivLoginProxyServer();
-                } else {
-                    System.exit(1);
-                    return;
-                }
-            }
-            
+            log.warn("未找到cookies.store文件, 请检查数据存放目录下是否存在'cookies.store'文件！");
+            System.exit(1);
+            return;
         }
         ObjectInputStream ois = new ObjectInputStream(new FileInputStream(cookieStoreFile));
         cookieStore = (CookieStore) ois.readObject();
@@ -85,6 +84,13 @@ public class Main {
         System.exit(0);
     }
 
+    @Command
+    public static void buildPassword(@Argument(name = "password") String password) {
+        System.out.println("Password: " +
+                Base64.getEncoder().encodeToString(MessageDigestUtils.encrypt(password.getBytes(),
+                MessageDigestUtils.Algorithm.MD5)));
+    }
+
     @Command
     public static void botMode(@Argument(name = "args", force = false) String argsStr) {
         MiraiMain main = new MiraiMain();
@@ -93,7 +99,7 @@ public class Main {
     }
 
     @Command
-    public static void consoleMode() {
+    public static void consoleMode() throws IOException {
         ConsoleMain.start();
     }
 
@@ -127,7 +133,7 @@ public class Main {
                 ZipEntry entry = new ZipEntry(link.substring(link.lastIndexOf("/") + 1));
                 log.info("正在写入: " + entry.getName());
                 zos.putNextEntry(entry);
-                IOUtils.copy(inputStream, zos);
+                Streams.copy(inputStream, zos, false);
                 zos.flush();
             } catch (IOException e) {
                 log.error("写入文件项时发生异常", e);
@@ -159,7 +165,7 @@ public class Main {
                 ZipEntry entry = new ZipEntry(link.substring(link.lastIndexOf("/") + 1));
                 log.info("正在写入: " + entry.getName());
                 zos.putNextEntry(entry);
-                IOUtils.copy(inputStream, zos);
+                Streams.copy(inputStream, zos, false);
                 zos.flush();
                 log.info("已成功写入 {}", entry.getName());
             } catch (IOException e) {
@@ -230,7 +236,7 @@ public class Main {
                     entry.setComment(rankInfo.toString());
                     log.info("正在写入: " + entry.getName());
                     zos.putNextEntry(entry);
-                    IOUtils.copy(inputStream, zos);
+                    Streams.copy(inputStream, zos, false);
                     zos.flush();
                     log.info("已成功写入 {}", entry.getName());
                 } catch (IOException e) {
@@ -254,24 +260,24 @@ public class Main {
             @Argument(name = "excludeKeywords", force = false) String excludeKeywords,
             @Argument(name = "contentOption", force = false) String contentOption
     ) throws IOException {
-        PixivSearchBuilder searchBuilder = new PixivSearchBuilder(Strings.isNullOrEmpty(content) ? "" : content);
+        PixivSearchLinkBuilder searchBuilder = new PixivSearchLinkBuilder(Strings.isNullOrEmpty(content) ? "" : content);
         if (type != null) {
             try {
-                searchBuilder.setSearchType(PixivSearchBuilder.SearchType.valueOf(type.toUpperCase()));
+                searchBuilder.setSearchType(PixivSearchLinkBuilder.SearchType.valueOf(type.toUpperCase()));
             } catch (IllegalArgumentException e) {
                 log.warn("不支持的SearchType: {}", type);
             }
         }
         if(area != null) {
             try {
-                searchBuilder.setSearchArea(PixivSearchBuilder.SearchArea.valueOf(area));
+                searchBuilder.setSearchArea(PixivSearchLinkBuilder.SearchArea.valueOf(area));
             } catch (IllegalArgumentException e) {
                 log.warn("不支持的SearchArea: {}", area);
             }
         }
         if(contentOption != null) {
             try {
-                searchBuilder.setSearchContentOption(PixivSearchBuilder.SearchContentOption.valueOf(contentOption));
+                searchBuilder.setSearchContentOption(PixivSearchLinkBuilder.SearchContentOption.valueOf(contentOption));
             } catch (IllegalArgumentException e) {
                 log.warn("不支持的SearchContentOption: {}", contentOption);
             }
@@ -310,7 +316,7 @@ public class Main {
 
         JsonObject resultBody = jsonObject.getAsJsonObject("body");
 
-        for(PixivSearchBuilder.SearchArea searchArea : PixivSearchBuilder.SearchArea.values()) {
+        for(PixivSearchLinkBuilder.SearchArea searchArea : PixivSearchLinkBuilder.SearchArea.values()) {
             if(!resultBody.has(searchArea.jsonKey) || resultBody.getAsJsonObject(searchArea.jsonKey).getAsJsonArray("data").size() == 0) {
                 //log.info("返回数据不包含 {}", searchArea.jsonKey);
                 continue;
@@ -349,57 +355,6 @@ public class Main {
         log.info("这里啥都没有哟w");
     }
 
-    private static void saveCookieStoreToFile() throws IOException {
-        log.info("正在保存CookieStore...");
-        File outputFile = new File(BotGlobal.getGlobal().getDataStoreDir(), "cookies.store");
-        if(!outputFile.exists() && !outputFile.createNewFile()){
-            log.error("保存CookieStore失败.");
-            return;
-        }
-        ObjectOutputStream stream = new ObjectOutputStream(new FileOutputStream(outputFile));
-        stream.writeObject(cookieStore);
-        stream.flush();
-        stream.close();
-        log.info("CookieStore保存成功.");
-    }
-
-    private static void startPixivLoginProxyServer(){
-        ProxyConfig proxyConfig = null;
-        if(proxy != null) {
-            proxyConfig = new ProxyConfig(ProxyType.HTTP, proxy.getHostName(), proxy.getPort());
-        }
-        PixivLoginProxyServer proxyServer = new PixivLoginProxyServer(proxyConfig);
-        Thread proxyServerStartThread = new Thread(() -> {
-            log.info("启动代理服务器...");
-            proxyServer.start(1006);
-            log.info("代理服务器已关闭.");
-        });
-        proxyServerStartThread.setName("LoginProxyServerThread");
-        proxyServerStartThread.start();
-        //System.console().readLine();
-        
-        log.info("登录完成后, 使用\"done\"命令结束登录过程.");
-        try(Scanner scanner = new Scanner(System.in)) {
-            while(true) {
-                if (scanner.nextLine().equalsIgnoreCase("done")) {
-                    log.info("关闭PLPS服务器...");
-                    proxyServer.close();
-                    cookieStore = proxyServer.getCookieStore();
-                    try {
-                        log.info("正在保存CookieStore...");
-                        saveCookieStoreToFile();
-                        log.info("CookieStore保存完成.");
-                    } catch (IOException e) {
-                        log.error("CookieStore保存时发生异常, 本次CookieStore仅可在本次运行使用.", e);
-                    }
-                    break;
-                } else {
-                    log.warn("要结束登录过程, 请使用\"done\"命令.");
-                }
-            }
-        }
-    }
-
     private static File getStoreDir() {
         if(!storeDir.exists() && !storeDir.mkdirs()) {
             log.error("创建文件夹失败!");

src/main/java/net/lamgc/cgj/bot/BotAdminCommandProcess.java

@@ -270,7 +270,8 @@ public class BotAdminCommandProcess {
         }
 
         AutoSender sender = new RandomRankingArtworksSender(
-                MessageSenderBuilder.getMessageSender(MessageSource.Group, id),
+                MessageSenderBuilder.getMessageSender(MessageSource.GROUP, id),
+                id,
                 rankingStart,
                 rankingEnd,
                 rankingMode, rankingContentType,

src/main/java/net/lamgc/cgj/bot/BotCode.java

@@ -64,7 +64,7 @@ public class BotCode {
 
     private String platformName;
     private String functionName;
-    private Hashtable<String, String> parameter = new Hashtable<>();
+    private final Hashtable<String, String> parameter = new Hashtable<>();
 
     /**
      * 构造一个机器功能码

src/main/java/net/lamgc/cgj/bot/BotCommandProcess.java

@@ -8,14 +8,13 @@ import net.lamgc.cgj.bot.boot.BotGlobal;
 import net.lamgc.cgj.bot.cache.CacheStore;
 import net.lamgc.cgj.bot.cache.CacheStoreCentral;
 import net.lamgc.cgj.bot.cache.JsonRedisCacheStore;
-import net.lamgc.cgj.bot.event.BufferMessageEvent;
-import net.lamgc.cgj.bot.sort.PreLoadDataComparator;
+import net.lamgc.cgj.bot.event.BufferedMessageSender;
+import net.lamgc.cgj.bot.sort.PreLoadDataAttribute;
+import net.lamgc.cgj.bot.sort.PreLoadDataAttributeComparator;
 import net.lamgc.cgj.pixiv.PixivDownload;
 import net.lamgc.cgj.pixiv.PixivDownload.PageQuality;
-import net.lamgc.cgj.pixiv.PixivSearchBuilder;
+import net.lamgc.cgj.pixiv.PixivSearchLinkBuilder;
 import net.lamgc.cgj.pixiv.PixivURL;
-import net.lamgc.cgj.pixiv.PixivURL.RankingContentType;
-import net.lamgc.cgj.pixiv.PixivURL.RankingMode;
 import net.lamgc.utils.base.runner.Argument;
 import net.lamgc.utils.base.runner.Command;
 import org.slf4j.Logger;
@@ -25,6 +24,7 @@ import java.io.File;
 import java.io.IOException;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.regex.Pattern;
 
 @SuppressWarnings({"SameParameterValue"})
 public class BotCommandProcess {
@@ -92,7 +92,8 @@ public class BotCommandProcess {
      */
     @Command(commandName = "info")
     public static String artworkInfo(@Argument(name = "$fromGroup") long fromGroup,
-                                     @Argument(name = "id") int illustId) {
+                                     @Argument(name = "id") int illustId)
+    throws InterruptedException {
         if(illustId <= 0) {
             return "这个作品Id是错误的！";
         }
@@ -102,21 +103,21 @@ public class BotCommandProcess {
                 return "阅览禁止：该作品已被封印！！";
             }
 
-            JsonObject illustPreLoadData = CacheStoreCentral.getIllustPreLoadData(illustId, false);
+            JsonObject illustPreLoadData = CacheStoreCentral.getCentral().getIllustPreLoadData(illustId, false);
             // 在 Java 6 开始, 编译器会将用'+'进行的字符串拼接将自动转换成StringBuilder拼接
             return "色图姬帮你了解了这个作品的信息！\n" + "---------------- 作品信息 ----------------" +
                     "\n作品Id: " + illustId +
                     "\n作品标题：" + illustPreLoadData.get("illustTitle").getAsString() +
                     "\n作者(作者Id)：" + illustPreLoadData.get("userName").getAsString() +
                     "(" + illustPreLoadData.get("userId").getAsInt() + ")" +
-                    "\n点赞数：" + illustPreLoadData.get(PreLoadDataComparator.Attribute.LIKE.attrName).getAsInt() +
-                    "\n收藏数：" + illustPreLoadData.get(PreLoadDataComparator.Attribute.BOOKMARK.attrName).getAsInt() +
-                    "\n围观数：" + illustPreLoadData.get(PreLoadDataComparator.Attribute.VIEW.attrName).getAsInt() +
-                    "\n评论数：" + illustPreLoadData.get(PreLoadDataComparator.Attribute.COMMENT.attrName).getAsInt() +
-                    "\n页数：" + illustPreLoadData.get(PreLoadDataComparator.Attribute.PAGE.attrName).getAsInt() + "页" +
+                    "\n点赞数：" + illustPreLoadData.get(PreLoadDataAttribute.LIKE.attrName).getAsInt() +
+                    "\n收藏数：" + illustPreLoadData.get(PreLoadDataAttribute.BOOKMARK.attrName).getAsInt() +
+                    "\n围观数：" + illustPreLoadData.get(PreLoadDataAttribute.VIEW.attrName).getAsInt() +
+                    "\n评论数：" + illustPreLoadData.get(PreLoadDataAttribute.COMMENT.attrName).getAsInt() +
+                    "\n页数：" + illustPreLoadData.get(PreLoadDataAttribute.PAGE.attrName).getAsInt() + "页" +
                     "\n作品链接：" + artworksLink(fromGroup, illustId) + "\n" +
                     "---------------- 作品图片 ----------------\n" +
-                    CacheStoreCentral.getImageById(fromGroup, illustId, PageQuality.REGULAR, 1) + "\n" +
+                    CacheStoreCentral.getCentral().getImageById(fromGroup, illustId, PageQuality.REGULAR, 1) + "\n" +
                     "使用 \".cgj image -id " +
                     illustId +
                     "\" 获取原图。\n如有不当作品，可使用\".cgj report -id " +
@@ -142,8 +143,8 @@ public class BotCommandProcess {
             @Argument(force = false, name = "date") Date queryTime,
             @Argument(force = false, name = "force") boolean force,
             @Argument(force = false, name = "mode", defaultValue = "DAILY") String contentMode,
-            @Argument(force = false, name = "type", defaultValue = "ILLUST") String contentType
-    ) {
+            @Argument(force = false, name = "type", defaultValue = "ALL") String contentType
+    ) throws InterruptedException {
         Date queryDate = queryTime;
         if (queryDate == null) {
             queryDate = new Date();
@@ -211,7 +212,7 @@ public class BotCommandProcess {
                 log.warn("配置项 {} 的参数值格式有误!", imageLimitPropertyKey);
             }
 
-            List<JsonObject> rankingInfoList = CacheStoreCentral
+            List<JsonObject> rankingInfoList = CacheStoreCentral.getCentral()
                     .getRankingInfoByCache(type, mode, queryDate, 1, Math.max(0, itemLimit), false);
             if(rankingInfoList.isEmpty()) {
                 return "无法查询排行榜，可能排行榜尚未更新。";
@@ -230,7 +231,7 @@ public class BotCommandProcess {
                         .append(pagesCount).append("p.\n");
                 if (index <= imageLimit) {
                     resultBuilder
-                            .append(CacheStoreCentral
+                            .append(CacheStoreCentral.getCentral()
                                     .getImageById(fromGroup, illustId, PixivDownload.PageQuality.REGULAR, 1))
                             .append("\n");
                 }
@@ -257,15 +258,36 @@ public class BotCommandProcess {
      * 随机获取一副作品
      */
     @Command(commandName = "random")
-    public static String randomImage() {
-        BufferMessageEvent event = new BufferMessageEvent();
+    public static String randomImage(
+            @Argument(name = "$fromGroup") long fromGroup,
+            @Argument(force = false, name = "mode", defaultValue = "DAILY") String contentMode,
+            @Argument(force = false, name = "type", defaultValue = "ILLUST") String contentType) {
+        PixivURL.RankingMode mode;
+        try {
+            String rankingModeValue = contentMode.toUpperCase();
+            mode = PixivURL.RankingMode.valueOf(rankingModeValue.startsWith("MODE_") ?
+                    rankingModeValue : "MODE_" + rankingModeValue);
+        } catch (IllegalArgumentException e) {
+            log.warn("无效的RankingMode值: {}", contentMode);
+            return "参数无效, 请查看帮助信息";
+        }
+
+        PixivURL.RankingContentType type;
+        try {
+            String contentTypeValue = contentType.toUpperCase();
+            type = PixivURL.RankingContentType.valueOf(
+                    contentTypeValue.startsWith("TYPE_") ? contentTypeValue : "TYPE_" + contentTypeValue);
+        } catch (IllegalArgumentException e) {
+            log.warn("无效的RankingContentType值: {}", contentType);
+            return "参数无效, 请查看帮助信息";
+        }
+
+        BufferedMessageSender bufferedSender = new BufferedMessageSender();
         RandomRankingArtworksSender artworksSender = 
-            new RandomRankingArtworksSender(event, 1, 200, 
-            RankingMode.MODE_MALE, 
-            RankingContentType.TYPE_ALL, 
-            PageQuality.ORIGINAL);
+            new RandomRankingArtworksSender(bufferedSender, fromGroup, 1, 200, mode, type,
+                    PageQuality.ORIGINAL);
         artworksSender.send();
-        return event.getBufferMessage();
+        return bufferedSender.getBufferContent();
     }
 
     /**
@@ -289,12 +311,12 @@ public class BotCommandProcess {
             @Argument(name = "area", force = false) String area,
             @Argument(name = "in", force = false) String includeKeywords,
             @Argument(name = "ex", force = false) String excludeKeywords,
-            @Argument(name = "contentOption", force = false) String contentOption,
-            @Argument(name = "page", force = false, defaultValue = "1") int pagesIndex
-    ) throws IOException {
-        log.info("正在执行搜索...");
-        JsonObject resultBody = CacheStoreCentral
-                .getSearchBody(content, type, area, includeKeywords, excludeKeywords, contentOption);
+            @Argument(name = "option", force = false) String contentOption,
+            @Argument(name = "p", force = false, defaultValue = "1") int pagesIndex
+    ) throws IOException, InterruptedException {
+        log.debug("正在执行搜索...");
+        JsonObject resultBody = CacheStoreCentral.getCentral()
+                .getSearchBody(content, type, area, includeKeywords, excludeKeywords, contentOption, pagesIndex);
 
         StringBuilder result = new StringBuilder("内容 " + content + " 的搜索结果：\n");
         log.debug("正在处理信息...");
@@ -306,7 +328,7 @@ public class BotCommandProcess {
             log.warn("参数转换异常!将使用默认值(" + limit + ")", e);
         }
         int totalCount = 0;
-        for (PixivSearchBuilder.SearchArea searchArea : PixivSearchBuilder.SearchArea.values()) {
+        for (PixivSearchLinkBuilder.SearchArea searchArea : PixivSearchLinkBuilder.SearchArea.values()) {
             if (!resultBody.has(searchArea.jsonKey) ||
                     resultBody.getAsJsonObject(searchArea.jsonKey).getAsJsonArray("data").size() == 0) {
                 log.debug("返回数据不包含 {}", searchArea.jsonKey);
@@ -316,9 +338,9 @@ public class BotCommandProcess {
                     .getAsJsonObject(searchArea.jsonKey).getAsJsonArray("data");
             ArrayList<JsonElement> illustsList = new ArrayList<>();
             illustsArray.forEach(illustsList::add);
-            illustsList.sort(new PreLoadDataComparator(PreLoadDataComparator.Attribute.LIKE));
+            illustsList.sort(new PreLoadDataAttributeComparator(PreLoadDataAttribute.BOOKMARK));
 
-            log.info("已找到与 {} 相关插图信息({})：", content, searchArea.name().toLowerCase());
+            log.debug("已找到与 {} 相关插图信息({})：", content, searchArea.name().toLowerCase());
             int count = 1;
             for (JsonElement jsonElement : illustsList) {
                 if (count > limit) {
@@ -346,8 +368,17 @@ public class BotCommandProcess {
                         PixivURL.getPixivRefererLink(illustId)
                 );
 
-                String imageMsg =
-                        CacheStoreCentral.getImageById(fromGroup, illustId, PixivDownload.PageQuality.REGULAR, 1);
+                String imageMsg;
+                try {
+                    imageMsg = CacheStoreCentral.getCentral()
+                            .getImageById(fromGroup, illustId, PixivDownload.PageQuality.REGULAR, 1);
+                } catch (NoSuchElementException e) {
+                    if(e.getMessage().startsWith("No work found: ")) {
+                        log.warn("作品 {} 不存在, 跳过该作品...", illustId);
+                        continue;
+                    }
+                    throw e;
+                }
                 if (isNoSafe(illustId, SettingProperties.getProperties(fromGroup), false)) {
                     log.warn("作品Id {} 为R-18作品, 跳过.", illustId);
                     continue;
@@ -356,20 +387,21 @@ public class BotCommandProcess {
                     continue;
                 }
 
-                JsonObject illustPreLoadData = CacheStoreCentral.getIllustPreLoadData(illustId, false);
+                JsonObject illustPreLoadData = CacheStoreCentral.getCentral()
+                        .getIllustPreLoadData(illustId, false);
                 result.append(searchArea.name()).append(" (").append(count).append(" / ")
                         .append(limit).append(")\n\t作品id: ").append(illustId)
                         .append(", \n\t作者名: ").append(illustObj.get("userName").getAsString())
                         .append("\n\t作品标题: ").append(illustObj.get("illustTitle").getAsString())
                         .append("\n\t作品页数: ").append(illustObj.get("pageCount").getAsInt()).append("页")
                         .append("\n\t点赞数：")
-                        .append(illustPreLoadData.get(PreLoadDataComparator.Attribute.LIKE.attrName).getAsInt())
+                        .append(illustPreLoadData.get(PreLoadDataAttribute.LIKE.attrName).getAsInt())
                         .append("\n\t收藏数：")
-                        .append(illustPreLoadData.get(PreLoadDataComparator.Attribute.BOOKMARK.attrName).getAsInt())
+                        .append(illustPreLoadData.get(PreLoadDataAttribute.BOOKMARK.attrName).getAsInt())
                         .append("\n\t围观数：")
-                        .append(illustPreLoadData.get(PreLoadDataComparator.Attribute.VIEW.attrName).getAsInt())
+                        .append(illustPreLoadData.get(PreLoadDataAttribute.VIEW.attrName).getAsInt())
                         .append("\n\t评论数：")
-                        .append(illustPreLoadData.get(PreLoadDataComparator.Attribute.COMMENT.attrName).getAsInt())
+                        .append(illustPreLoadData.get(PreLoadDataAttribute.COMMENT.attrName).getAsInt())
                         .append("\n").append(imageMsg).append("\n");
                 count++;
                 totalCount++;
@@ -444,7 +476,7 @@ public class BotCommandProcess {
 
     static void clearCache() {
         log.warn("正在清除所有缓存...");
-        CacheStoreCentral.clearCache();
+        CacheStoreCentral.getCentral().clearCache();
         File imageStoreDir = new File(BotGlobal.getGlobal().getDataStoreDir(), "data/image/cgj/");
         File[] listFiles = imageStoreDir.listFiles();
         if (listFiles == null) {
@@ -458,6 +490,16 @@ public class BotCommandProcess {
         log.warn("缓存删除完成.");
     }
 
+    @Command(commandName = "image")
+    public static String getImageById(
+            @Argument(name = "$fromGroup") long fromGroup,
+            @Argument(name = "id") int illustId,
+            @Argument(name = "quality", force = false) PixivDownload.PageQuality quality,
+            @Argument(name = "p", force = false, defaultValue = "1") int pageIndex
+    ) throws InterruptedException {
+        return CacheStoreCentral.getCentral().getImageById(fromGroup, illustId, quality, pageIndex);
+    }
+
     /**
      * 举报某一作品
      * @param fromGroup 来源群(系统提供)
@@ -492,6 +534,10 @@ public class BotCommandProcess {
         return reportStore.exists(String.valueOf(illustId));
     }
 
+    /**
+     * Tag过滤表达式
+     */
+    private final static Pattern tagPattern = Pattern.compile(".*R-*18.*");
     /**
      * 检查指定作品是否为r18
      * @param illustId 作品Id
@@ -503,12 +549,12 @@ public class BotCommandProcess {
      */
     public static boolean isNoSafe(int illustId, Properties settingProp, boolean returnRaw)
             throws IOException, NoSuchElementException {
-        JsonObject illustInfo = CacheStoreCentral.getIllustInfo(illustId, false);
+        JsonObject illustInfo = CacheStoreCentral.getCentral().getIllustInfo(illustId, false);
         JsonArray tags = illustInfo.getAsJsonArray("tags");
         boolean rawValue = illustInfo.get("xRestrict").getAsInt() != 0;
         if(!rawValue) {
             for(JsonElement tag : tags) {
-                boolean current = tag.getAsString().matches("R-*18") || tag.getAsString().contains("R18");
+                boolean current = tagPattern.matcher(tag.getAsString()).matches();
                 if (current) {
                     rawValue = true;
                     break;

src/main/java/net/lamgc/cgj/bot/RandomIntervalSendTimer.java

@@ -13,7 +13,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
  */
 public class RandomIntervalSendTimer extends TimerTask {
 
-    private final static Timer timer = new Timer("Thread-RIST", true);
+    private final static Timer timer = new Timer("Thread-RandomIntervalSendTimer", true);
     private final static Logger log = LoggerFactory.getLogger(RandomIntervalSendTimer.class);
     private final static Map<Long, RandomIntervalSendTimer> timerMap = new HashMap<>();
 
@@ -77,7 +77,13 @@ public class RandomIntervalSendTimer extends TimerTask {
      * @param startNow 现在开始
      * @param loop 是否循环
      */
-    private RandomIntervalSendTimer(long timerId, AutoSender sender, long time, int floatTime, boolean startNow, boolean loop) {
+    private RandomIntervalSendTimer(
+            long timerId,
+            AutoSender sender,
+            long time,
+            int floatTime,
+            boolean startNow,
+            boolean loop) {
         this.timerId = timerId;
         this.sender = sender;
         this.time = time;
@@ -119,11 +125,15 @@ public class RandomIntervalSendTimer extends TimerTask {
 
     @Override
     public void run() {
+        log.info("定时器 {} 开始执行...(Sender: {}@{})", this.hashId, sender.getClass().getSimpleName(), sender.hashCode());
         try {
             sender.send();
         } catch (Exception e) {
-            log.error("定时器 {} 执行时发生异常:\n{}", Integer.toHexString(this.hashCode()), Throwables.getStackTraceAsString(e));
+            log.error("定时器 {} 执行时发生异常:\n{}",
+                    Integer.toHexString(this.hashCode()),
+                    Throwables.getStackTraceAsString(e));
         }
+        log.info("定时器 {} 执行结束.", this.hashId);
         if (this.loop.get()) {
             start();
         }

src/main/java/net/lamgc/cgj/bot/RandomRankingArtworksSender.java

@@ -19,6 +19,7 @@ import java.util.Random;
 public class RandomRankingArtworksSender extends AutoSender {
 
     private final Logger log;
+    private final long groupId;
     private final int rankingStart;
     private final int rankingStop;
     private final PixivURL.RankingMode mode;
@@ -35,8 +36,37 @@ public class RandomRankingArtworksSender extends AutoSender {
      * @param quality 图片质量, 详见{@link PixivDownload.PageQuality}
      * @throws IndexOutOfBoundsException 当 rankingStart > rankingStop时抛出
      */
-    public RandomRankingArtworksSender(MessageSender messageSender, int rankingStart, int rankingStop, PixivURL.RankingMode mode, PixivURL.RankingContentType contentType, PixivDownload.PageQuality quality) {
+    public RandomRankingArtworksSender(
+            MessageSender messageSender,
+            int rankingStart,
+            int rankingStop,
+            PixivURL.RankingMode mode,
+            PixivURL.RankingContentType contentType,
+            PixivDownload.PageQuality quality) {
+        this(messageSender, 0, rankingStart, rankingStop, mode, contentType, quality);
+    }
+
+    /**
+     * 构造一个推荐作品发送器
+     * @param messageSender 消息发送器
+     * @param groupId 群组Id, 如果发送目标为群组, 则可设置群组Id, 以使用群组配置.
+     * @param rankingStart 排行榜开始范围(从1开始, 名次)，如传入0或负数则为默认值，默认为1
+     * @param rankingStop 排名榜结束范围(包括该名次)，如传入0或负数则为默认值，默认为150
+     * @param mode 排行榜模式
+     * @param contentType 排行榜内容类型
+     * @param quality 图片质量, 详见{@link PixivDownload.PageQuality}
+     * @throws IndexOutOfBoundsException 当 rankingStart > rankingStop时抛出
+     */
+    public RandomRankingArtworksSender(
+            MessageSender messageSender,
+            long groupId,
+            int rankingStart,
+            int rankingStop,
+            PixivURL.RankingMode mode,
+            PixivURL.RankingContentType contentType,
+            PixivDownload.PageQuality quality) {
         super(messageSender);
+        this.groupId = groupId;
         this.mode = mode;
         this.contentType = contentType;
         log = LoggerFactory.getLogger(this.toString());
@@ -62,7 +92,7 @@ public class RandomRankingArtworksSender extends AutoSender {
 
         int selectRanking = rankingStart + new Random().nextInt(rankingStop - rankingStart + 1);
         try {
-            List<JsonObject> rankingList = CacheStoreCentral.getRankingInfoByCache(
+            List<JsonObject> rankingList = CacheStoreCentral.getCentral().getRankingInfoByCache(
                     contentType,
                     mode,
                     queryDate,
@@ -78,7 +108,7 @@ public class RandomRankingArtworksSender extends AutoSender {
             JsonObject rankingInfo = rankingList.get(0);
             int illustId = rankingInfo.get("illust_id").getAsInt();
             if(BotCommandProcess.isNoSafe(illustId,
-                    SettingProperties.getProperties(SettingProperties.GLOBAL), false)) {
+                    SettingProperties.getProperties(groupId), false)) {
                 log.warn("作品为r18作品, 取消本次发送.");
                 return;
             } else if(BotCommandProcess.isReported(illustId)) {
@@ -89,7 +119,7 @@ public class RandomRankingArtworksSender extends AutoSender {
             String message = "#美图推送 - 今日排行榜 第 " + rankingInfo.get("rank").getAsInt() + " 名\n" +
                     "标题：" + rankingInfo.get("title").getAsString() + "(" + illustId + ")\n" +
                     "作者：" + rankingInfo.get("user_name").getAsString() + "\n" +
-                    CacheStoreCentral.getImageById(0, illustId, quality, 1) +
+                    CacheStoreCentral.getCentral().getImageById(0, illustId, quality, 1) +
                     "\n如有不当作品，可使用\".cgj report -id " + illustId + "\"向色图姬反馈。";
             getMessageSender().sendMessage(message);
         } catch (Exception e) {

src/main/java/net/lamgc/cgj/bot/boot/BotGlobal.java

@@ -8,7 +8,9 @@ import org.apache.http.HttpHost;
 import org.apache.http.client.CookieStore;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import redis.clients.jedis.Jedis;
 import redis.clients.jedis.JedisPool;
+import redis.clients.jedis.exceptions.JedisConnectionException;
 
 import java.io.File;
 import java.io.IOException;
@@ -25,7 +27,7 @@ public final class BotGlobal {
 
     public static BotGlobal getGlobal() {
         if(instance == null) {
-            throw new IllegalStateException("");
+            throw new IllegalStateException("BotGlobal has not been initialized");
         }
         return instance;
     }
@@ -56,6 +58,12 @@ public final class BotGlobal {
         this.redisServer = new JedisPool(
                 getRedisUri().getHost(),
                 getRedisUri().getPort() == -1 ? 6379 : getRedisUri().getPort());
+        try (Jedis jedis = this.redisServer.getResource()) {
+            log.warn("Redis连接状态(Ping): {}", jedis.ping().equalsIgnoreCase("pong"));
+        } catch(JedisConnectionException e) {
+            log.warn("Redis连接失败, 将会影响到后续功能运行.({})", e.getCause().getMessage());
+        }
+
         String dataStoreDirPath = System.getProperty("cgj.botDataDir");
         this.dataStoreDir = new File((!dataStoreDirPath.endsWith("/") || !dataStoreDirPath.endsWith("\\")) ?
                 dataStoreDirPath + System.getProperty("file.separator") : dataStoreDirPath);
@@ -95,13 +103,6 @@ public final class BotGlobal {
         return proxy;
     }
 
-    public CookieStore getCookieStore() {
-        if(pixivDownload == null) {
-            throw new IllegalStateException("CookieStore needs to be set before PixivDownload can be obtained");
-        }
-        return cookieStore;
-    }
-
     public void setCookieStore(CookieStore cookieStore) {
         if(this.cookieStore != null) {
             throw new IllegalStateException("CookieStore set");

src/main/java/net/lamgc/cgj/bot/cache/AutoCleanTimer.java

@@ -18,7 +18,7 @@ public class AutoCleanTimer extends TimerTask {
     private final static Logger log = LoggerFactory.getLogger(AutoCleanTimer.class);
 
     static {
-        cleanTimer.schedule(new AutoCleanTimer(), 100L);
+        cleanTimer.schedule(new AutoCleanTimer(), 100L, 100L);
     }
 
     /**

src/main/java/net/lamgc/cgj/bot/cache/CacheStoreCentral.java

@@ -8,12 +8,13 @@ import net.lamgc.cgj.bot.BotCode;
 import net.lamgc.cgj.bot.BotCommandProcess;
 import net.lamgc.cgj.bot.SettingProperties;
 import net.lamgc.cgj.bot.boot.BotGlobal;
+import net.lamgc.cgj.exception.HttpRequestException;
 import net.lamgc.cgj.pixiv.PixivDownload;
-import net.lamgc.cgj.pixiv.PixivSearchBuilder;
+import net.lamgc.cgj.pixiv.PixivSearchLinkBuilder;
 import net.lamgc.cgj.pixiv.PixivURL;
+import net.lamgc.cgj.util.Locker;
+import net.lamgc.cgj.util.LockerMap;
 import net.lamgc.cgj.util.URLs;
-import net.lamgc.utils.base.runner.Argument;
-import net.lamgc.utils.base.runner.Command;
 import net.lamgc.utils.encrypt.MessageDigestUtils;
 import net.lz1998.cq.utils.CQCode;
 import org.apache.http.HttpResponse;
@@ -33,55 +34,82 @@ import java.util.concurrent.atomic.AtomicInteger;
 @SuppressWarnings("SynchronizationOnLocalVariableOrMethodParameter")
 public final class CacheStoreCentral {
 
-    private CacheStoreCentral() {}
-
     private final static Logger log = LoggerFactory.getLogger(CacheStoreCentral.class);
 
-    private final static Hashtable<String, File> imageCache = new Hashtable<>();
+    private static CacheStoreCentral central = new CacheStoreCentral();
 
-    private final static JsonRedisCacheStore imageChecksumCache =
+    public static CacheStoreCentral getCentral() {
+        if(central == null) {
+            initialCentral();
+        }
+        return central;
+    }
+
+    private synchronized static void initialCentral() {
+        if(central != null) {
+            return;
+        }
+
+        central = new CacheStoreCentral();
+    }
+
+    private final LockerMap<String> lockerMap = new LockerMap<>();
+
+    private CacheStoreCentral() {}
+
+    private final Hashtable<String, File> imageCache = new Hashtable<>();
+
+    private final CacheStore<JsonElement> imageChecksumCache =
             new JsonRedisCacheStore(BotGlobal.getGlobal().getRedisServer(),
                     "imageChecksum", BotGlobal.getGlobal().getGson());
 
+    /*
+     * 注意：
+     *      在启用了远端缓存的情况下, 不允许滥用本地缓存
+     *      只有在处理命令中需要短时间大量存取的缓存项才能进行本地缓存(例如PreLoadData需要在排序中大量获取);
+     *      如果没有短时间大量存取的需要, 切勿使用本地缓存
+     */
+
     /**
      * 作品信息缓存 - 不过期
      */
-    private final static CacheStore<JsonElement> illustInfoCache =
+    private final CacheStore<JsonElement> illustInfoCache =
             new JsonRedisCacheStore(BotGlobal.getGlobal().getRedisServer(),
                     "illustInfo", BotGlobal.getGlobal().getGson());
 
     /**
-     * 作品信息预加载数据 - 有效期 2 小时, 本地缓存有效期1 ± 0.25
+     * 作品信息预加载数据 - 有效期 2 小时, 本地缓存有效期 0.5 ± 0.25 小时
      */
-    private final static CacheStore<JsonElement> illustPreLoadDataCache =
+    private final CacheStore<JsonElement> illustPreLoadDataCache =
             CacheStoreUtils.hashLocalHotDataStore(
                     new JsonRedisCacheStore(BotGlobal.getGlobal().getRedisServer(),
                             "illustPreLoadData", BotGlobal.getGlobal().getGson()),
-                    3600000, 900000);
+                    // 600000, 120000);
+                    60000, 1);
     /**
      * 搜索内容缓存, 有效期 2 小时
      */
-    private final static CacheStore<JsonElement> searchBodyCache =
+    private final CacheStore<JsonElement> searchBodyCache =
             new JsonRedisCacheStore(BotGlobal.getGlobal().getRedisServer(),
                     "searchBody", BotGlobal.getGlobal().getGson());
 
     /**
      * 排行榜缓存, 不过期
      */
-    private final static CacheStore<List<JsonObject>> rankingCache =
+    private final CacheStore<List<JsonObject>> rankingCache =
             new JsonObjectRedisListCacheStore(BotGlobal.getGlobal().getRedisServer(),
                     "ranking", BotGlobal.getGlobal().getGson());
 
     /**
      * 作品页面下载链接缓存 - 不过期
      */
-    private final static CacheStore<List<String>> pagesCache =
+    private final CacheStore<List<String>> pagesCache =
             new StringListRedisCacheStore(BotGlobal.getGlobal().getRedisServer(), "imagePages");
 
     /**
      * 清空所有缓存
      */
-    public static void clearCache() {
+    public void clearCache() {
         imageCache.clear();
         illustInfoCache.clear();
         illustPreLoadDataCache.clear();
@@ -98,13 +126,12 @@ public final class CacheStoreCentral {
      * @param pageIndex 指定页面索引, 从1开始
      * @return 如果成功, 返回BotCode, 否则返回错误信息.
      */
-    @Command(commandName = "image")
-    public static String getImageById(
-            @Argument(name = "$fromGroup") long fromGroup,
-            @Argument(name = "id") int illustId,
-            @Argument(name = "quality", force = false) PixivDownload.PageQuality quality,
-            @Argument(name = "page", force = false, defaultValue = "1") int pageIndex) {
+    public String getImageById(long fromGroup, int illustId, PixivDownload.PageQuality quality, int pageIndex) throws InterruptedException {
         log.debug("IllustId: {}, Quality: {}, PageIndex: {}", illustId, quality.name(), pageIndex);
+        if(pageIndex <= 0) {
+            log.warn("指定的页数不能小于或等于0: {}", pageIndex);
+            return "指定的页数不能小于或等于0！";
+        }
 
         try {
             if (BotCommandProcess.isNoSafe(illustId, SettingProperties.getProperties(fromGroup), false)) {
@@ -121,7 +148,7 @@ public final class CacheStoreCentral {
 
         List<String> pagesList;
         try {
-            pagesList = CacheStoreCentral.getIllustPages(illustId, quality, false);
+            pagesList = getIllustPages(illustId, quality, false);
         } catch (IOException e) {
             log.error("获取下载链接列表时发生异常", e);
             return "发生网络异常，无法获取图片！";
@@ -135,7 +162,7 @@ public final class CacheStoreCentral {
             log.debug(logBuilder.toString());
         }
 
-        if (pagesList.size() < pageIndex || pageIndex <= 0) {
+        if (pagesList.size() < pageIndex) {
             log.warn("指定的页数超出了总页数({} / {})", pageIndex, pagesList.size());
             return "指定的页数超出了范围(总共 " + pagesList.size() + " 页)";
         }
@@ -150,10 +177,10 @@ public final class CacheStoreCentral {
                 ImageChecksum imageChecksum = getImageChecksum(illustId, pageIndex);
                 if(imageChecksum != null) {
                     try {
-                        log.debug("正在检查作品Id {} 第 {} 页图片文件 {} ...", illustId, pageIndex, imageFile.getName());
+                        log.trace("正在检查作品Id {} 第 {} 页图片文件 {} ...", illustId, pageIndex, imageFile.getName());
                         if (ImageChecksum.checkFile(imageChecksum, Files.readAllBytes(imageFile.toPath()))) {
                             imageCache.put(URLs.getResourceName(downloadLink), imageFile);
-                            log.debug("作品Id {} 第 {} 页缓存已补充.", illustId, pageIndex);
+                            log.trace("作品Id {} 第 {} 页缓存已补充.", illustId, pageIndex);
                             return getImageToBotCode(imageFile, false).toString();
                         } else {
                             log.warn("图片文件 {} 校验失败, 重新下载图片...", imageFile.getName());
@@ -174,13 +201,13 @@ public final class CacheStoreCentral {
                 }
             } catch (InterruptedException e) {
                 log.warn("图片缓存被中断", e);
-                return "(错误：图片获取超时)";
+                throw e;
             } catch (Throwable e) {
                 log.error("图片 {} 获取失败:\n{}", illustId + "p" + pageIndex, Throwables.getStackTraceAsString(e));
                 return "(错误: 图片获取出错)";
             }
         } else {
-            log.debug("图片 {} 缓存命中.", fileName);
+            log.trace("图片 {} 缓存命中.", fileName);
         }
 
         return getImageToBotCode(imageCache.get(fileName), false).toString();
@@ -193,7 +220,7 @@ public final class CacheStoreCentral {
      * @return 返回设定好参数的BotCode
      */
     @SuppressWarnings("SameParameterValue")
-    private static BotCode getImageToBotCode(File targetFile, boolean updateCache) {
+    private BotCode getImageToBotCode(File targetFile, boolean updateCache) {
         String fileName = Objects.requireNonNull(targetFile, "targetFile is null").getName();
         BotCode code = BotCode.parse(
                 CQCode.image(BotGlobal.getGlobal().getImageStoreDir().getName() + "/" + fileName));
@@ -211,22 +238,28 @@ public final class CacheStoreCentral {
      * @throws IOException 当Http请求发生异常时抛出
      * @throws NoSuchElementException 当作品未找到时抛出
      */
-    public static JsonObject getIllustInfo(int illustId, boolean flushCache)
+    public JsonObject getIllustInfo(int illustId, boolean flushCache)
             throws IOException, NoSuchElementException {
-        String illustIdStr = buildSyncKey(Integer.toString(illustId));
+        Locker<String> locker = buildSyncKey(Integer.toString(illustId));
+        String illustIdStr = locker.getKey();
         JsonObject illustInfoObj = null;
         if (!illustInfoCache.exists(illustIdStr) || flushCache) {
-            synchronized (illustIdStr) {
-                if (!illustInfoCache.exists(illustIdStr) || flushCache) {
-                    illustInfoObj = BotGlobal.getGlobal().getPixivDownload().getIllustInfoByIllustId(illustId);
-                    illustInfoCache.update(illustIdStr, illustInfoObj, null);
+            try {
+                locker.lock();
+                synchronized (locker) {
+                    if (!illustInfoCache.exists(illustIdStr) || flushCache) {
+                        illustInfoObj = BotGlobal.getGlobal().getPixivDownload().getIllustInfoByIllustId(illustId);
+                        illustInfoCache.update(illustIdStr, illustInfoObj, null);
+                    }
                 }
+            } finally {
+                locker.unlock();
             }
         }
 
         if(Objects.isNull(illustInfoObj)) {
             illustInfoObj = illustInfoCache.getCache(illustIdStr).getAsJsonObject();
-            log.debug("作品Id {} IllustInfo缓存命中.", illustId);
+            log.trace("作品Id {} IllustInfo缓存命中.", illustId);
         }
         return illustInfoObj;
     }
@@ -239,66 +272,79 @@ public final class CacheStoreCentral {
      * @return 成功返回JsonObject对象
      * @throws IOException 当Http请求处理发生异常时抛出
      */
-    public static JsonObject getIllustPreLoadData(int illustId, boolean flushCache) throws IOException {
-        String illustIdStr = buildSyncKey(Integer.toString(illustId));
+    public JsonObject getIllustPreLoadData(int illustId, boolean flushCache) throws IOException {
+        Locker<String> locker = buildSyncKey(Integer.toString(illustId));
+        String illustIdStr = locker.getKey();
         JsonObject result = null;
         if (!illustPreLoadDataCache.exists(illustIdStr) || flushCache) {
-            synchronized (illustIdStr) {
-                if (!illustPreLoadDataCache.exists(illustIdStr) || flushCache) {
-                    log.debug("IllustId {} 缓存失效, 正在更新...", illustId);
-                    JsonObject preLoadDataObj = BotGlobal.getGlobal().getPixivDownload()
-                            .getIllustPreLoadDataById(illustId)
-                            .getAsJsonObject("illust")
-                            .getAsJsonObject(Integer.toString(illustId));
+            try {
+                locker.lock();
+                synchronized (locker) {
+                    if (!illustPreLoadDataCache.exists(illustIdStr) || flushCache) {
+                        log.trace("IllustId {} 缓存失效, 正在更新...", illustId);
+                        JsonObject preLoadDataObj = BotGlobal.getGlobal().getPixivDownload()
+                                .getIllustPreLoadDataById(illustId)
+                                .getAsJsonObject("illust")
+                                .getAsJsonObject(Integer.toString(illustId));
 
-                    long expire = 7200 * 1000;
-                    String propValue = SettingProperties.
-                            getProperty(SettingProperties.GLOBAL, "cache.illustPreLoadData.expire", "7200000");
-                    log.debug("PreLoadData有效时间设定: {}", propValue);
-                    try {
-                        expire = Long.parseLong(propValue);
-                    } catch (Exception e) {
-                        log.warn("全局配置项 \"{}\" 值非法, 已使用默认值: {}", propValue, expire);
+                        long expire = 7200 * 1000;
+                        String propValue = SettingProperties.
+                                getProperty(SettingProperties.GLOBAL, "cache.illustPreLoadData.expire", "7200000");
+                        log.debug("PreLoadData有效时间设定: {}", propValue);
+                        try {
+                            expire = Long.parseLong(propValue);
+                        } catch (Exception e) {
+                            log.warn("全局配置项 \"{}\" 值非法, 已使用默认值: {}", propValue, expire);
+                        }
+
+                        result = preLoadDataObj;
+                        illustPreLoadDataCache.update(illustIdStr, preLoadDataObj, expire);
+                        log.trace("作品Id {} preLoadData缓存已更新(有效时间: {})", illustId, expire);
                     }
-
-                    result = preLoadDataObj;
-                    illustPreLoadDataCache.update(illustIdStr, preLoadDataObj, expire);
-                    log.debug("作品Id {} preLoadData缓存已更新(有效时间: {})", illustId, expire);
                 }
+            } finally {
+                locker.unlock();
             }
         }
 
         if(Objects.isNull(result)) {
             result = illustPreLoadDataCache.getCache(illustIdStr).getAsJsonObject();
-            log.debug("作品Id {} PreLoadData缓存命中.", illustId);
+            log.trace("作品Id {} PreLoadData缓存命中.", illustId);
         }
         return result;
     }
 
-    public static List<String> getIllustPages(int illustId, PixivDownload.PageQuality quality, boolean flushCache)
+    public List<String> getIllustPages(int illustId, PixivDownload.PageQuality quality, boolean flushCache)
             throws IOException {
-        String pagesSign = buildSyncKey(Integer.toString(illustId), ".", quality.name());
+        Locker<String> locker
+                = buildSyncKey(Integer.toString(illustId), ".", quality.name());
+        String pagesSign = locker.getKey();
         List<String> result = null;
         if (!pagesCache.exists(pagesSign) || flushCache) {
-            synchronized (pagesSign) {
-                if (!pagesCache.exists(pagesSign) || flushCache) {
-                    List<String> linkList = PixivDownload
-                            .getIllustAllPageDownload(BotGlobal.getGlobal().getPixivDownload().getHttpClient(),
-                                    BotGlobal.getGlobal().getPixivDownload().getCookieStore(), illustId, quality);
-                    result = linkList;
-                    pagesCache.update(pagesSign, linkList, null);
+            try {
+                locker.lock();
+                synchronized (locker) {
+                    if (!pagesCache.exists(pagesSign) || flushCache) {
+                        List<String> linkList = PixivDownload
+                                .getIllustAllPageDownload(BotGlobal.getGlobal().getPixivDownload().getHttpClient(),
+                                        BotGlobal.getGlobal().getPixivDownload().getCookieStore(), illustId, quality);
+                        result = linkList;
+                        pagesCache.update(pagesSign, linkList, null);
+                    }
                 }
+            } finally {
+                locker.unlock();
             }
         }
 
         if(Objects.isNull(result)) {
             result = pagesCache.getCache(pagesSign);
-            log.debug("作品Id {} Pages缓存命中.", illustId);
+            log.trace("作品Id {} Pages缓存命中.", illustId);
         }
         return result;
     }
 
-    private final static Random expireTimeFloatRandom = new Random();
+    private final Random expireTimeFloatRandom = new Random();
     /**
      * 获取排行榜
      * @param contentType 排行榜类型
@@ -310,7 +356,7 @@ public final class CacheStoreCentral {
      * @return 成功返回有值List, 失败且无异常返回空
      * @throws IOException 获取异常时抛出
      */
-    public static List<JsonObject> getRankingInfoByCache(PixivURL.RankingContentType contentType,
+    public List<JsonObject> getRankingInfoByCache(PixivURL.RankingContentType contentType,
                                                          PixivURL.RankingMode mode,
                                                          Date queryDate, int start, int range, boolean flushCache)
             throws IOException {
@@ -327,31 +373,37 @@ public final class CacheStoreCentral {
         }
 
         String date = new SimpleDateFormat("yyyyMMdd").format(queryDate);
-        String requestSign = buildSyncKey(contentType.name(), ".", mode.name(), ".", date);
+        Locker<String> locker
+                = buildSyncKey(contentType.name(), ".", mode.name(), ".", date);
+        String requestSign = locker.getKey();
         List<JsonObject> result = null;
         if(!rankingCache.exists(requestSign) || flushCache) {
-            synchronized(requestSign) {
-                if(!rankingCache.exists(requestSign) || flushCache) {
-                    log.debug("Ranking缓存失效, 正在更新...(RequestSign: {})", requestSign);
-                    List<JsonObject> rankingResult = BotGlobal.getGlobal().getPixivDownload()
-                            .getRanking(contentType, mode, queryDate, 1, 500);
-                    long expireTime = 0;
-                    if(rankingResult.size() == 0) {
-                        expireTime = 5400000 + expireTimeFloatRandom.nextInt(1800000);
-                        log.warn("数据获取失败, 将设置浮动有效时间以准备下次更新. (ExpireTime: {}ms)", expireTime);
+            try {
+                locker.lock();
+                synchronized (locker) {
+                    if (!rankingCache.exists(requestSign) || flushCache) {
+                        log.trace("Ranking缓存失效, 正在更新...(RequestSign: {})", requestSign);
+                        List<JsonObject> rankingResult = BotGlobal.getGlobal().getPixivDownload()
+                                .getRanking(contentType, mode, queryDate, 1, 500);
+                        long expireTime = 0;
+                        if (rankingResult.size() == 0) {
+                            expireTime = 5400000 + expireTimeFloatRandom.nextInt(1800000);
+                            log.warn("数据获取失败, 将设置浮动有效时间以准备下次更新. (ExpireTime: {}ms)", expireTime);
+                        }
+                        result = new ArrayList<>(rankingResult).subList(start - 1, start + range - 1);
+                        rankingCache.update(requestSign, rankingResult, expireTime);
+                        log.trace("Ranking缓存更新完成.(RequestSign: {})", requestSign);
                     }
-                    result = new ArrayList<>(rankingResult).subList(start - 1, start + range - 1);
-                    rankingCache.update(requestSign, rankingResult, expireTime);
-                    log.debug("Ranking缓存更新完成.(RequestSign: {})", requestSign);
                 }
+            } finally {
+                locker.unlock();
             }
         }
 
         if (Objects.isNull(result)) {
             result = rankingCache.getCache(requestSign, start - 1, range);
-            log.debug("RequestSign [{}] 缓存命中.", requestSign);
+            log.trace("RequestSign [{}] 缓存命中.", requestSign);
         }
-        log.debug("Result-Length: {}", result.size());
         return PixivDownload.getRanking(result, start - 1, range);
     }
 
@@ -366,31 +418,34 @@ public final class CacheStoreCentral {
      * @return 返回完整搜索结果
      * @throws IOException 当请求发生异常, 或接口返回异常信息时抛出.
      */
-    public static JsonObject getSearchBody(
+    public JsonObject getSearchBody(
             String content,
             String type,
             String area,
             String includeKeywords,
             String excludeKeywords,
-            String contentOption) throws IOException {
-        PixivSearchBuilder searchBuilder = new PixivSearchBuilder(Strings.isNullOrEmpty(content) ? "" : content);
+            String contentOption,
+            int pageIndex
+    ) throws IOException {
+        PixivSearchLinkBuilder searchBuilder = new PixivSearchLinkBuilder(Strings.isNullOrEmpty(content) ? "" : content);
         if (type != null) {
             try {
-                searchBuilder.setSearchType(PixivSearchBuilder.SearchType.valueOf(type.toUpperCase()));
+                searchBuilder.setSearchType(PixivSearchLinkBuilder.SearchType.valueOf(type.toUpperCase()));
             } catch (IllegalArgumentException e) {
                 log.warn("不支持的SearchType: {}", type);
             }
         }
         if (area != null) {
             try {
-                searchBuilder.setSearchArea(PixivSearchBuilder.SearchArea.valueOf(area));
+                searchBuilder.setSearchArea(PixivSearchLinkBuilder.SearchArea.valueOf(area));
             } catch (IllegalArgumentException e) {
                 log.warn("不支持的SearchArea: {}", area);
             }
         }
         if (contentOption != null) {
             try {
-                searchBuilder.setSearchContentOption(PixivSearchBuilder.SearchContentOption.valueOf(contentOption));
+                searchBuilder.setSearchContentOption(
+                        PixivSearchLinkBuilder.SearchContentOption.valueOf(contentOption.trim().toUpperCase()));
             } catch (IllegalArgumentException e) {
                 log.warn("不支持的SearchContentOption: {}", contentOption);
             }
@@ -400,58 +455,69 @@ public final class CacheStoreCentral {
             for (String keyword : includeKeywords.split(";")) {
                 searchBuilder.removeExcludeKeyword(keyword.trim());
                 searchBuilder.addIncludeKeyword(keyword.trim());
-                log.debug("已添加关键字: {}", keyword);
+                log.trace("已添加关键字: {}", keyword);
             }
         }
         if (!Strings.isNullOrEmpty(excludeKeywords)) {
             for (String keyword : excludeKeywords.split(";")) {
                 searchBuilder.removeIncludeKeyword(keyword.trim());
                 searchBuilder.addExcludeKeyword(keyword.trim());
-                log.debug("已添加排除关键字: {}", keyword);
+                log.trace("已添加排除关键字: {}", keyword);
             }
         }
 
-        log.info("正在搜索作品, 条件: {}", searchBuilder.getSearchCondition());
+        if(pageIndex > 0) {
+            searchBuilder.setPage(pageIndex);
+        }
 
-        String requestUrl = searchBuilder.buildURL().intern();
+        log.debug("正在搜索作品, 条件: {}", searchBuilder.getSearchCondition());
+
+        Locker<String> locker
+                = buildSyncKey(searchBuilder.buildURL());
+        String requestUrl = locker.getKey();
         log.debug("RequestUrl: {}", requestUrl);
         JsonObject resultBody = null;
         if(!searchBodyCache.exists(requestUrl)) {
-            synchronized (requestUrl) {
-                if (!searchBodyCache.exists(requestUrl)) {
-                    log.debug("searchBody缓存失效, 正在更新...");
-                    JsonObject jsonObject;
-                    HttpGet httpGetRequest = BotGlobal.getGlobal().getPixivDownload().
-                            createHttpGetRequest(requestUrl);
-                    HttpResponse response = BotGlobal.getGlobal().getPixivDownload().
-                            getHttpClient().execute(httpGetRequest);
+            try {
+                locker.lock();
+                synchronized (locker) {
+                    if (!searchBodyCache.exists(requestUrl)) {
+                        log.trace("searchBody缓存失效, 正在更新...");
+                        JsonObject jsonObject;
+                        HttpGet httpGetRequest = BotGlobal.getGlobal().getPixivDownload().
+                                createHttpGetRequest(requestUrl);
+                        HttpResponse response = BotGlobal.getGlobal().getPixivDownload().
+                                getHttpClient().execute(httpGetRequest);
 
-                    String responseBody = EntityUtils.toString(response.getEntity(), StandardCharsets.UTF_8);
-                    log.debug("ResponseBody: {}", responseBody);
-                    jsonObject = BotGlobal.getGlobal().getGson().fromJson(responseBody, JsonObject.class);
+                        String responseBody = EntityUtils.toString(response.getEntity(), StandardCharsets.UTF_8);
+                        log.trace("ResponseBody: {}", responseBody);
+                        jsonObject = BotGlobal.getGlobal().getGson().fromJson(responseBody, JsonObject.class);
 
-                    if (jsonObject.get("error").getAsBoolean()) {
-                        log.error("接口请求错误, 错误信息: {}", jsonObject.get("message").getAsString());
-                        throw new IOException("Interface Request Error: " + jsonObject.get("message").getAsString());
+                        if (jsonObject.get("error").getAsBoolean()) {
+                            log.error("接口请求错误, 错误信息: {}", jsonObject.get("message").getAsString());
+                            throw new HttpRequestException(response.getStatusLine(), responseBody);
+                        }
+
+                        long expire = 7200 * 1000;
+                        String propValue = SettingProperties
+                                .getProperty(SettingProperties.GLOBAL, "cache.searchBody.expire", "7200000");
+                        try {
+                            expire = Long.parseLong(propValue);
+                        } catch (Exception e) {
+                            log.warn("全局配置项 \"{}\" 值非法, 已使用默认值: {}", propValue, expire);
+                        }
+                        resultBody = jsonObject.getAsJsonObject().getAsJsonObject("body");
+                        searchBodyCache.update(requestUrl, jsonObject, expire);
+                        log.trace("searchBody缓存已更新(有效时间: {})", expire);
+                    } else {
+                        log.trace("搜索缓存命中.");
                     }
-
-                    long expire = 7200 * 1000;
-                    String propValue = SettingProperties
-                            .getProperty(SettingProperties.GLOBAL, "cache.searchBody.expire", "7200000");
-                    try {
-                        expire = Long.parseLong(propValue);
-                    } catch (Exception e) {
-                        log.warn("全局配置项 \"{}\" 值非法, 已使用默认值: {}", propValue, expire);
-                    }
-                    resultBody = jsonObject.getAsJsonObject().getAsJsonObject("body");
-                    searchBodyCache.update(requestUrl, jsonObject, expire);
-                    log.debug("searchBody缓存已更新(有效时间: {})", expire);
-                } else {
-                    log.debug("搜索缓存命中.");
                 }
+            } finally {
+                locker.unlock();
             }
         } else {
-            log.debug("搜索缓存命中.");
+            log.trace("搜索缓存命中.");
         }
 
         if(Objects.isNull(resultBody)) {
@@ -460,7 +526,7 @@ public final class CacheStoreCentral {
         return resultBody;
     }
 
-    protected static ImageChecksum getImageChecksum(int illustId, int pageIndex) {
+    protected ImageChecksum getImageChecksum(int illustId, int pageIndex) {
         String cacheKey = illustId + ":" + pageIndex;
         if(!imageChecksumCache.exists(cacheKey)) {
             return null;
@@ -469,7 +535,7 @@ public final class CacheStoreCentral {
         }
     }
 
-    protected static void setImageChecksum(ImageChecksum checksum) {
+    protected void setImageChecksum(ImageChecksum checksum) {
         String cacheKey = checksum.getIllustId() + ":" + checksum.getPage();
         imageChecksumCache.update(cacheKey, ImageChecksum.toJsonObject(checksum), 0);
     }
@@ -479,12 +545,12 @@ public final class CacheStoreCentral {
      * @param keys String对象
      * @return 合并后, 如果常量池存在合并后的结果, 则返回常量池中的对象, 否则存入常量池后返回.
      */
-    private static String buildSyncKey(String... keys) {
+    private Locker<String> buildSyncKey(String... keys) {
         StringBuilder sb = new StringBuilder();
         for (String string : keys) {
             sb.append(string);
         }
-        return sb.toString().intern();
+        return lockerMap.createLocker(sb.toString(), true);
     }
 
     /**

src/main/java/net/lamgc/cgj/bot/cache/HotDataCacheStore.java

@@ -39,7 +39,7 @@ public class HotDataCacheStore<T> implements CacheStore<T>, Cleanable {
             AutoCleanTimer.add(this);
         }
 
-        log.debug("HotDataCacheStore初始化完成. " +
+        log.trace("HotDataCacheStore初始化完成. " +
                         "(Parent: {}, Current: {}, expireTime: {}, expireFloatRange: {}, autoClean: {})",
                 parent, current, expireTime, expireFloatRange, autoClean);
     }
@@ -58,24 +58,27 @@ public class HotDataCacheStore<T> implements CacheStore<T>, Cleanable {
     @Override
     public T getCache(String key) {
         if(!exists(key)) {
-            log.debug("查询缓存键名不存在, 直接返回null.");
+            log.trace("查询缓存键名不存在, 直接返回null.");
             return null;
         }
         T result = current.getCache(key);
         if(Objects.isNull(result)) {
-            log.debug("Current缓存库未命中, 查询Parent缓存库");
+            log.trace("Current缓存库未命中, 查询Parent缓存库");
             T parentResult = parent.getCache(key);
             if(Objects.isNull(parentResult)) {
-                log.debug("Parent缓存库未命中, 缓存不存在");
+                log.trace("Parent缓存库未命中, 缓存不存在");
                 return null;
             }
-            log.debug("Parent缓存命中, 正在更新Current缓存库...");
+            log.trace("Parent缓存命中, 正在更新Current缓存库...");
             current.update(key, parentResult,
                     expireTime + (expireFloatRange <= 0 ? 0 : random.nextInt(expireFloatRange)));
-            log.debug("Current缓存库更新完成.");
+            log.trace("Current缓存库更新完成.");
             result = parentResult;
         } else {
-            log.debug("Current缓存库缓存命中.");
+            // 更新该Key的过期时间
+            current.update(key, result,
+                    expireTime + (expireFloatRange <= 0 ? 0 : random.nextInt(expireFloatRange)));
+            log.trace("Current缓存库缓存命中.");
         }
         return result;
     }
@@ -138,10 +141,14 @@ public class HotDataCacheStore<T> implements CacheStore<T>, Cleanable {
      * <p>该方法仅清理Current缓存库, 不会对上游缓存库造成影响.</p>
      */
     @Override
-    public void clean() {
-        for(String key : this.current.keys()) {
-            if(current.exists(key)) {
-                current.remove(key);
+    public void clean() throws Exception {
+        if(current instanceof Cleanable) {
+            ((Cleanable) current).clean();
+        } else {
+            for(String key : this.current.keys()) {
+                if (!current.exists(key)) {
+                    current.remove(key);
+                }
             }
         }
     }

src/main/java/net/lamgc/cgj/bot/cache/ImageCacheHandler.java

@@ -1,15 +1,15 @@
 package net.lamgc.cgj.bot.cache;
 
 import net.lamgc.cgj.bot.boot.BotGlobal;
-import net.lamgc.cgj.bot.cache.exception.HttpRequestException;
+import net.lamgc.cgj.exception.HttpRequestException;
 import net.lamgc.cgj.pixiv.PixivURL;
 import net.lamgc.cgj.util.URLs;
 import net.lamgc.utils.event.EventHandler;
-import org.apache.commons.io.IOUtils;
 import org.apache.http.HttpResponse;
 import org.apache.http.client.HttpClient;
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.tomcat.util.http.fileupload.util.Streams;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -38,7 +38,7 @@ public class ImageCacheHandler implements EventHandler {
         }
 
         try {
-            log.info("图片 {} Event正在进行...({})", event.getStoreFile().getName(), Integer.toHexString(event.hashCode()));
+            log.debug("图片 {} Event正在进行...({})", event.getStoreFile().getName(), Integer.toHexString(event.hashCode()));
             File storeFile = event.getStoreFile();
             log.debug("正在缓存图片 {} (Path: {})", storeFile.getName(), storeFile.getAbsolutePath());
             try {
@@ -66,10 +66,10 @@ public class ImageCacheHandler implements EventHandler {
                 throw requestException;
             }
 
-            log.debug("正在下载...(Content-Length: {}KB)", response.getEntity().getContentLength() / 1024);
+            log.trace("正在下载...(Content-Length: {}KB)", response.getEntity().getContentLength() / 1024);
             ByteArrayOutputStream bufferOutputStream = new ByteArrayOutputStream();
             try(FileOutputStream fileOutputStream = new FileOutputStream(storeFile)) {
-                IOUtils.copy(response.getEntity().getContent(), bufferOutputStream);
+                Streams.copy(response.getEntity().getContent(), bufferOutputStream, false);
                 ByteArrayInputStream bufferInputStream = new ByteArrayInputStream(bufferOutputStream.toByteArray());
                 CacheStoreCentral.ImageChecksum imageChecksum = CacheStoreCentral.ImageChecksum
                         .buildImageChecksumFromStream(
@@ -79,15 +79,15 @@ public class ImageCacheHandler implements EventHandler {
                                 bufferInputStream
                             );
                 bufferInputStream.reset();
-                IOUtils.copy(bufferInputStream, fileOutputStream);
-                CacheStoreCentral.setImageChecksum(imageChecksum);
+                Streams.copy(bufferInputStream, fileOutputStream, false);
+                CacheStoreCentral.getCentral().setImageChecksum(imageChecksum);
             } catch (IOException e) {
                 log.error("下载图片时发生异常", e);
                 throw e;
             }
             event.getImageCache().put(URLs.getResourceName(event.getDownloadLink()), storeFile);
         } finally {
-            log.info("图片 {} Event结束({})", event.getStoreFile().getName(), Integer.toHexString(event.hashCode()));
+            log.debug("图片 {} Event结束({})", event.getStoreFile().getName(), Integer.toHexString(event.hashCode()));
             cacheQueue.remove(event);
         }
     }

src/main/java/net/lamgc/cgj/bot/cache/ImageCacheStore.java

@@ -7,7 +7,7 @@ import com.google.gson.JsonObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import net.lamgc.cgj.bot.cache.exception.HttpRequestException;
+import net.lamgc.cgj.exception.HttpRequestException;
 
 import java.util.Hashtable;
 import java.util.Map;
@@ -66,17 +66,17 @@ public final class ImageCacheStore {
             // 置任务状态
             task.taskState.set(TaskState.RUNNING);
 
-            Throwable throwable = null;
+            Future<Throwable> future = imageCacheExecutor.submit(() -> {
+                try {
+                    handler.getImageToCache(cacheObject);
+                } catch (Throwable e) {
+                    return e;
+                }
+                return null;
+            });
+            Throwable throwable;
             try {
-                throwable = imageCacheExecutor.submit(() -> {
-                    try {
-                        handler.getImageToCache(cacheObject);
-                    } catch (Throwable e) {
-                        return e;
-                    }
-                    return null;
-                }).get();
-
+                throwable = future.get();
                 if(throwable == null) {
                     task.taskState.set(TaskState.COMPLETE);
                 } else {
@@ -84,6 +84,12 @@ public final class ImageCacheStore {
                 }
             } catch (ExecutionException e) {
                 log.error("执行图片缓存任务时发生异常", e);
+                task.taskState.set(TaskState.ERROR);
+                return e.getCause();
+            } catch (InterruptedException e) {
+                future.cancel(true);
+                task.taskState.set(TaskState.ERROR);
+                throw e;
             }
             return throwable;
         } finally {

src/main/java/net/lamgc/cgj/bot/cache/LocalHashCacheStore.java

@@ -2,10 +2,7 @@ package net.lamgc.cgj.bot.cache;
 
 import org.jetbrains.annotations.NotNull;
 
-import java.util.Date;
-import java.util.Hashtable;
-import java.util.Objects;
-import java.util.Set;
+import java.util.*;
 import java.util.concurrent.atomic.AtomicReference;
 
 /**
@@ -149,19 +146,22 @@ public class LocalHashCacheStore<T> implements CacheStore<T>, Cleanable {
     }
 
     @Override
-    public void clean() throws Exception {
+    public void clean() {
         Date currentDate = new Date();
+        Set<String> expireKeySet = new HashSet<>();
         cache.forEach((key, value) -> {
             if(value.isExpire(currentDate)) {
-                cache.remove(key);
+                expireKeySet.add(key);
             }
         });
+
+        expireKeySet.forEach(cache::remove);
     }
 
     public static class CacheObject<T> implements Comparable<CacheObject<T>> {
 
-        private AtomicReference<T> value;
-        private AtomicReference<Date> expire;
+        private final AtomicReference<T> value;
+        private final AtomicReference<Date> expire;
 
         public CacheObject(T value, Date expire) {
             this.value = new AtomicReference<>(value);

src/main/java/net/lamgc/cgj/bot/cache/RedisPoolCacheStore.java

@@ -51,27 +51,27 @@ abstract class RedisPoolCacheStore<T> implements CacheStore<T> {
 
     @Override
     public void update(String key, T value, Date expire) {
-        try (Jedis jedis = jedisPool.getResource()) {
+        executeJedisCommand(jedis -> {
             jedis.set(keyPrefix + key, parse(value));
             if(expire != null) {
                 jedis.pexpireAt(keyPrefix + key, expire.getTime());
                 log.debug("已设置Key {} 的过期时间(Expire: {})", key, expire.getTime());
             }
-        }
+        });
     }
 
     @Override
     public T getCache(String key) {
-        try (Jedis jedis = jedisPool.getResource()) {
+        return executeJedisCommand(jedis -> {
             return analysis(jedis.get(keyPrefix + key));
-        }
+        });
     }
 
     @Override
     public boolean exists(String key) {
-        try (Jedis jedis = jedisPool.getResource()) {
+        return executeJedisCommand(jedis -> {
             return jedis.exists(keyPrefix + key);
-        }
+        });
     }
 
     @Override
@@ -81,23 +81,21 @@ abstract class RedisPoolCacheStore<T> implements CacheStore<T> {
 
     @Override
     public boolean clear() {
-        try (Jedis jedis = jedisPool.getResource()) {
+        return executeJedisCommand(jedis -> {
             return jedis.flushDB().equalsIgnoreCase("ok");
-        }
+        });
     }
 
     @Override
     public Set<String> keys() {
-        try (Jedis jedis = jedisPool.getResource()) {
+        return executeJedisCommand(jedis -> {
             return jedis.keys(keyPrefix + "*");
-        }
+        });
     }
 
     @Override
     public boolean remove(String key) {
-        try (Jedis jedis = jedisPool.getResource()) {
-            return jedis.del(keyPrefix + key) == 1;
-        }
+        return executeJedisCommand(jedis -> jedis.del(keyPrefix + key) == 1);
     }
 
     /**

src/main/java/net/lamgc/cgj/bot/event/BotEventHandler.java

@@ -46,11 +46,11 @@ public class BotEventHandler implements EventHandler {
      * 消息事件执行器
      */
     private final static EventExecutor executor = new EventExecutor(new TimeLimitThreadPoolExecutor(
-            0,
+            180000, // 3minThr
             Math.max(Runtime.getRuntime().availableProcessors(), 4),
-            Math.max(Math.max(Runtime.getRuntime().availableProcessors() * 2, 4), 32),
+            Math.min(Math.max(Runtime.getRuntime().availableProcessors(), 4), 32),
             30L,
-    TimeUnit.SECONDS,
+            TimeUnit.SECONDS,
             new LinkedBlockingQueue<>(1536),
             new ThreadFactoryBuilder()
                     .setNameFormat("CommandProcess-%d")
@@ -64,17 +64,20 @@ public class BotEventHandler implements EventHandler {
      */
     public synchronized static void initial() {
         if(initialled) {
-            Logger logger = LoggerFactory.getLogger("BotEventHandler@<init>");
-            logger.warn("BotEventHandler已经执行过初始化方法, 可能存在多次执行的问题, 堆栈信息: \n {}",
+            log.warn("BotEventHandler已经执行过初始化方法, 可能存在多次执行的问题, 堆栈信息: \n {}",
                     Throwables.getStackTraceAsString(new Exception()));
             return;
         }
 
+        executor.setEnableEventResend(true);
         executor.setEventUncaughtExceptionHandler(new EventUncaughtExceptionHandler() {
-            private final Logger log = LoggerFactory.getLogger("EventUncaughtExceptionHandler");
+            private final Logger log = LoggerFactory.getLogger(this.getClass());
             @Override
             public void exceptionHandler(Thread executeThread, EventHandler handler, Method handlerMethod, EventObject event, Throwable cause) {
-                log.error("发生未捕获异常:\nThread:{}, EventHandler: {}, HandlerMethod: {}, EventObject: {}\n{}",
+                log.error("EventExecutor@{} 发生未捕获异常:\n\t" +
+                                "Thread:{}\n\tEventHandler: {}\n\tHandlerMethod: {}\n\tEventObject: {}\n" +
+                        "------------------ Stack Trace ------------------\n{}",
+                        executor.hashCode(),
                         executeThread.getName(),
                         handler.toString(),
                         handlerMethod.getName(),
@@ -88,7 +91,7 @@ public class BotEventHandler implements EventHandler {
             shutdownThread.setName("Thread-EventHandlerShutdown");
             Runtime.getRuntime().addShutdownHook(shutdownThread);
         } catch (IllegalAccessException e) {
-            LoggerFactory.getLogger("BotEventHandler@Static").error("添加Handler时发生异常", e);
+            log.error("添加Handler时发生异常", e);
         }
 
         try {
@@ -106,8 +109,6 @@ public class BotEventHandler implements EventHandler {
         runnerConfig.addStringParameterParser(new DateParser(new SimpleDateFormat("yyyy-MM-dd")));
         runnerConfig.addStringParameterParser(new PagesQualityParser());
 
-        log.debug("DateParser添加情况: {}", runnerConfig.hasStringParameterParser(Date.class));
-
         processRunner = new ArgumentsRunner(BotCommandProcess.class, runnerConfig);
         adminRunner = new ArgumentsRunner(BotAdminCommandProcess.class, runnerConfig);
 
@@ -120,20 +121,39 @@ public class BotEventHandler implements EventHandler {
      */
     @NotAccepted
     public static void executeMessageEvent(MessageEvent event) {
+        try {
+            executeMessageEvent(event, false);
+        } catch (InterruptedException e) {
+            log.error("执行时发生异常", e);
+            throw new RuntimeException(e);
+        }
+    }
+
+    /**
+     * 投递消息事件
+     * @param event 事件对象
+     * @param sync 是否同步执行事件
+     */
+    @NotAccepted
+    public static void executeMessageEvent(MessageEvent event, boolean sync) throws InterruptedException {
         String debuggerName = SettingProperties.getProperty(0, "debug.debugger");
         if(!event.getMessage().startsWith(ADMIN_COMMAND_PREFIX) &&
                 !Strings.isNullOrEmpty(debuggerName)) {
             try {
                 MessageEventExecutionDebugger debugger = MessageEventExecutionDebugger.valueOf(debuggerName.toUpperCase());
                 debugger.debugger.accept(executor, event, SettingProperties.getProperties(SettingProperties.GLOBAL),
-                                MessageEventExecutionDebugger.getDebuggerLogger(debugger));
+                        MessageEventExecutionDebugger.getDebuggerLogger(debugger));
             } catch(IllegalArgumentException e) {
                 log.warn("未找到指定调试器: '{}'", debuggerName);
             } catch (Exception e) {
                 log.error("事件调试处理时发生异常", e);
             }
         } else {
-            BotEventHandler.executor.executor(event);
+            if(sync) {
+                BotEventHandler.executor.executorSync(event);
+            } else {
+                BotEventHandler.executor.executor(event);
+            }
         }
     }
 
@@ -204,8 +224,8 @@ public class BotEventHandler implements EventHandler {
         } catch(DeveloperRunnerException e) {
             Throwable cause = e.getCause();
             if (cause instanceof InterruptedException) {
-                log.error("命令执行超时, 终止执行.");
-                result = "色图姬发现这个命令的处理时间太久了！所以打断了这个命令。";
+                log.error("命令执行超时, 终止执行.", cause);
+                result = "色图姬查阅图库太久，被赶出来了！";
             } else if(cause instanceof NoSuchElementException && cause.getMessage().startsWith("No work found: ")) {
                 String message = cause.getMessage();
                 log.error("指定作品不存在.(Id: {})", message.substring(message.lastIndexOf(": ") + 2));
@@ -219,9 +239,12 @@ public class BotEventHandler implements EventHandler {
         if(!Objects.isNull(result) && result instanceof String && !isMute(event.getFromGroup())) {
             try {
                 int sendResult = event.sendMessage((String) result);
-                if(sendResult < 0) {
+                if (sendResult < 0) {
                     log.warn("消息发送失败, Sender {} 返回错误代码: {}", event.getClass().getName(), sendResult);
                 }
+            } catch(InterruptedException e) {
+                log.info("事件在发送消息时超时, 重新投递该事件.(Event: {})", event);
+                EventExecutor.resendCurrentEvent();
             } catch (Exception e) {
                 log.error("发送消息时发生异常", e);
             }
@@ -243,6 +266,11 @@ public class BotEventHandler implements EventHandler {
         return !message.startsWith(COMMAND_PREFIX) && !message.startsWith(ADMIN_COMMAND_PREFIX);
     }
 
+    /**
+     * 查询某群组中Bot是否被禁言
+     * @param groupId 待查询的群组号
+     * @return 如果被禁言, 返回true, 如果未被禁言或禁言情况未知, 返回false
+     */
     private static boolean isMute(long groupId) {
         Boolean mute = isMute(groupId, false);
         return mute != null && mute;

src/main/java/net/lamgc/cgj/bot/event/BufferMessageEvent.java

@@ -1,70 +0,0 @@
-package net.lamgc.cgj.bot.event;
-
-import java.util.Objects;
-
-public class BufferMessageEvent extends MessageEvent {
-
-    private final StringBuffer buffer = new StringBuffer();
-
-    private final MessageEvent parent;
-
-    /**
-     * 以空消息空Id生成BufferMessageEvent
-     */
-    public BufferMessageEvent() {
-        super(0, 0, "");
-        parent = null;
-    }
-
-    /**
-     * 提供消息内容构造BufferMessageEvent
-     * @param message 传入的消息内容
-     */
-    public BufferMessageEvent(String message) {
-        super(0, 0, message);
-        parent = null;
-    }
-
-    /**
-     * 提供消息内容构和Id信息造BufferMessageEvent
-     * @param groupId 群组Id
-     * @param qqId 发送者Id
-     * @param message 传入的消息内容
-     */
-    public BufferMessageEvent(int groupId, int qqId, String message) {
-        super(groupId, qqId, message);
-        parent = null;
-    }
-
-    /**
-     * 使用事件构造BufferMessageEvent
-     * @param parentEvent 父级消息事件对象
-     */
-    public BufferMessageEvent(MessageEvent parentEvent) {
-        super(parentEvent.getFromGroup(), parentEvent.getFromQQ(), parentEvent.getMessage());
-        parent = parentEvent;
-    }
-
-    @Override
-    public int sendMessage(String message) {
-        buffer.append(message);
-        return 0;
-    }
-
-    /**
-     * 当提供了父级消息事件时, 本方法调用父级消息事件对象的{@code getImageUrl(String)}, 如果没有, 返回{@code null}
-     */
-    @Override
-    public String getImageUrl(String image) {
-        return Objects.isNull(this.parent) ? null : this.parent.getImageUrl(image);
-    }
-
-    /**
-     * 获取缓冲区消息内容
-     * @return 消息内容
-     */
-    public String getBufferMessage() {
-        return buffer.toString();
-    }
-
-}

src/main/java/net/lamgc/cgj/bot/event/BufferedMessageSender.java

@@ -0,0 +1,23 @@
+package net.lamgc.cgj.bot.event;
+
+import net.lamgc.cgj.bot.message.MessageSender;
+
+public class BufferedMessageSender implements MessageSender {
+
+    private final StringBuffer buffer = new StringBuffer();
+
+    @Override
+    public int sendMessage(String message) {
+        buffer.append(message);
+        return 0;
+    }
+
+    /**
+     * 从缓冲区中取出消息内容.
+     * @return 返回事件发送的消息内容.
+     */
+    public String getBufferContent() {
+        return buffer.toString();
+    }
+
+}

src/main/java/net/lamgc/cgj/bot/event/MessageEvent.java

@@ -57,7 +57,7 @@ public abstract class MessageEvent implements EventObject, MessageSender {
 
     @Override
     public String toString() {
-        return this.getClass().getSimpleName() + "{" +
+        return this.getClass().getSimpleName() + "@" + this.hashCode() + "{" +
                 "fromGroup=" + getFromGroup() +
                 ", fromQQ=" + getFromQQ() +
                 ", message='" + getMessage() + '\'' +

src/main/java/net/lamgc/cgj/bot/framework/cli/ConsoleMain.java

@@ -2,23 +2,36 @@ package net.lamgc.cgj.bot.framework.cli;
 
 import net.lamgc.cgj.bot.boot.ApplicationBoot;
 import net.lamgc.cgj.bot.event.BotEventHandler;
+import net.lamgc.cgj.bot.framework.cli.message.ConsoleMessageEvent;
+import net.lamgc.cgj.bot.framework.cli.message.ConsoleMessageSenderFactory;
 import net.lamgc.cgj.bot.message.MessageSenderBuilder;
+import org.jline.reader.LineReader;
+import org.jline.reader.LineReaderBuilder;
+import org.jline.reader.impl.history.DefaultHistory;
+import org.jline.terminal.TerminalBuilder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
-import java.util.Scanner;
+import java.io.IOException;
 
 public class ConsoleMain {
 
-    public static void start() {
+    private final static Logger log = LoggerFactory.getLogger(ConsoleMain.class);
+
+    public static void start() throws IOException {
         MessageSenderBuilder.setCurrentMessageSenderFactory(new ConsoleMessageSenderFactory());
         ApplicationBoot.initialBot();
-        Scanner scanner = new Scanner(System.in);
-        System.out.print("会话QQ:");
-        long qqId = scanner.nextLong();
-        System.out.print("会话群组号:");
-        long groupId = scanner.nextLong();
+        LineReader lineReader = LineReaderBuilder.builder()
+                .appName("CGJ")
+                .history(new DefaultHistory())
+                .terminal(TerminalBuilder.terminal())
+                .build();
+
+        long qqId = Long.parseLong(lineReader.readLine("会话QQ: "));
+        long groupId = Long.parseLong(lineReader.readLine("会话群组号:"));
         boolean isGroup = false;
         do {
-            String input = scanner.nextLine();
+            String input = lineReader.readLine("App " + qqId + (isGroup ? "@" + groupId : "#private") + " >");
             if(input.equalsIgnoreCase("#exit")) {
                 System.out.println("退出应用...");
                 break;
@@ -27,7 +40,11 @@ public class ConsoleMain {
                 System.out.println("System: 群模式状态已变更: " + isGroup);
                 continue;
             }
-            BotEventHandler.executeMessageEvent(new ConsoleMessageEvent(isGroup ? groupId : 0, qqId, input));
+            try {
+                BotEventHandler.executeMessageEvent(new ConsoleMessageEvent(isGroup ? groupId : 0, qqId, input), true);
+            } catch (InterruptedException e) {
+                log.error("执行时发生中断", e);
+            }
         } while(true);
     }
 

src/main/java/net/lamgc/cgj/bot/framework/cli/ConsoleMessageEvent.java

@@ -1,23 +0,0 @@
-package net.lamgc.cgj.bot.framework.cli;
-
-import net.lamgc.cgj.bot.event.MessageEvent;
-
-import java.util.Date;
-
-public class ConsoleMessageEvent extends MessageEvent {
-
-    public ConsoleMessageEvent(long groupId, long qqId, String message) {
-        super(groupId, qqId, message);
-    }
-
-    @Override
-    public int sendMessage(String message) {
-        System.out.println(new Date() + " Bot: " + message);
-        return 0;
-    }
-
-    @Override
-    public String getImageUrl(String image) {
-        return null;
-    }
-}

src/main/java/net/lamgc/cgj/bot/framework/cli/ConsoleMessageSender.java

@@ -1,13 +0,0 @@
-package net.lamgc.cgj.bot.framework.cli;
-
-import net.lamgc.cgj.bot.message.MessageSender;
-
-import java.util.Date;
-
-public class ConsoleMessageSender implements MessageSender {
-    @Override
-    public synchronized int sendMessage(String message) {
-        System.out.println(new Date() + " Bot: " + message);
-        return 0;
-    }
-}

src/main/java/net/lamgc/cgj/bot/framework/cli/message/ConsoleMessageEvent.java

@@ -0,0 +1,29 @@
+package net.lamgc.cgj.bot.framework.cli.message;
+
+import net.lamgc.cgj.bot.event.MessageEvent;
+import net.lamgc.cgj.bot.message.MessageSenderBuilder;
+import net.lamgc.cgj.bot.message.MessageSource;
+
+public class ConsoleMessageEvent extends MessageEvent {
+
+    public ConsoleMessageEvent(long groupId, long qqId, String message) {
+        super(groupId, qqId, message);
+    }
+
+    @Override
+    public int sendMessage(String message) throws Exception {
+        if(getFromGroup() <= 0) {
+            return MessageSenderBuilder
+                    .getMessageSender(MessageSource.PRIVATE, getFromQQ()).sendMessage(message);
+        } else {
+            return MessageSenderBuilder
+                    .getMessageSender(MessageSource.GROUP, getFromQQ()).sendMessage(message);
+        }
+
+    }
+
+    @Override
+    public String getImageUrl(String image) {
+        return null;
+    }
+}

src/main/java/net/lamgc/cgj/bot/framework/cli/message/ConsoleMessageSender.java

@@ -0,0 +1,26 @@
+package net.lamgc.cgj.bot.framework.cli.message;
+
+import net.lamgc.cgj.bot.message.MessageSender;
+import net.lamgc.cgj.bot.message.MessageSource;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+public class ConsoleMessageSender implements MessageSender {
+
+    private final static SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
+    private final MessageSource source;
+    private final long id;
+
+    ConsoleMessageSender(MessageSource source, long id) {
+        this.source = source;
+        this.id = id;
+    }
+
+    @Override
+    public synchronized int sendMessage(String message) {
+        System.out.println(dateFormat.format(new Date()) + " Bot -> " +
+                (source == MessageSource.PRIVATE ? "#"  : "@") + id + ": " + message);
+        return 0;
+    }
+}

src/main/java/net/lamgc/cgj/bot/framework/cli/message/ConsoleMessageSenderFactory.java

@@ -1,4 +1,4 @@
-package net.lamgc.cgj.bot.framework.cli;
+package net.lamgc.cgj.bot.framework.cli.message;
 
 import net.lamgc.cgj.bot.message.MessageSender;
 import net.lamgc.cgj.bot.message.MessageSenderFactory;
@@ -6,10 +6,8 @@ import net.lamgc.cgj.bot.message.MessageSource;
 
 public class ConsoleMessageSenderFactory implements MessageSenderFactory {
 
-    private final static ConsoleMessageSender sender = new ConsoleMessageSender();
-
     @Override
     public MessageSender createMessageSender(MessageSource source, long id) {
-        return sender;
+        return new ConsoleMessageSender(source, id);
     }
 }

src/main/java/net/lamgc/cgj/bot/framework/coolq/message/SpringCQMessageEvent.java

@@ -26,13 +26,13 @@ public class SpringCQMessageEvent extends MessageEvent {
         this.cq = Objects.requireNonNull(cq);
         MessageSource source;
         if(messageEvent instanceof CQGroupMessageEvent) {
-            source = MessageSource.Group;
+            source = MessageSource.GROUP;
         } else if (messageEvent instanceof CQDiscussMessageEvent) {
-            source = MessageSource.Discuss;
+            source = MessageSource.DISCUSS;
         } else {
-            source = MessageSource.Private;
+            source = MessageSource.PRIVATE;
         }
-        messageSender = new SpringCQMessageSender(cq, source, source == MessageSource.Private ? getFromQQ() : getFromGroup());
+        messageSender = new SpringCQMessageSender(cq, source, source == MessageSource.PRIVATE ? getFromQQ() : getFromGroup());
     }
 
     @Override

src/main/java/net/lamgc/cgj/bot/framework/coolq/message/SpringCQMessageSender.java

@@ -6,9 +6,9 @@ import net.lz1998.cq.robot.CoolQ;
 
 public class SpringCQMessageSender implements MessageSender {
 
-    private CoolQ coolQ;
-    private MessageSource source;
-    private long target;
+    private final CoolQ coolQ;
+    private final MessageSource source;
+    private final long target;
 
     public SpringCQMessageSender(CoolQ coolQ, MessageSource source, long target) {
         this.coolQ = coolQ;
@@ -19,11 +19,11 @@ public class SpringCQMessageSender implements MessageSender {
     @Override
     public int sendMessage(String message) {
         switch (source) {
-            case Private:
+            case PRIVATE:
                 return coolQ.sendPrivateMsg(target, message, false).getData().getMessageId();
-            case Group:
+            case GROUP:
                 return coolQ.sendGroupMsg(target, message, false).getData().getMessageId();
-            case Discuss:
+            case DISCUSS:
                 return coolQ.sendDiscussMsg(target, message, false).getData().getMessageId();
             default:
                 return -1;

src/main/java/net/lamgc/cgj/bot/framework/mirai/MiraiMain.java

@@ -4,20 +4,24 @@ import net.lamgc.cgj.bot.boot.ApplicationBoot;
 import net.lamgc.cgj.bot.boot.BotGlobal;
 import net.lamgc.cgj.bot.event.BotEventHandler;
 import net.lamgc.cgj.bot.framework.mirai.message.MiraiMessageEvent;
-import net.lamgc.cgj.bot.message.MessageSenderBuilder;
 import net.lamgc.cgj.bot.framework.mirai.message.MiraiMessageSenderFactory;
+import net.lamgc.cgj.bot.message.MessageSenderBuilder;
 import net.mamoe.mirai.Bot;
 import net.mamoe.mirai.BotFactoryJvm;
 import net.mamoe.mirai.event.events.BotMuteEvent;
 import net.mamoe.mirai.event.events.BotUnmuteEvent;
 import net.mamoe.mirai.japt.Events;
-import net.mamoe.mirai.message.*;
+import net.mamoe.mirai.message.FriendMessageEvent;
+import net.mamoe.mirai.message.GroupMessageEvent;
+import net.mamoe.mirai.message.MessageEvent;
+import net.mamoe.mirai.message.TempMessageEvent;
 import net.mamoe.mirai.utils.BotConfiguration;
-import org.apache.commons.net.util.Base64;
+import net.mamoe.mirai.utils.Utils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.*;
+import java.util.Base64;
 import java.util.Properties;
 
 public class MiraiMain implements Closeable {
@@ -45,9 +49,26 @@ public class MiraiMain implements Closeable {
             return;
         }
 
+        Utils.setDefaultLogger(MiraiToSlf4jLoggerAdapter::new);
         BotConfiguration configuration = new BotConfiguration();
+        configuration.randomDeviceInfo();
         configuration.setProtocol(BotConfiguration.MiraiProtocol.ANDROID_PAD);
-        bot = BotFactoryJvm.newBot(Long.parseLong(botProperties.getProperty("bot.qq", "0")), Base64.decodeBase64(botProperties.getProperty("bot.password", "")), configuration);
+
+        // 心跳包周期间隔 (ms)
+        configuration.setHeartbeatPeriodMillis(
+                Long.parseLong(botProperties.getProperty("network.heartbeatPeriodMillis", "60000")));
+        // 心跳包超时时间 (ms)
+        configuration.setHeartbeatTimeoutMillis(
+                Long.parseLong(botProperties.getProperty("network.heartbeatTimeoutMillis", "5000")));
+        // 重连间隔时间
+        configuration.setReconnectPeriodMillis(
+                Integer.parseInt(botProperties.getProperty("network.reconnectPeriodMillis", "5")));
+        // 重连最大次数
+        configuration.setReconnectionRetryTimes(
+                Integer.parseInt(botProperties.getProperty("network.reconnectionRetryTimes", "10")));
+
+        bot = BotFactoryJvm.newBot(Long.parseLong(botProperties.getProperty("bot.qq", "0")),
+                Base64.getDecoder().decode(botProperties.getProperty("bot.password", "")), configuration);
         Events.subscribeAlways(GroupMessageEvent.class, this::executeMessageEvent);
         Events.subscribeAlways(FriendMessageEvent.class, this::executeMessageEvent);
         Events.subscribeAlways(TempMessageEvent.class, this::executeMessageEvent);
@@ -66,6 +87,7 @@ public class MiraiMain implements Closeable {
      * @param message 消息事件对象
      */
     private void executeMessageEvent(MessageEvent message) {
+        log.debug("Mirai Message: {}", message);
         if(message instanceof GroupMessageEvent) {
             GroupMessageEvent GroupMessageEvent = (GroupMessageEvent) message;
             if(BotEventHandler.isMute(GroupMessageEvent.getGroup().getId(), true) == null) {

src/main/java/net/lamgc/cgj/bot/framework/mirai/MiraiToSlf4jLoggerAdapter.java

@@ -0,0 +1,89 @@
+package net.lamgc.cgj.bot.framework.mirai;
+
+import net.mamoe.mirai.utils.MiraiLogger;
+import net.mamoe.mirai.utils.MiraiLoggerPlatformBase;
+import org.jetbrains.annotations.Nullable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.Marker;
+import org.slf4j.MarkerFactory;
+
+/**
+ * MiraiLoggerToSlf4jLogger适配器
+ * <p>该Logger通过Slf4j的Marker进行标识, loggerName为{@code mirai.[identity]}</p>
+ * <p>由于适配器适配方式的原因, 日志输出的调用信息将不可用(调用指向了适配器内的方法);</p>
+ */
+public class MiraiToSlf4jLoggerAdapter extends MiraiLoggerPlatformBase {
+    
+    private final static Marker marker = MarkerFactory.getMarker("mirai");
+
+    private final Logger logger;
+
+    private final String identity;
+
+    public MiraiToSlf4jLoggerAdapter(String identity) {
+        this.identity = identity;
+        this.logger = LoggerFactory.getLogger("mirai." + identity);
+    }
+
+    @Override
+    protected void debug0(@Nullable String s) {
+        logger.debug(marker, s);
+    }
+
+    @Override
+    protected void debug0(@Nullable String s, @Nullable Throwable throwable) {
+        logger.debug(marker, s, throwable);
+    }
+
+    @Override
+    protected void error0(@Nullable String s) {
+        logger.error(marker, s);
+    }
+
+    @Override
+    protected void error0(@Nullable String s, @Nullable Throwable throwable) {
+        logger.error(marker, s, throwable);
+    }
+
+    @Override
+    protected void info0(@Nullable String s) {
+        logger.info(marker, s);
+    }
+
+    @Override
+    protected void info0(@Nullable String s, @Nullable Throwable throwable) {
+        logger.info(marker, s, throwable);
+    }
+
+    @Override
+    protected void verbose0(@Nullable String s) {
+        logger.trace(marker, s);
+    }
+
+    @Override
+    protected void verbose0(@Nullable String s, @Nullable Throwable throwable) {
+        logger.trace(marker, s, throwable);
+    }
+
+    @Override
+    protected void warning0(@Nullable String s) {
+        logger.warn(marker, s);
+    }
+
+    @Override
+    protected void warning0(@Nullable String s, @Nullable Throwable throwable) {
+        logger.warn(marker, s, throwable);
+    }
+
+    @Nullable
+    @Override
+    public String getIdentity() {
+        if(identity == null) {
+            MiraiLogger followerLogger = getFollower();
+            return followerLogger == null ? null : followerLogger.getIdentity();
+        } else {
+            return identity;
+        }
+    }
+}

src/main/java/net/lamgc/cgj/bot/framework/mirai/message/MiraiMessageEvent.java

@@ -28,9 +28,9 @@ public class MiraiMessageEvent extends net.lamgc.cgj.bot.event.MessageEvent {
                 message.getSender().getId(), getMessageBodyWithoutSource(message.getMessage().toString()));
         this.messageObject = Objects.requireNonNull(message);
         if(message instanceof GroupMessageEvent) {
-            messageSender = new MiraiMessageSender(((GroupMessageEvent) message).getGroup(), MessageSource.Group);
+            messageSender = new MiraiMessageSender(((GroupMessageEvent) message).getGroup(), MessageSource.GROUP);
         } else {
-            messageSender = new MiraiMessageSender(message.getSender(), MessageSource.Private);
+            messageSender = new MiraiMessageSender(message.getSender(), MessageSource.PRIVATE);
         }
     }
 
@@ -45,9 +45,9 @@ public class MiraiMessageEvent extends net.lamgc.cgj.bot.event.MessageEvent {
         super(groupId, qqId, getMessageBodyWithoutSource(message.toString()));
         this.messageObject = Objects.requireNonNull(messageObject, "messageObject is null");
         if(groupId != 0) {
-            this.messageSender = new MiraiMessageSender(((GroupMessageEvent) messageObject).getGroup(), MessageSource.Group);
+            this.messageSender = new MiraiMessageSender(((GroupMessageEvent) messageObject).getGroup(), MessageSource.GROUP);
         } else {
-            this.messageSender = new MiraiMessageSender(messageObject.getSender(), MessageSource.Group);
+            this.messageSender = new MiraiMessageSender(messageObject.getSender(), MessageSource.GROUP);
         }
     }
 

src/main/java/net/lamgc/cgj/bot/framework/mirai/message/MiraiMessageSender.java

@@ -40,7 +40,7 @@ public class MiraiMessageSender implements MessageSender {
      * @throws NoSuchElementException 当在机器人好友列表或群列表里没有这个好友或群的时候抛出
      */
     public MiraiMessageSender(Bot bot, MessageSource source, long id) {
-        this(source == MessageSource.Private ? bot.getFriend(id) : bot.getGroup(id), source);
+        this(source == MessageSource.PRIVATE ? bot.getFriend(id) : bot.getGroup(id), source);
     }
 
     /**
@@ -134,6 +134,7 @@ public class MiraiMessageSender implements MessageSender {
      * @param code 图片BotCode
      * @return Image对象
      */
+    @SuppressWarnings("SynchronizationOnLocalVariableOrMethodParameter")
     public Image uploadImage(BotCode code) {
         log.debug("传入BotCode信息:\n{}", code);
         String absolutePath = code.getParameter("absolutePath");
@@ -150,7 +151,7 @@ public class MiraiMessageSender implements MessageSender {
                 synchronized (imageName) {
                     if(!imageIdCache.exists(imageName) ||
                             Strings.nullToEmpty(code.getParameter("updateCache")) .equalsIgnoreCase("true")) {
-                        log.debug("imageName [{}] 缓存失效或强制更新, 正在更新缓存...", imageName);
+                        log.trace("imageName [{}] 缓存失效或强制更新, 正在更新缓存...", imageName);
                         image = uploadImage0(new File(absolutePath));
                         String cacheExpireAt;
                         long expireTime = 864000000; // 10d
@@ -162,13 +163,13 @@ public class MiraiMessageSender implements MessageSender {
                             }
                         }
                         imageIdCache.update(imageName, image.getImageId(), expireTime);
-                        log.debug("imageName [{}] 缓存更新完成.(有效时间: {})", imageName, expireTime);
+                        log.trace("imageName [{}] 缓存更新完成.(有效时间: {})", imageName, expireTime);
                     } else {
-                        log.debug("ImageName: [{}] 缓存命中.", imageName);
+                        log.trace("ImageName: [{}] 缓存命中.", imageName);
                     }
                 }
             } else {
-                log.debug("ImageName: [{}] 缓存命中.", imageName);
+                log.trace("ImageName: [{}] 缓存命中.", imageName);
             }
 
             if(image == null) {

src/main/java/net/lamgc/cgj/bot/message/MessageSource.java

@@ -7,17 +7,17 @@ public enum MessageSource {
     /**
      * 私聊消息
      */
-    Private,
+    PRIVATE,
     /**
      * 群组消息
      */
-    Group,
+    GROUP,
     /**
      * 讨论组消息
      */
-    Discuss,
+    DISCUSS,
     /**
      * 未知来源
      */
-    Unknown
+    UNKNOWN
 }

src/main/java/net/lamgc/cgj/bot/sort/PreLoadDataAttribute.java

@@ -0,0 +1,41 @@
+package net.lamgc.cgj.bot.sort;
+
+@SuppressWarnings("unused")
+public enum PreLoadDataAttribute {
+    /**
+     * 按点赞数排序
+     */
+    LIKE("likeCount"),
+
+    /**
+     * 按页面数排序
+     */
+    PAGE("pageCount"),
+
+    /**
+     * 按收藏数排序
+     */
+    BOOKMARK("bookmarkCount"),
+
+    /**
+     * 按评论数排序
+     */
+    COMMENT("commentCount"),
+
+    /**
+     * 不明
+     */
+    RESPONSE("responseCount"),
+
+    /**
+     * 按查看次数排序
+     */
+    VIEW("viewCount"),
+    ;
+
+    public final String attrName;
+
+    PreLoadDataAttribute(String attrName) {
+        this.attrName = attrName;
+    }
+}

src/main/java/net/lamgc/cgj/bot/sort/PreLoadDataAttributeComparator.java

@@ -3,6 +3,8 @@ package net.lamgc.cgj.bot.sort;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import net.lamgc.cgj.bot.cache.CacheStoreCentral;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 import java.util.Comparator;
@@ -10,11 +12,13 @@ import java.util.Comparator;
 /**
  * 收藏数比较器
  */
-public class PreLoadDataComparator implements Comparator<JsonElement> {
+public class PreLoadDataAttributeComparator implements Comparator<JsonElement> {
 
-    private final Attribute attribute;
+    private final static Logger log = LoggerFactory.getLogger(PreLoadDataAttributeComparator.class);
 
-    public PreLoadDataComparator(Attribute attribute) {
+    private final PreLoadDataAttribute attribute;
+
+    public PreLoadDataAttributeComparator(PreLoadDataAttribute attribute) {
         this.attribute = attribute;
     }
 
@@ -39,57 +43,17 @@ public class PreLoadDataComparator implements Comparator<JsonElement> {
             }
         }
         try {
-            JsonObject illustPreLoadData1 =
-                    CacheStoreCentral.getIllustPreLoadData(o1.getAsJsonObject().get("illustId").getAsInt(), false);
-            JsonObject illustPreLoadData2 =
-                    CacheStoreCentral.getIllustPreLoadData(o2.getAsJsonObject().get("illustId").getAsInt(), false);
+            JsonObject illustPreLoadData1 = CacheStoreCentral.getCentral()
+                    .getIllustPreLoadData(o1.getAsJsonObject().get("illustId").getAsInt(), false);
+            JsonObject illustPreLoadData2 = CacheStoreCentral.getCentral()
+                    .getIllustPreLoadData(o2.getAsJsonObject().get("illustId").getAsInt(), false);
             return Integer.compare(
                     illustPreLoadData2.get(attribute.attrName).getAsInt(),
                     illustPreLoadData1.get(attribute.attrName).getAsInt());
         } catch (IOException e) {
-            e.printStackTrace();
+            log.error("获取预加载数据失败", e);
             return 0;
         }
     }
 
-    public enum Attribute {
-        /**
-         * 按点赞数排序
-         */
-        LIKE("likeCount"),
-
-        /**
-         * 按页面数排序
-         */
-        PAGE("pageCount"),
-
-        /**
-         * 按收藏数排序
-         */
-        BOOKMARK("bookmarkCount"),
-
-        /**
-         * 按评论数排序
-         */
-        COMMENT("commentCount"),
-
-        /**
-         * 不明
-         */
-        RESPONSE("responseCount"),
-
-        /**
-         * 按查看次数排序
-         */
-        VIEW("viewCount"),
-        ;
-
-        public final String attrName;
-
-        Attribute(String attrName) {
-            this.attrName = attrName;
-        }
-    }
-
-
 }

src/main/java/net/lamgc/cgj/exception/HttpRequestException.java

@@ -1,4 +1,4 @@
-package net.lamgc.cgj.bot.cache.exception;
+package net.lamgc.cgj.exception;
 
 import java.io.IOException;
 import java.util.Objects;

src/main/java/net/lamgc/cgj/pixiv/PixivDownload.java

@@ -6,6 +6,7 @@ import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.reflect.TypeToken;
 import io.netty.handler.codec.http.HttpHeaderNames;
+import net.lamgc.cgj.exception.HttpRequestException;
 import org.apache.http.Header;
 import org.apache.http.HttpHost;
 import org.apache.http.HttpRequest;
@@ -31,6 +32,7 @@ import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.BiConsumer;
 
+@SuppressWarnings("ALL")
 public class PixivDownload {
 
     private final static Logger log = LoggerFactory.getLogger(PixivDownload.class);
@@ -115,10 +117,10 @@ public class PixivDownload {
                 }
             }
         } while(!document.select(".pager-container>.next").isEmpty());
-        log.debug("获取完成.");
+        log.trace("获取完成.");
         AtomicInteger count = new AtomicInteger(1);
         linkList.forEach(link -> {
-            log.debug("Next Link [{}]: {}", count.getAndIncrement(), link);
+            log.trace("Next Link [{}]: {}", count.getAndIncrement(), link);
             InputStream imageInputStream = null;
             int tryCount = 0;
             do {
@@ -133,9 +135,9 @@ public class PixivDownload {
             } while(imageInputStream == null);
 
             try(InputStream imageInput = new BufferedInputStream(imageInputStream, 256 * 1024)) {
-                log.debug("调用回调方法...");
+                log.trace("调用回调方法...");
                 fn.accept(link, imageInput);
-                log.debug("回调方法调用完成.");
+                log.trace("回调方法调用完成.");
             } catch (IOException e) {
                 log.error("图片获取失败", e);
             }
@@ -219,8 +221,8 @@ public class PixivDownload {
             int authorId = rankInfo.get("user_id").getAsInt();
             String authorName = rankInfo.get("user_name").getAsString();
             String title = rankInfo.get("title").getAsString();
-            log.debug("当前到第 {}/{} 名(总共 {} 名), IllustID: {}, Author: ({}) {}, Title: {}", rank, rankStart + range - 1, range, illustId, authorId, authorName, title);
-            log.debug("正在获取PagesLink...");
+            log.trace("当前到第 {}/{} 名(总共 {} 名), IllustID: {}, Author: ({}) {}, Title: {}", rank, rankStart + range - 1, range, illustId, authorId, authorName, title);
+            log.trace("正在获取PagesLink...");
             List<String> linkList;
             try {
                 linkList = getIllustAllPageDownload(httpClient, this.cookieStore, illustId, quality);
@@ -235,14 +237,14 @@ public class PixivDownload {
             log.debug("PagesLink 获取完成, 总数: {}", linkList.size());
             for (int pageIndex = 0; pageIndex < linkList.size(); pageIndex++) {
                 String downloadLink = linkList.get(pageIndex);
-                log.debug("当前Page: {}/{}", pageIndex + 1, linkList.size());
+                log.trace("当前Page: {}/{}", pageIndex + 1, linkList.size());
                 try(InputStream imageInputStream = new BufferedInputStream(getImageAsInputStream(HttpClientBuilder.create().build(), downloadLink), 256 * 1024)) {
                     fn.download(rank, downloadLink, rankInfo.deepCopy(), imageInputStream);
                 } catch(IOException e) {
                     log.error("下载插画时发生异常", e);
                     return;
                 }
-                log.debug("完成.");
+                log.trace("完成.");
             }
         });
     }
@@ -265,7 +267,7 @@ public class PixivDownload {
             int authorId = rankInfo.get("user_id").getAsInt();
             String authorName = rankInfo.get("user_name").getAsString();
             String title = rankInfo.get("title").getAsString();
-            log.debug("Array-当前到第 {}/{} 名(总共 {} 名), IllustID: {}, Author: ({}) {}, Title: {}", rank, rankStart + range, range, illustId, authorId, authorName, title);
+            log.trace("Array-当前到第 {}/{} 名(总共 {} 名), IllustID: {}, Author: ({}) {}, Title: {}", rank, rankStart + range, range, illustId, authorId, authorName, title);
             results.add(rankInfo);
         }
         log.debug("JsonArray读取完成.");
@@ -320,12 +322,12 @@ public class PixivDownload {
         boolean canNext = true;
         for (int pageIndex = startPages; canNext && pageIndex <= endPages && count < range; pageIndex++) {
             HttpGet request = createHttpGetRequest(PixivURL.getRankingLink(contentType, mode, time, pageIndex, true));
-            log.debug("RequestUri: {}", request.getURI());
+            log.trace("RequestUri: {}", request.getURI());
             HttpResponse response = httpClient.execute(request);
             String responseBody = EntityUtils.toString(response.getEntity());
-            log.debug("ResponseBody: {}", responseBody);
+            log.trace("ResponseBody: {}", responseBody);
             if(response.getStatusLine().getStatusCode() != 200) {
-                throw new IOException("Http Response Error: '" + response.getStatusLine() + "', ResponseBody: '" + responseBody + '\'');
+                throw new HttpRequestException(response.getStatusLine(), responseBody);
             }
 
             JsonObject resultObject = gson.fromJson(responseBody, JsonObject.class);
@@ -352,7 +354,7 @@ public class PixivDownload {
         HttpResponse response = httpClient.execute(request);
 
         if(response.getStatusLine().getStatusCode() != 200) {
-            throw new IOException("Http响应码非200: " + response.getStatusLine());
+            throw new HttpRequestException(response);
         }
 
         Document document = Jsoup.parse(EntityUtils.toString(response.getEntity()));
@@ -399,8 +401,8 @@ public class PixivDownload {
 
         if(resultObject.get("error").getAsBoolean()) {
             String message = resultObject.get("message").getAsString();
-            log.debug("请求错误, 错误信息: {}", message);
-            throw new IOException(message);
+            log.warn("作品页面接口请求错误, 错误信息: {}", message);
+            throw new HttpRequestException(response);
         }
 
         JsonArray linkArray = resultObject.getAsJsonArray("body");
@@ -473,9 +475,11 @@ public class PixivDownload {
         request.addHeader(HttpHeaderNames.REFERER.toString(), referer);
 
         HttpResponse response = httpClient.execute(request);
-        log.debug("response: {}", response);
-        log.debug("Content Length: {}KB", Float.parseFloat(response.getFirstHeader(HttpHeaderNames.CONTENT_LENGTH.toString()).getValue()) / 1024F);
-        log.debug("{}", response.getFirstHeader(HttpHeaderNames.CONTENT_TYPE.toString()));
+        log.trace("response: {}", response);
+        log.trace("Content Length: {}KB",
+                Float.parseFloat(response.getFirstHeader(HttpHeaderNames.CONTENT_LENGTH.toString()).getValue()) / 1024F
+        );
+        log.trace(response.getFirstHeader(HttpHeaderNames.CONTENT_TYPE.toString()).toString());
         return response.getEntity().getContent();
     }
 
@@ -496,51 +500,12 @@ public class PixivDownload {
         } else {
             return false;
         }
-
     }
 
     /**
      * 获取作品信息
      * @param illustId 作品ID
-     * @return 成功获取返回JsonObject, 失败返回null, <br/>
-     *      Json示例: <br/>
-     *      <pre>
-     *          {
-     *         "illustId": "79584670",
-     *         "illustTitle": "このヤンキーはウブすぎる",
-     *         "id": "79584670",
-     *         "title": "このヤンキーはウブすぎる",
-     *         "illustType": 1,
-     *         "xRestrict": 0,
-     *         "restrict": 0,
-     *         "sl": 2,
-     *         "url": "https://i.pximg.net/c/360x360_70/img-master/img/2020/02/19/00/38/23/79584670_p0_square1200.jpg",
-     *         "description": "",
-     *         "tags": [
-     *           "漫画",
-     *           "オリジナル",
-     *           "創作",
-     *           "創作男女",
-     *           "コロさん、ポリさん此方です!",
-     *           "恋の予感",
-     *           "あまずっぺー",
-     *           "交換日記",
-     *           "続編希望!!",
-     *           "オリジナル10000users入り"
-     *         ],
-     *         "userId": "4778293",
-     *         "userName": "隈浪さえ",
-     *         "width": 3288,
-     *         "height": 4564,
-     *         "pageCount": 4,
-     *         "isBookmarkable": true,
-     *         "bookmarkData": null,
-     *         "alt": "#オリジナル このヤンキーはウブすぎる - 隈浪さえ的漫画",
-     *         "isAdContainer": false,
-     *         "profileImageUrl": "https://i.pximg.net/user-profile/img/2019/12/04/18/56/19/16639046_fea29ce38ea89b0cb2313b40b3a72f9a_50.jpg",
-     *         "type": "illust"
-     *       }
-     *      </pre>
+     * @return 成功获取返回JsonObject, 失败返回null.
      * @throws IOException 当请求发生异常, 或接口返回错误信息时抛出.
      * @throws NoSuchElementException 当该作品不存在时抛出异常
      */
@@ -548,11 +513,11 @@ public class PixivDownload {
         HttpGet request = createHttpGetRequest(PixivURL.getPixivIllustInfoAPI(illustId));
         HttpResponse response = httpClient.execute(request);
         String responseStr = EntityUtils.toString(response.getEntity());
-        log.debug("Response Content: {}", responseStr);
+        log.trace("Response Content: {}", responseStr);
         JsonObject responseObj = new Gson().fromJson(responseStr, JsonObject.class);
 
         if(responseObj.get("error").getAsBoolean()) {
-            throw new IOException(responseObj.get("message").getAsString());
+            throw new HttpRequestException(response.getStatusLine(), responseStr);
         }
 
         JsonArray illustsArray = responseObj.getAsJsonObject("body").getAsJsonArray("illusts");

src/main/java/net/lamgc/cgj/pixiv/PixivSearchLinkBuilder.java

@@ -15,8 +15,8 @@ import java.util.Objects;
  * @author LamGC
  * @see PixivURL#PIXIV_SEARCH_CONTENT_URL
  */
-@SuppressWarnings("ALL")
-public class PixivSearchBuilder {
+@SuppressWarnings("unused")
+public class PixivSearchLinkBuilder {
 
     private final String content;
 
@@ -26,8 +26,8 @@ public class PixivSearchBuilder {
     private SearchOrder searchOrder = SearchOrder.DATE_D;
     private SearchContentOption searchContentOption = SearchContentOption.ALL;
 
-    private HashSet<String> includeKeywords = new HashSet<>(0);
-    private HashSet<String> excludeKeywords = new HashSet<>(0);
+    private final HashSet<String> includeKeywords = new HashSet<>(0);
+    private final HashSet<String> excludeKeywords = new HashSet<>(0);
 
     private int page = 1;
 
@@ -42,7 +42,7 @@ public class PixivSearchBuilder {
     private Date startDate = null;
     private Date endDate = null;
 
-    public PixivSearchBuilder(String searchContent) {
+    public PixivSearchLinkBuilder(String searchContent) {
         this.content = Objects.requireNonNull(searchContent);
     }
 
@@ -99,7 +99,7 @@ public class PixivSearchBuilder {
     public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
-        PixivSearchBuilder that = (PixivSearchBuilder) o;
+        PixivSearchLinkBuilder that = (PixivSearchLinkBuilder) o;
         return page == that.page &&
                 wgt == that.wgt &&
                 hgt == that.hgt &&
@@ -141,7 +141,7 @@ public class PixivSearchBuilder {
 
     @Override
     public String toString() {
-        return "PixivSearchBuilder{" +
+        return "PixivSearchLinkBuilder{" +
                 "content='" + content + '\'' +
                 ", searchArea=" + searchArea +
                 ", searchMode=" + searchMode +
@@ -161,19 +161,11 @@ public class PixivSearchBuilder {
                 '}';
     }
 
-    public PixivSearchBuilder setSearchArea(SearchArea searchArea) {
+    public PixivSearchLinkBuilder setSearchArea(SearchArea searchArea) {
         this.searchArea = Objects.requireNonNull(searchArea);
         return this;
     }
 
-    /**
-     * 获取搜索区域
-     * @return 返回搜索区域对象
-     */
-    public SearchArea getSearchArea() {
-        return searchArea;
-    }
-
     /**
      * 获取搜索条件.
      * @return 搜索条件内容
@@ -202,50 +194,50 @@ public class PixivSearchBuilder {
         return searchContent.toString();
     }
 
-    public PixivSearchBuilder setSearchMode(SearchMode searchMode) {
+    public PixivSearchLinkBuilder setSearchMode(SearchMode searchMode) {
         this.searchMode = Objects.requireNonNull(searchMode);
         return this;
     }
 
-    public PixivSearchBuilder setSearchType(SearchType searchType) {
+    public PixivSearchLinkBuilder setSearchType(SearchType searchType) {
         this.searchType = Objects.requireNonNull(searchType);
         return this;
     }
 
-    public PixivSearchBuilder setSearchOrder(SearchOrder searchOrder) {
+    public PixivSearchLinkBuilder setSearchOrder(SearchOrder searchOrder) {
         this.searchOrder = Objects.requireNonNull(searchOrder);
         return this;
     }
 
-    public PixivSearchBuilder setSearchContentOption(SearchContentOption searchContentOption) {
+    public PixivSearchLinkBuilder setSearchContentOption(SearchContentOption searchContentOption) {
         this.searchContentOption = Objects.requireNonNull(searchContentOption);
         return this;
     }
 
-    public PixivSearchBuilder setRatioOption(RatioOption ratioOption) {
+    public PixivSearchLinkBuilder setRatioOption(RatioOption ratioOption) {
         this.ratioOption = Objects.requireNonNull(ratioOption);
         return this;
     }
 
-    public PixivSearchBuilder setDateRange(Date startDate, Date endDate) {
+    public PixivSearchLinkBuilder setDateRange(Date startDate, Date endDate) {
         this.startDate = startDate;
         this.endDate = endDate;
         return this;
     }
 
-    public PixivSearchBuilder setMaxSize(int width, int height) {
+    public PixivSearchLinkBuilder setMaxSize(int width, int height) {
         this.wgt = width;
         this.hgt = height;
         return this;
     }
 
-    public PixivSearchBuilder setMinSize(int width, int height) {
+    public PixivSearchLinkBuilder setMinSize(int width, int height) {
         this.wlt = width;
         this.hlt = height;
         return this;
     }
 
-    public PixivSearchBuilder setPage(int pageIndex) {
+    public PixivSearchLinkBuilder setPage(int pageIndex) {
         if (pageIndex <= 0) {
             throw new IllegalArgumentException("Invalid pageIndex: " + pageIndex);
         }
@@ -253,22 +245,22 @@ public class PixivSearchBuilder {
         return this;
     }
 
-    public PixivSearchBuilder addExcludeKeyword(String keyword) {
+    public PixivSearchLinkBuilder addExcludeKeyword(String keyword) {
         excludeKeywords.add(keyword);
         return this;
     }
 
-    public PixivSearchBuilder removeExcludeKeyword(String keyword) {
+    public PixivSearchLinkBuilder removeExcludeKeyword(String keyword) {
         excludeKeywords.remove(keyword);
         return this;
     }
 
-    public PixivSearchBuilder addIncludeKeyword(String keyword) {
+    public PixivSearchLinkBuilder addIncludeKeyword(String keyword) {
         includeKeywords.add(keyword);
         return this;
     }
 
-    public PixivSearchBuilder removeIncludeKeyword(String keyword) {
+    public PixivSearchLinkBuilder removeIncludeKeyword(String keyword) {
         includeKeywords.remove(keyword);
         return this;
     }

src/main/java/net/lamgc/cgj/pixiv/PixivURL.java

@@ -10,55 +10,56 @@ import java.util.GregorianCalendar;
  * 目前已整理的一些Pixiv接口列表
  */
 @SuppressWarnings("unused")
-public class PixivURL {
+public final class PixivURL {
 
+    private PixivURL() {}
 
-    public static final String PIXIV_INDEX_URL = "https://www.pixiv.net";
+    public final static String PIXIV_INDEX_URL = "https://www.pixiv.net";
 
     /**
      * P站预登陆url
      */
-    public static final String PIXIV_LOGIN_PAGE_URL = "https://accounts.pixiv.net/login?lang=zh&source=pc&view_type=page&ref=wwwtop_accounts_index";
+    public final static String PIXIV_LOGIN_PAGE_URL = "https://accounts.pixiv.net/login?lang=zh&source=pc&view_type=page&ref=wwwtop_accounts_index";
 
     /**
      * P站登录请求url
      */
-    public static final String PIXIV_LOGIN_URL = "https://accounts.pixiv.net/api/login?lang=zh";
+    public final static String PIXIV_LOGIN_URL = "https://accounts.pixiv.net/api/login?lang=zh";
 
     /**
      * P站搜索请求url
-     * @deprecated 该接口已被替换, 请使用{@link PixivSearchBuilder}构造搜索Url
-     * @see PixivSearchBuilder
+     * @deprecated 该接口已被替换, 请使用{@link PixivSearchLinkBuilder}构造搜索Url
+     * @see PixivSearchLinkBuilder
      */
     @Deprecated
-    private static final String PIXIV_SEARCH_URL = "https://www.pixiv.net/search.php";
+    private final static String PIXIV_SEARCH_URL = "https://www.pixiv.net/search.php";
 
     /**
      * P站搜索用户url
      * 需要替换的参数:
      * {nick} - 用户昵称、部分名称
-     * @deprecated 该接口已被替换, 请使用{@link PixivSearchBuilder}构造搜索Url
-     * @see PixivSearchBuilder
+     * @deprecated 该接口已被替换, 请使用{@link PixivSearchLinkBuilder}构造搜索Url
+     * @see PixivSearchLinkBuilder
      */
     @Deprecated
-    public static final String PIXIV_SEARCH_USER_URL = PIXIV_SEARCH_URL + "?s_mode=s_usr&nick={nick}";
+    public final static String PIXIV_SEARCH_USER_URL = PIXIV_SEARCH_URL + "?s_mode=s_usr&nick={nick}";
 
     /**
      * P站搜索插画url
      * 需要替换的参数:
      * {word} - 插画相关文本
-     * @deprecated 该接口已被替换, 请使用{@link PixivSearchBuilder}构造搜索Url
-     * @see PixivSearchBuilder
+     * @deprecated 该接口已被替换, 请使用{@link PixivSearchLinkBuilder}构造搜索Url
+     * @see PixivSearchLinkBuilder
      */
     @Deprecated
-    public static final String PIXIV_SEARCH_TAG_URL = PIXIV_SEARCH_URL + "?s_mode=s_tag&word={word}";
+    public final static String PIXIV_SEARCH_TAG_URL = PIXIV_SEARCH_URL + "?s_mode=s_tag&word={word}";
 
     /**
      * P站插图下载链接获取url
      * 需要替换的文本:
      * {illustId} - 插画ID
      */
-    public static final String PIXIV_ILLUST_API_URL = "https://www.pixiv.net/ajax/illust/{illustId}/pages";
+    public final static String PIXIV_ILLUST_API_URL = "https://www.pixiv.net/ajax/illust/{illustId}/pages";
 
     /**
      * P站用户插图列表获取API
@@ -67,42 +68,42 @@ public class PixivURL {
      * {userId} - 用户ID
      */
     //{"error":false,"message":"","body":{"illusts":{"74369837":null,"70990542":null,"70608653":null,"69755191":null,"69729450":null,"69729416":null,"69503608":null,"69288766":null,"69083882":null,"69051458":null,"68484200":null,"68216927":null,"68216866":null,"68192333":null,"67915106":null,"67914932":null,"67854803":null,"67854745":null,"67854670":null,"67787211":null,"67772199":null,"67770637":null,"67754861":null,"67754804":null,"67754726":null,"67740486":null,"67740480":null,"67740450":null,"67740434":null,"67726337":null,"67499196":null,"67499163":null,"67499145":null,"67499111":null,"67499085":null,"67499038":null,"67498987":null,"67473178":null,"66271465":null,"63682753":null,"63682697":null,"59385148":null,"59383265":null,"59383240":null,"59383227":null,"59383173":null},"manga":[],"novels":[],"mangaSeries":[],"novelSeries":[],"pickup":[],"bookmarkCount":{"public":{"illust":1,"novel":0},"private":{"illust":0,"novel":0}}}}
-    public static final String PIXIV_USER_ILLUST_LIST_URL = "https://www.pixiv.net/ajax/user/{userId}/profile/all";
+    public final static String PIXIV_USER_ILLUST_LIST_URL = "https://www.pixiv.net/ajax/user/{userId}/profile/all";
 
     /**
      * 能够同时获取插图信息的用户插图列表获取API
      * 需要替换的文本:
      * {userId} - 用户ID
      */
-    public static final String PIXIV_USER_TOP_ILLUST_LIST_URL = "https://www.pixiv.net/ajax/user/{userId}/profile/top";
+    public final static String PIXIV_USER_TOP_ILLUST_LIST_URL = "https://www.pixiv.net/ajax/user/{userId}/profile/top";
 
     /**
      * P站单图详情页url
      * 需要替换的文本:
      * {illustId} - 插画ID
      */
-    public static final String PIXIV_ILLUST_MEDIUM_URL = "https://www.pixiv.net/member_illust.php?mode=medium&illust_id={illustId}";
+    public final static String PIXIV_ILLUST_MEDIUM_URL = "https://www.pixiv.net/member_illust.php?mode=medium&illust_id={illustId}";
 
     /**
      * P站多图详情页url
      * 需要替换的文本:
      * {illustId} - 插画ID
      */
-    public static final String PIXIV_ILLUST_MANGA_URL = "https://www.pixiv.net/member_illust.php?mode=manga&illust_id={illustId}";
+    public final static String PIXIV_ILLUST_MANGA_URL = "https://www.pixiv.net/member_illust.php?mode=manga&illust_id={illustId}";
 
     /**
      * P站用户页面url
      * 需要替换的文本:
      * {userId} - 用户ID
      */
-    public static final String PIXIV_USER_URL = "https://www.pixiv.net/member.php?id={userId}";
+    public final static String PIXIV_USER_URL = "https://www.pixiv.net/member.php?id={userId}";
 
     /**
      * P站插图信息获取API
      * 这个API能获取插图基本信息，但不能获取大小
      * 请使用{@link #getPixivIllustInfoAPI(int[])}获取URL
      */
-    private static final String PIXIV_GET_ILLUST_INFO_URL = "https://www.pixiv.net/ajax/illust/recommend/illusts?";
+    private final static String PIXIV_GET_ILLUST_INFO_URL = "https://www.pixiv.net/ajax/illust/recommend/illusts?";
 
     /**
      * P站获取用户所有插图ID的Api
@@ -110,7 +111,15 @@ public class PixivURL {
      * 需要替换的文本:
      * {userId} - 用户ID
      */
-    public static final String PIXIV_GET_USER_ALL_ILLUST_ID_URL = "https://www.pixiv.net/ajax/user/{userId}/profile/all";
+    public final static String PIXIV_GET_USER_ALL_ILLUST_URL = "https://www.pixiv.net/ajax/user/{userId}/profile/all";
+
+    /**
+     * P站获取用户推荐插画及用户基本数据
+     * 这个API能获得作者的部分(推荐)作品, 每个作品有详细数据, 还能获取作者主页信息(比如主页说明, 看板图)
+     * 需要替换的文本:
+     * {userId} - 用户ID
+     */
+    public final static String PIXIV_GET_USER_TOP_ILLUST_URL = "https://www.pixiv.net/ajax/user/{userId}/profile/top";
 
     /**
      * P站标签搜索URL
@@ -118,7 +127,7 @@ public class PixivURL {
      * 需要替换的文本:
      * {content} - 大致tag内容
      */
-    public static final String PIXIV_TAG_SEARCH_URL = "https://www.pixiv.net/ajax/search/tags/{content}";
+    public final static String PIXIV_TAG_SEARCH_URL = "https://www.pixiv.net/ajax/search/tags/{content}";
 
     /**
      * 获取动图下载链接和拼接数据.
@@ -128,11 +137,17 @@ public class PixivURL {
      */
     public final static String PIXIV_GET_UGOIRA_META_URL = "https://www.pixiv.net/ajax/illust/{illustId}/ugoira_meta";
 
+    /**
+     * 获取自己帐号的部分数据(目前仅能获取: 关注数, 粉丝数和看板图)
+     * 需要登录.
+     */
+    public final static String PIXIV_GET_USER_EXTRA_URL = "https://www.pixiv.net/ajax/user/extra";
+
     /**
      * 请求时带上需要退出的Cookies
      * 无论成功与否都会返回302重定向到{@linkplain #PIXIV_LOGIN_PAGE_URL 登录页面}
      */
-    public static final String PIXIV_LOGOUT_URL = "https://www.pixiv.net/logout.php";
+    public final static String PIXIV_LOGOUT_URL = "https://www.pixiv.net/logout.php";
 
     /**
      * 构造P站获取插图信息的Api Url
@@ -279,7 +294,7 @@ public class PixivURL {
 
     /**
      * Pixiv搜索接口.<br/>
-     * 要使用该链接请使用{@link PixivSearchBuilder}构造链接.<br/>
+     * 要使用该链接请使用{@link PixivSearchLinkBuilder}构造链接.<br/>
      * 需要替换的参数: <br/>
      * content - 搜索内容
      */

src/main/java/net/lamgc/cgj/pixiv/PixivUgoiraBuilder.java

@@ -7,11 +7,12 @@ import com.squareup.gifencoder.GifEncoder;
 import com.squareup.gifencoder.Image;
 import com.squareup.gifencoder.ImageOptions;
 import io.netty.handler.codec.http.HttpHeaderNames;
-import org.apache.commons.io.IOUtils;
+import net.lamgc.cgj.exception.HttpRequestException;
 import org.apache.http.HttpResponse;
 import org.apache.http.client.HttpClient;
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.util.EntityUtils;
+import org.apache.tomcat.util.http.fileupload.util.Streams;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -46,12 +47,12 @@ public final class PixivUgoiraBuilder {
         log.debug("Request Url: {}", request.getURI());
         HttpResponse response = httpClient.execute(request);
         String bodyStr = EntityUtils.toString(response.getEntity());
-        log.debug("JsonBodyStr: {}", bodyStr);
+        log.trace("JsonBodyStr: {}", bodyStr);
         JsonObject resultObject = new Gson().fromJson(bodyStr, JsonObject.class);
         if(resultObject.get("error").getAsBoolean()) {
             String message = resultObject.get("message").getAsString();
             log.error("获取动图元数据失败!(接口报错: {})", message);
-            throw new IOException(message);
+            throw new HttpRequestException(response.getStatusLine(), bodyStr);
         } else if(!resultObject.has("body")) {
             String message = "接口返回数据不存在body属性, 可能接口发生改变!";
             log.error(message);
@@ -82,7 +83,33 @@ public final class PixivUgoiraBuilder {
         log.debug("IllustId: {}, UgoiraMeta: {}", this.illustId, this.ugoiraMeta);
     }
 
+    /**
+     * 获取动图元数据
+     * @return 动图元数据, 返回的对象不影响Builder中的meta对象
+     */
+    public JsonObject getUgoiraMeta() {
+        return this.ugoiraMeta.deepCopy();
+    }
+
+    /**
+     * 构建动图
+     * @param original 是否为原图画质
+     * @return 返回动图数据输入流
+     * @throws IOException 当获取数据发生异常时抛出
+     */
     public InputStream buildUgoira(boolean original) throws IOException {
+        ByteArrayOutputStream bufferOutput = new ByteArrayOutputStream();
+        buildUgoira(bufferOutput, original);
+        return new ByteArrayInputStream(bufferOutput.toByteArray());
+    }
+
+    /**
+     * 构建动图
+     * @param outputStream 动图输出流
+     * @param original 是否为原图画质
+     * @throws IOException 当获取数据发生异常时抛出
+     */
+    public void buildUgoira(OutputStream outputStream, boolean original) throws IOException {
         getUgoiraImageSize();
         log.debug("动图尺寸信息: Height: {}, Width: {}", height, width);
 
@@ -95,13 +122,12 @@ public final class PixivUgoiraBuilder {
         HttpResponse response = httpClient.execute(request);
         log.trace("请求已发送, 正在处理响应...");
         ZipInputStream zipInputStream = new ZipInputStream(new BufferedInputStream(response.getEntity().getContent(), 64 * 1024));
-        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
         ZipEntry entry;
         ByteArrayOutputStream cacheOutputStream = new ByteArrayOutputStream(512);
         HashMap<String, InputStream> frameMap = new HashMap<>(frames.size());
         while((entry = zipInputStream.getNextEntry()) != null) {
             log.trace("ZipEntry {} 正在接收...", entry);
-            IOUtils.copy(zipInputStream, cacheOutputStream);
+            Streams.copy(zipInputStream, cacheOutputStream, false);
             frameMap.put(entry.getName(), new ByteArrayInputStream(cacheOutputStream.toByteArray()));
             log.trace("ZipEntry {} 已接收完成.", entry);
             cacheOutputStream.reset();
@@ -140,7 +166,6 @@ public final class PixivUgoiraBuilder {
             }
         });
         encoder.finishEncoding();
-        return new ByteArrayInputStream(outputStream.toByteArray());
     }
 
     /**
@@ -149,15 +174,15 @@ public final class PixivUgoiraBuilder {
     private void getUgoiraImageSize() throws IOException {
         log.debug("正在从Pixiv获取动图尺寸...");
         HttpGet request = new HttpGet(PixivURL.getPixivIllustInfoAPI(illustId));
-        log.debug("Request Url: {}", request.getURI());
+        log.trace("Request Url: {}", request.getURI());
         HttpResponse response = httpClient.execute(request);
         String responseBody = EntityUtils.toString(response.getEntity(), StandardCharsets.UTF_8);
-        log.debug("ResponseBody: {}", responseBody);
+        log.trace("ResponseBody: {}", responseBody);
         JsonObject resultObject = new Gson().fromJson(responseBody, JsonObject.class);
         if(resultObject.get("error").getAsBoolean()) {
             String message = resultObject.get("message").getAsString();
             log.error("接口返回错误: {}", message);
-            throw new IOException(message);
+            throw new HttpRequestException(response.getStatusLine(), responseBody);
         }
 
         JsonArray illustsArray = resultObject.getAsJsonObject("body").getAsJsonArray("illusts");

src/main/java/net/lamgc/cgj/proxy/PixivAccessProxyServer.java

@@ -1,149 +0,0 @@
-package net.lamgc.cgj.proxy;
-
-import com.github.monkeywie.proxyee.intercept.HttpProxyIntercept;
-import com.github.monkeywie.proxyee.intercept.HttpProxyInterceptInitializer;
-import com.github.monkeywie.proxyee.intercept.HttpProxyInterceptPipeline;
-import com.github.monkeywie.proxyee.intercept.common.CertDownIntercept;
-import com.github.monkeywie.proxyee.proxy.ProxyConfig;
-import com.github.monkeywie.proxyee.server.HttpProxyServer;
-import com.github.monkeywie.proxyee.server.HttpProxyServerConfig;
-import io.netty.channel.Channel;
-import io.netty.handler.codec.http.HttpHeaderNames;
-import io.netty.handler.codec.http.HttpHeaders;
-import io.netty.handler.codec.http.HttpRequest;
-import io.netty.handler.codec.http.HttpResponse;
-import org.apache.http.client.CookieStore;
-import org.apache.http.impl.cookie.BasicClientCookie;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.net.HttpCookie;
-import java.util.Date;
-import java.util.List;
-
-/**
- * 登录成功后提供CookieStore, 然后由程序自动登录Pixiv
- * @author LamGC
- */
-public class PixivAccessProxyServer {
-
-    private final Logger log = LoggerFactory.getLogger(PixivAccessProxyServer.class);
-
-    private final HttpProxyServer proxyServer;
-
-    private final CookieStore cookieStore;
-
-    public PixivAccessProxyServer(CookieStore cookieStore){
-        this(cookieStore, null);
-    }
-
-    public PixivAccessProxyServer(CookieStore cookieStore, ProxyConfig proxyConfig){
-        HttpProxyServerConfig config = new HttpProxyServerConfig();
-        this.cookieStore = cookieStore;
-        config.setHandleSsl(true);
-        this.proxyServer = new HttpProxyServer();
-        this.proxyServer
-                .serverConfig(config)
-                .proxyConfig(proxyConfig)
-                .proxyInterceptInitializer(new HttpProxyInterceptInitializer(){
-                    @Override
-                    public void init(HttpProxyInterceptPipeline pipeline) {
-                        pipeline.addLast(new CertDownIntercept());
-                        pipeline.addLast(new HttpProxyIntercept(){
-
-                            private boolean match(HttpRequest request){
-                                String host = request.headers().get(HttpHeaderNames.HOST);
-                                return host.equalsIgnoreCase("pixiv.net") || host.contains(".pixiv.net");
-                            }
-
-                            @Override
-                            public void beforeRequest(Channel clientChannel, HttpRequest httpRequest, HttpProxyInterceptPipeline pipeline) throws Exception {
-                                log.info("URL: " + httpRequest.headers().get(HttpHeaderNames.HOST) + httpRequest.uri());
-                                if(!match(httpRequest)){
-                                    super.beforeRequest(clientChannel, httpRequest, pipeline);
-                                    return;
-                                }
-                                log.info("正在注入Cookies...");
-                                HttpHeaders requestHeaders = httpRequest.headers();
-                                if(requestHeaders.contains(HttpHeaderNames.COOKIE)){
-                                    log.info("原请求存在自带Cookies, 正在清除Cookies...");
-                                    log.debug("原Cookies: {}", requestHeaders.getAsString(HttpHeaderNames.COOKIE));
-                                    requestHeaders.remove(HttpHeaderNames.COOKIE);
-                                }
-                                StringBuilder cookieBuilder = new StringBuilder();
-                                cookieStore.getCookies().forEach(cookie -> {
-                                    if(cookie.isExpired(new Date())){
-                                        return;
-                                    }
-                                    cookieBuilder.append(cookie.getName()).append("=").append(cookie.getValue()).append("; ");
-                                });
-                                log.info("Cookies构造完成, 结果: " + cookieBuilder.toString());
-                                requestHeaders.add(HttpHeaderNames.COOKIE, cookieBuilder.toString());
-                                log.info("Cookies注入完成.");
-
-                                super.beforeRequest(clientChannel, httpRequest, pipeline);
-                            }
-
-                            @Override
-                            public void afterResponse(Channel clientChannel, Channel proxyChannel, HttpResponse httpResponse, HttpProxyInterceptPipeline pipeline) throws Exception {
-                                if(!match(pipeline.getHttpRequest())){
-                                    super.afterResponse(clientChannel, proxyChannel, httpResponse, pipeline);
-                                    return;
-                                }
-                                log.info("正在更新Response Cookie...(Header Name: " + HttpHeaderNames.SET_COOKIE + ")");
-                                List<String> responseCookies = httpResponse.headers().getAll(HttpHeaderNames.SET_COOKIE);
-                                responseCookies.forEach(value -> {
-                                    /*if(check(value)){
-                                        log.info("黑名单Cookie, 已忽略: " + value);
-                                        return;
-                                    }*/
-                                    log.info("Response Cookie: " + value);
-                                    BasicClientCookie cookie = parseRawCookie(value);
-                                    cookieStore.addCookie(cookie);
-                                });
-                                httpResponse.headers().remove(HttpHeaderNames.SET_COOKIE);
-                                super.afterResponse(clientChannel, proxyChannel, httpResponse, pipeline);
-                            }
-
-                            protected BasicClientCookie parseRawCookie(String rawCookie) {
-                                List<HttpCookie> cookies = HttpCookie.parse(rawCookie);
-                                if (cookies.size() < 1)
-                                    return null;
-                                HttpCookie httpCookie = cookies.get(0);
-                                BasicClientCookie cookie = new BasicClientCookie(httpCookie.getName(), httpCookie.getValue());
-                                if (httpCookie.getMaxAge() >= 0) {
-                                    Date expiryDate = new Date(System.currentTimeMillis() + httpCookie.getMaxAge() * 1000);
-                                    cookie.setExpiryDate(expiryDate);
-                                }
-                                if (httpCookie.getDomain() != null)
-                                    cookie.setDomain(httpCookie.getDomain());
-                                if (httpCookie.getPath() != null)
-                                    cookie.setPath(httpCookie.getPath());
-                                if (httpCookie.getComment() != null)
-                                    cookie.setComment(httpCookie.getComment());
-                                cookie.setSecure(httpCookie.getSecure());
-                                return cookie;
-                            }
-                        });
-                    }
-                });
-    }
-
-    public void start(int port){
-        this.proxyServer.start(port);
-    }
-
-    public void close(){
-        this.proxyServer.close();
-    }
-
-    /**
-     * 导出CookieStore.
-     * 注意!该方法导出的CookieStore不适用于ApacheHttpClient, 如需使用则需要进行转换.
-     * @return CookieStore对象
-     */
-    public CookieStore getCookieStore(){
-        return this.cookieStore;
-    }
-
-}

src/main/java/net/lamgc/cgj/util/Locker.java

@@ -0,0 +1,65 @@
+package net.lamgc.cgj.util;
+
+import java.util.concurrent.atomic.AtomicInteger;
+
+public final class Locker<K> {
+
+    private final LockerMap<K> fromMap;
+
+    private final K key;
+
+    private final boolean autoDestroy;
+
+    private final AtomicInteger lockCount = new AtomicInteger(0);
+
+    /**
+     * 构造一个锁对象
+     * @param map 所属LockerMap
+     * @param key 所属Key
+     */
+    Locker(LockerMap<K> map, K key, boolean autoDestroy) {
+        this.fromMap = map;
+        this.key = key;
+        this.autoDestroy = autoDestroy;
+    }
+
+    /**
+     * 上锁
+     */
+    public void lock() {
+        lockCount.incrementAndGet();
+    }
+
+    /**
+     * 解锁
+     */
+    public void unlock() {
+        int newValue = lockCount.decrementAndGet();
+        if(newValue <= 0 && autoDestroy) {
+            destroy();
+        }
+    }
+
+    /**
+     * 获取锁对象所属Key
+     */
+    public K getKey() {
+        return key;
+    }
+
+    /**
+     * 销毁锁对象
+     */
+    public void destroy() {
+        fromMap.destroyLocker(this);
+    }
+
+    @Override
+    public String toString() {
+        return "Locker@" + this.hashCode() + "{" +
+                "fromMap=" + fromMap +
+                ", key=" + key +
+                '}';
+    }
+
+}

src/main/java/net/lamgc/cgj/util/LockerMap.java

@@ -0,0 +1,31 @@
+package net.lamgc.cgj.util;
+
+import java.util.HashMap;
+
+public class LockerMap<K> {
+
+    private final HashMap<K, Locker<K>> lockerHashMap = new HashMap<>();
+
+    /**
+     * 创建锁
+     * @param key Key
+     * @return 如果Key所属锁存在, 则返回对应锁, 否则返回新锁
+     */
+    public Locker<K> createLocker(K key, boolean autoDestroy) {
+        if(lockerHashMap.containsKey(key)) {
+            return lockerHashMap.get(key);
+        }
+        Locker<K> newLocker = new Locker<>(this, key, autoDestroy);
+        lockerHashMap.put(key, newLocker);
+        return newLocker;
+    }
+
+    /**
+     * 销毁锁
+     * @param locker 锁对象
+     */
+    public void destroyLocker(Locker<K> locker) {
+        lockerHashMap.remove(locker.getKey());
+    }
+
+}

src/main/java/net/lamgc/cgj/util/TimeLimitThreadPoolExecutor.java

@@ -2,6 +2,7 @@ package net.lamgc.cgj.util;
 
 import java.util.*;
 import java.util.concurrent.*;
+import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicLong;
 
 /**
@@ -22,29 +23,53 @@ public class TimeLimitThreadPoolExecutor extends ThreadPoolExecutor {
      */
     private final AtomicLong timeoutCheckInterval = new AtomicLong(100);
 
-    private final Map<Thread, AtomicLong> workerThreadMap = new Hashtable<>();
+    private final Map<Thread, MonitorInfo> workerThreadMap = new Hashtable<>();
 
     private final Thread timeoutCheckThread = createTimeoutCheckThread();
 
-    public TimeLimitThreadPoolExecutor(long executeLimitTime, int corePoolSize, int maximumPoolSize, long keepAliveTime, TimeUnit unit, BlockingQueue<Runnable> workQueue) {
+    public TimeLimitThreadPoolExecutor(long executeLimitTime,
+                                       int corePoolSize,
+                                       int maximumPoolSize,
+                                       long keepAliveTime,
+                                       TimeUnit unit,
+                                       BlockingQueue<Runnable> workQueue) {
         super(corePoolSize, maximumPoolSize, keepAliveTime, unit, workQueue);
         setInitialTime(executeLimitTime);
         timeoutCheckThread.start();
     }
 
-    public TimeLimitThreadPoolExecutor(long executeLimitTime, int corePoolSize, int maximumPoolSize, long keepAliveTime, TimeUnit unit, BlockingQueue<Runnable> workQueue, ThreadFactory threadFactory) {
+    public TimeLimitThreadPoolExecutor(long executeLimitTime,
+                                       int corePoolSize,
+                                       int maximumPoolSize,
+                                       long keepAliveTime,
+                                       TimeUnit unit,
+                                       BlockingQueue<Runnable> workQueue,
+                                       ThreadFactory threadFactory) {
         super(corePoolSize, maximumPoolSize, keepAliveTime, unit, workQueue, threadFactory);
         setInitialTime(executeLimitTime);
         timeoutCheckThread.start();
     }
 
-    public TimeLimitThreadPoolExecutor(long executeLimitTime, int corePoolSize, int maximumPoolSize, long keepAliveTime, TimeUnit unit, BlockingQueue<Runnable> workQueue, RejectedExecutionHandler handler) {
+    public TimeLimitThreadPoolExecutor(long executeLimitTime,
+                                       int corePoolSize,
+                                       int maximumPoolSize,
+                                       long keepAliveTime,
+                                       TimeUnit unit,
+                                       BlockingQueue<Runnable> workQueue,
+                                       RejectedExecutionHandler handler) {
         super(corePoolSize, maximumPoolSize, keepAliveTime, unit, workQueue, handler);
         setInitialTime(executeLimitTime);
         timeoutCheckThread.start();
     }
 
-    public TimeLimitThreadPoolExecutor(long executeLimitTime, int corePoolSize, int maximumPoolSize, long keepAliveTime, TimeUnit unit, BlockingQueue<Runnable> workQueue, ThreadFactory threadFactory, RejectedExecutionHandler handler) {
+    public TimeLimitThreadPoolExecutor(long executeLimitTime,
+                                       int corePoolSize,
+                                       int maximumPoolSize,
+                                       long keepAliveTime,
+                                       TimeUnit unit,
+                                       BlockingQueue<Runnable> workQueue,
+                                       ThreadFactory threadFactory,
+                                       RejectedExecutionHandler handler) {
         super(corePoolSize, maximumPoolSize, keepAliveTime, unit, workQueue, threadFactory, handler);
         setInitialTime(executeLimitTime);
         timeoutCheckThread.start();
@@ -107,14 +132,17 @@ public class TimeLimitThreadPoolExecutor extends ThreadPoolExecutor {
             while (true) {
                 try {
                     long interval = this.timeoutCheckInterval.get();
+                    //noinspection BusyWait 用于等待超时
                     Thread.sleep(interval);
 
                     // 检查是否存在超时的任务
-                    workerThreadMap.forEach((thread, time) -> {
-                        long currentTime = time.getAndAdd(interval);
-                        if(currentTime > executeTimeLimit.get()) {
-                            if(!thread.isInterrupted()) {
+                    final long executeTimeLimit = this.executeTimeLimit.get();
+                    workerThreadMap.forEach((thread, info) -> {
+                        long currentTime = info.getTimeRemaining().getAndAdd(interval);
+                        if(currentTime > executeTimeLimit) {
+                            if(!info.getNotifyInterrupted().get() && !thread.isInterrupted()) {
                                 thread.interrupt();
+                                info.getNotifyInterrupted().set(true);
                             }
                         }
                     });
@@ -130,7 +158,7 @@ public class TimeLimitThreadPoolExecutor extends ThreadPoolExecutor {
 
     @Override
     protected void beforeExecute(Thread t, Runnable r) {
-        workerThreadMap.put(t, new AtomicLong());
+        workerThreadMap.put(t, new MonitorInfo());
         super.beforeExecute(t, r);
     }
 
@@ -145,4 +173,20 @@ public class TimeLimitThreadPoolExecutor extends ThreadPoolExecutor {
         this.timeoutCheckThread.interrupt();
         super.terminated();
     }
+
+    private static class MonitorInfo {
+
+        private final AtomicLong timeRemaining = new AtomicLong();
+
+        private final AtomicBoolean notifyInterrupted = new AtomicBoolean(false);
+
+        public AtomicBoolean getNotifyInterrupted() {
+            return notifyInterrupted;
+        }
+
+        public AtomicLong getTimeRemaining() {
+            return timeRemaining;
+        }
+    }
+
 }

src/main/resources/log4j2-test.xml

@@ -3,26 +3,39 @@
     <properties>
         <property name="logStorePath">./logs</property>
         <property name="charset">UTF-8</property>
-        <property name="pattern">[%-d{HH:mm:ss.SSS} %5level][%logger.%method():%-3L][%thread]: %msg%n</property>
+        <property name="standard_pattern">[%-d{HH:mm:ss.SSS} %5level][%logger.%method():%-3L][%thread]: %msg%n</property>
+        <property name="mirai_pattern">[%-d{HH:mm:ss.SSS} %5level][%logger]: %msg%n</property>
         <property name="logsDir">${sys:cgj.logsPath:-logs}</property>
     </properties>
 
     <Appenders>
-        <Console name="CONSOLE_STDOUT" target="SYSTEM_OUT">
-            <PatternLayout pattern="${pattern}" charset="${charset}"/>
+        <Console name="STANDARD_STDOUT" target="SYSTEM_OUT">
+            <PatternLayout charset="${charset}">
+                <MarkerPatternSelector defaultPattern="${standard_pattern}">
+                    <PatternMatch key="mirai" pattern="${mirai_pattern}" />
+                </MarkerPatternSelector>
+            </PatternLayout>
             <Filters>
                 <ThresholdFilter level="WARN" onMatch="DENY" onMismatch="ACCEPT"/>
             </Filters>
         </Console>
-        <Console name="CONSOLE_STDERR" target="SYSTEM_ERR">
-            <PatternLayout pattern="${pattern}" charset="${charset}"/>
+        <Console name="STANDARD_STDERR" target="SYSTEM_ERR">
+            <PatternLayout charset="${charset}">
+                <MarkerPatternSelector defaultPattern="${standard_pattern}">
+                    <PatternMatch key="mirai" pattern="${mirai_pattern}" />
+                </MarkerPatternSelector>
+            </PatternLayout>
             <Filters>
                 <ThresholdFilter level="WARN" onMatch="ACCEPT" onMismatch="DENY"/>
             </Filters>
         </Console>
 
         <RollingFile name="rollingFile" fileName="${logsDir}/latest.log" filePattern="${logsDir}/running.%-d{yyyy-MM-dd_HH-mm-ss}.log.gz">
-            <PatternLayout pattern="${pattern}" charset="${charset}"/>
+            <PatternLayout charset="${charset}">
+                <MarkerPatternSelector defaultPattern="${standard_pattern}">
+                    <PatternMatch key="mirai" pattern="${mirai_pattern}" />
+                </MarkerPatternSelector>
+            </PatternLayout>
             <Policies>
                 <OnStartupTriggeringPolicy />
             </Policies>
@@ -32,8 +45,8 @@
     <Loggers>
         <Logger level="INFO" name="org.apache.http"/>
         <Root level="TRACE">
-            <AppenderRef ref="CONSOLE_STDOUT"/>
-            <AppenderRef ref="CONSOLE_STDERR"/>
+            <AppenderRef ref="STANDARD_STDOUT"/>
+            <AppenderRef ref="STANDARD_STDERR"/>
             <AppenderRef ref="rollingFile"/>
         </Root>
     </Loggers>

src/main/resources/log4j2.xml

@@ -1,28 +1,47 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration status="WARN">
+    <!--
+        测试版跟发布版在日志配置文件上的区别仅仅只有'Loggers'的不同, 'properties'和'Appenders'是一致的.
+     -->
     <properties>
         <property name="logStorePath">./logs</property>
         <property name="charset">UTF-8</property>
-        <property name="pattern">[%-d{HH:mm:ss.SSS} %5level][%logger.%method():%-3L][%thread]: %msg%n</property>
+        <property name="standard_pattern">[%-d{HH:mm:ss.SSS} %5level][%logger.%method():%-3L][%thread]: %msg%n</property>
+        <property name="mirai_pattern">[%-d{HH:mm:ss.SSS} %5level][%logger]: %msg%n</property>
         <property name="logsDir">${sys:cgj.logsPath:-logs}</property>
     </properties>
 
     <Appenders>
-        <Console name="CONSOLE_STDOUT" target="SYSTEM_OUT">
-            <PatternLayout pattern="${pattern}" charset="${charset}"/>
+        <Console name="STANDARD_STDOUT" target="SYSTEM_OUT">
+            <PatternLayout charset="${charset}">
+                <MarkerPatternSelector defaultPattern="${standard_pattern}">
+                    <PatternMatch key="mirai" pattern="${mirai_pattern}" />
+                </MarkerPatternSelector>
+            </PatternLayout>
             <Filters>
-                <LevelRangeFilter minLevel="INFO" maxLevel="INFO" />
+                <LevelRangeFilter minLevel="INFO" maxLevel="INFO" onMatch="ACCEPT" onMismatch="DENY"/>
             </Filters>
         </Console>
-        <Console name="CONSOLE_STDERR" target="SYSTEM_ERR">
-            <PatternLayout pattern="${pattern}" charset="${charset}"/>
+        <Console name="STANDARD_STDERR" target="SYSTEM_ERR">
+            <PatternLayout charset="${charset}">
+                <MarkerPatternSelector defaultPattern="${standard_pattern}">
+                    <PatternMatch key="mirai" pattern="${mirai_pattern}" />
+                </MarkerPatternSelector>
+            </PatternLayout>
             <Filters>
                 <ThresholdFilter level="WARN" onMatch="ACCEPT" onMismatch="DENY"/>
             </Filters>
         </Console>
 
         <RollingFile name="rollingFile" fileName="${logsDir}/latest.log" filePattern="${logsDir}/running.%-d{yyyy-MM-dd_HH-mm-ss}.log.gz">
-            <PatternLayout pattern="${pattern}" charset="${charset}"/>
+            <Filters>
+                <ThresholdFilter level="DEBUG" onMatch="ACCEPT" onMismatch="DENY"/>
+            </Filters>
+            <PatternLayout charset="${charset}">
+                <MarkerPatternSelector defaultPattern="${standard_pattern}">
+                    <PatternMatch key="mirai" pattern="${mirai_pattern}" />
+                </MarkerPatternSelector>
+            </PatternLayout>
             <Policies>
                 <OnStartupTriggeringPolicy />
             </Policies>
@@ -31,9 +50,9 @@
 
     <Loggers>
         <Logger level="INFO" name="org.apache.http"/>
-        <Root level="TRACE">
-            <AppenderRef ref="CONSOLE_STDOUT"/>
-            <AppenderRef ref="CONSOLE_STDERR"/>
+        <Root level="DEBUG">
+            <AppenderRef ref="STANDARD_STDOUT"/>
+            <AppenderRef ref="STANDARD_STDERR"/>
             <AppenderRef ref="rollingFile"/>
         </Root>
     </Loggers>

src/main/resources/simple.properties

@@ -1,9 +0,0 @@
-#用于访问Pixiv的代理服务器
-reptile.proxy.type=socks5/socks4/http
-reptile.proxy.host=127.0.0.1
-reptile.proxy.port=1080
-reptile.proxy.username=
-reptile.proxy.password=
-#登录用代理, 需要让浏览器使用该代理, 访问Pixiv并登录
-login.proxy.host=127.0.0.1
-login.proxy.port=1080

src/test/java/net/lamgc/cgj/pixiv/PixivDownloadTest.java

@@ -2,7 +2,6 @@ package net.lamgc.cgj.pixiv;
 
 import com.google.gson.Gson;
 import com.google.gson.JsonObject;
-import org.apache.commons.io.IOUtils;
 import org.apache.http.HttpHost;
 import org.apache.http.client.CookieStore;
 import org.apache.http.client.methods.CloseableHttpResponse;
@@ -10,6 +9,7 @@ import org.apache.http.client.methods.HttpGet;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClientBuilder;
 import org.apache.http.util.EntityUtils;
+import org.apache.tomcat.util.http.fileupload.util.Streams;
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Ignore;
@@ -64,7 +64,7 @@ public class PixivDownloadTest {
                 ZipEntry entry = new ZipEntry(link.substring(link.lastIndexOf("/") + 1));
                 log.info("正在写入: " + entry.getName());
                 zos.putNextEntry(entry);
-                IOUtils.copy(inputStream, zos);
+                Streams.copy(inputStream, zos, false);
                 zos.flush();
             } catch (IOException e) {
                 log.error("写入文件项时发生异常", e);
@@ -96,7 +96,7 @@ public class PixivDownloadTest {
                 ZipEntry entry = new ZipEntry(link.substring(link.lastIndexOf("/") + 1));
                 log.info("正在写入: " + entry.getName());
                 zos.putNextEntry(entry);
-                IOUtils.copy(inputStream, zos);
+                Streams.copy(inputStream, zos, false);
                 zos.flush();
                 log.info("已成功写入 {}", entry.getName());
             } catch (IOException e) {
@@ -139,7 +139,7 @@ public class PixivDownloadTest {
                     entry.setComment(rankInfo.toString());
                     log.info("正在写入: " + entry.getName());
                     zos.putNextEntry(entry);
-                    IOUtils.copy(inputStream, zos);
+                    Streams.copy(inputStream, zos, false);
                     zos.flush();
                     log.info("已成功写入 {}", entry.getName());
                 } catch (IOException e) {

src/test/java/net/lamgc/cgj/pixiv/PixivSearchBuilderTest.java

@@ -1,26 +0,0 @@
-package net.lamgc.cgj.pixiv;
-
-import org.junit.Assert;
-import org.junit.Test;
-
-public class PixivSearchBuilderTest {
-
-    @Test
-    public void buildTest() {
-        PixivSearchBuilder builder = new PixivSearchBuilder("hololive");
-        //builder.addExcludeKeyword("fubuki").addExcludeKeyword("minato");
-        builder.addIncludeKeyword("35").addIncludeKeyword("okayu").addIncludeKeyword("百鬼あやめ");
-        System.out.println(builder.buildURL());
-    }
-
-    @Test
-    public void equalsTest() {
-        Assert.assertEquals(new PixivSearchBuilder("风景"), new PixivSearchBuilder("风景"));
-    }
-
-    @Test
-    public void hashCodeTest() {
-        Assert.assertEquals(new PixivSearchBuilder("风景").hashCode(), new PixivSearchBuilder("风景").hashCode());
-    }
-
-}

src/test/java/net/lamgc/cgj/pixiv/PixivSearchLinkBuilderTest.java

@@ -0,0 +1,25 @@
+package net.lamgc.cgj.pixiv;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class PixivSearchLinkBuilderTest {
+
+    @Test
+    public void buildTest() {
+        PixivSearchLinkBuilder builder = new PixivSearchLinkBuilder("hololive");
+        builder.addIncludeKeyword("35").addIncludeKeyword("okayu").addIncludeKeyword("百鬼あやめ");
+        System.out.println(builder.buildURL());
+    }
+
+    @Test
+    public void equalsTest() {
+        Assert.assertEquals(new PixivSearchLinkBuilder("风景"), new PixivSearchLinkBuilder("风景"));
+    }
+
+    @Test
+    public void hashCodeTest() {
+        Assert.assertEquals(new PixivSearchLinkBuilder("风景").hashCode(), new PixivSearchLinkBuilder("风景").hashCode());
+    }
+
+}

src/test/java/net/lamgc/cgj/pixiv/PixivUgoiraBuilderTest.java

@@ -1,11 +1,12 @@
 package net.lamgc.cgj.pixiv;
 
 import org.apache.http.HttpHost;
-import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.client.HttpClient;
 import org.apache.http.impl.client.HttpClientBuilder;
 import org.bouncycastle.util.io.Streams;
 import org.junit.Ignore;
 import org.junit.Test;
+import org.slf4j.LoggerFactory;
 
 import java.io.File;
 import java.io.IOException;
@@ -18,8 +19,9 @@ public class PixivUgoiraBuilderTest {
     @Test
     public void buildTest() throws IOException {
         File outputFile = new File("./output2.gif");
-        CloseableHttpClient httpClient = HttpClientBuilder.create().setProxy(new HttpHost("127.0.0.1", 1001)).build();
-        PixivUgoiraBuilder builder = new PixivUgoiraBuilder(httpClient, 80766493);
+        HttpClient httpClient = HttpClientBuilder.create().setProxy(new HttpHost("127.0.0.1", 1080)).build();
+        PixivUgoiraBuilder builder = new PixivUgoiraBuilder(httpClient, 81163967);
+        LoggerFactory.getLogger(PixivUgoiraBuilderTest.class).info("UgoiraMeta: {}", builder.getUgoiraMeta());
         InputStream inputStream = builder.buildUgoira(true);
         Files.write(outputFile.toPath(), Streams.readAll(inputStream));
     }

src/test/java/net/lamgc/cgj/util/LockerMapTest.java

@@ -0,0 +1,18 @@
+package net.lamgc.cgj.util;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class LockerMapTest {
+
+    @Test
+    public void createAndFinalizeTest() {
+        LockerMap<String> map = new LockerMap<>();
+        Locker<String> locker = map.createLocker("Test", true);
+        Assert.assertEquals(locker, map.createLocker("Test", true));
+        locker.lock();
+        locker.unlock();
+        System.gc();
+    }
+
+}

src/test/java/net/lamgc/cgj/util/TimeLimitThreadPoolExecutorTest.java

@@ -2,26 +2,37 @@ package net.lamgc.cgj.util;
 
 import org.junit.Assert;
 import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.TimeUnit;
 
 public class TimeLimitThreadPoolExecutorTest {
 
+    private final static Logger log = LoggerFactory.getLogger(TimeLimitThreadPoolExecutorTest.class);
+
     @Test
     public void timeoutTest() throws InterruptedException {
         TimeLimitThreadPoolExecutor executor = new TimeLimitThreadPoolExecutor(1000, 1, 1, 30, TimeUnit.SECONDS, new ArrayBlockingQueue<>(50));
-        System.out.println(executor.isTerminated());
-        System.out.println(executor.isShutdown());
+        log.info("ThreadPoolExecutor.isTerminated: {}", executor.isTerminated());
+        log.info("ThreadPoolExecutor.isShutdown: {}", executor.isShutdown());
 
         executor.setTimeoutCheckInterval(150);
-        System.out.println("当前设定: ETL: " + executor.getExecuteTimeLimit() + "ms, TCI: " + executor.getTimeoutCheckInterval() + "ms");
+        log.info("当前设定: ExecuteTimeLimit: {}ms, CheckInterval: {}ms", executor.getExecuteTimeLimit(),
+                executor.getTimeoutCheckInterval());
         executor.execute(() -> {
             try {
-                Thread.sleep(5 * 1000);
+                Thread.sleep(5000);
             } catch (InterruptedException e) {
                 System.out.println("线程 " + Thread.currentThread().getName() + " 被中断");
             }
+
+            try {
+                Thread.sleep(1000);
+            } catch (InterruptedException e) {
+                Assert.fail("Multiple interrupts occurred");
+            }
         });
         executor.shutdown();
         Assert.assertTrue(executor.awaitTermination(5 * 1000, TimeUnit.MILLISECONDS));