优化树结构图标间距字体等

.gitee/ISSUE_TEMPLATE.zh-CN.md

@@ -1,14 +1,23 @@
-### 该问题是怎么引起的？
+### 是什么问题、该问题是怎么引起的？
 
+1. 
 
+### 重现步骤、期望结果、截图、代码
 
-### 重现步骤
-
-
-
-### 报错信息
-
+1. 
+```
+这里贴你的代码块
 ```
 
+### 实际结果、报错信息、截图
 
-```
+1. 
+```
+这里贴错误信息
+```
+
+### 环境版本：
+
+- JDK版本：1.8、11、17
+- 浏览器版本：Chrome xx、Firefox xx、IE xx
+- 平台版本：JeeSite 4.x.x、5.x.x（pom.xml里查看）

LICENSE

@@ -1,668 +1,3 @@
-                    GNU AFFERO GENERAL PUBLIC LICENSE
-                       Version 3, 19 November 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  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.
-
-  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.
-
-  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.
-
-  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.
-
-  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.
-
-  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.
-
-  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 precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU Affero General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. 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.
-
-    Copyright (C) 2013-Now, http://jeesite.com (thinkgem@163.com).
-
-    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 [http://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
-[http://www.gnu.org/licenses/].
-
-
-============================================================================
-
-
                                  Apache License
                            Version 2.0, January 2004
                         http://www.apache.org/licenses/
@@ -865,17 +200,24 @@ For more information on this, and how to apply and follow the GNU AGPL, see
    See the License for the specific language governing permissions and
    limitations under the License.
 
-   
 ============================================================================
 
-简要声明解释：
+授权许可补充协议条款：
 
-1. 已开源的代码，授权协议采用 AGPL v3 + Apache Licence v2 进行发行。
-2. 您可以免费使用、修改和衍生代码，但不允许修改后和衍生的代码做为闭源软件发布。
-3. 修改后和衍生的代码必须也按照AGPL协议进行流通，对修改后和衍生的代码必须向社会公开。
-4. 如果您修改了代码，需要在被修改的文件中进行说明，并遵守代码格式规范，帮助他人更好的
-   理解您的用意。
-5. 在延伸的代码中（修改和有源代码衍生的代码中）需要带有原来代码中的协议、版权声明和其他
-   原作者规定需要包含的说明（请尊重原作者的著作权，不要删除或修改文件中的`@author`信息）。
-6. 您可以应用于商业软件，但必须遵循以上条款原则（请协助改进本作品 http://jeesite.com）。
-7. 您若套用本平台的一些代码或功能参考，需要在您的软件介绍明显位置说明出处。
+1. 基于 Apache License Version 2.0 协议发布，可用于商业项目，但必须遵守以下补充条款。
+2. 不得将本软件应用于危害国家安全、荣誉和利益的行为，不能以任何形式用于非法为目的的行为。
+3. 在延伸的代码中（修改和有源代码衍生的代码中）需要带有原来代码中的协议、版权声明和其他原作者
+   规定需要包含的说明（请尊重原作者的著作权，不要删除或修改文件中的`Copyright`和`@author`信息）
+   更不要，全局替换源代码中的 jeesite 或 ThinkGem 等字样，否则你将违反本协议条款承担责任。
+4. 您若套用本软件的一些代码或功能参考，请保留源文件中的版权和作者，需要在您的软件介绍明显位置
+   说明出处，举例：本软件基于 JeeSite 快速开发平台，并附带链接：http://jeesite.com
+5. 任何基于本软件而产生的一切法律纠纷和责任，均于我司无关。
+6. 如果你对本软件有改进，希望可以贡献给我们，共同进步。
+7. 本项目已申请软件著作权，请尊重开源，感谢阅读。
+8. 本版本无用户数限制，无在线人数限制。
+
+版权所有：济南卓源软件有限公司
+
+官方网址：http://jeesite.com
+
+技术服务：http://s.jeesite.com

README.md

@@ -4,8 +4,8 @@
 </p>
 <h3 align="center" style="margin:30px 0 30px;font-weight:bold;font-size:30px;">快速开发平台 - Spring Boot</h3>
 <p align="center">
- <a href="https://jeesite.com/docs/upgrade/" target="__blank"><img alt="JeeSite-V4.3" src="https://img.shields.io/badge/JeeSite-V4.3-success.svg"></a>
- <a href="https://jeesite.com/docs/feature/" target="__blank"><img alt="SpringBoot-2.5" src="https://img.shields.io/badge/SpringBoot-2.5-blue.svg"></a>
+ <a href="https://jeesite.com/docs/upgrade/" target="__blank"><img alt="JeeSite-V5.0" src="https://img.shields.io/badge/JeeSite-V5.0-success.svg"></a>
+ <a href="https://spring.io/projects/spring-boot#learn" target="__blank"><img alt="SpringBoot-2.5" src="https://img.shields.io/badge/SpringBoot-2.5-blue.svg"></a>
  <a href="https://gitee.com/thinkgem/jeesite4/stargazers" target="__blank"><img alt="star" src="https://gitee.com/thinkgem/jeesite4/badge/star.svg?theme=dark"></a>
  <a href="https://gitee.com/thinkgem/jeesite4/members" target="__blank"><img alt="fork" src="https://gitee.com/thinkgem/jeesite4/badge/fork.svg?theme=dark"></a>
 </p>
@@ -21,13 +21,13 @@
 * 问题反馈：<http://jeesite.net> [【新手必读】](https://gitee.com/thinkgem/jeesite4/issues/I18ARR)
 * 关注微信公众号，了解最新动态：
 
-![JeeSite4微信公众号](https://images.gitee.com/uploads/images/2020/0727/091951_a3ab258c_6732.jpeg "JeeSite4微信公众号")
+![JeeSite微信公众号](https://images.gitee.com/uploads/images/2020/0727/091951_a3ab258c_6732.jpeg "JeeSite微信公众号")
 
 ## 平台介绍
 
-JeeSite 快速开发平台，不仅仅是一个后台开发框架，它是一个企业级快速开发解决方案，基于经典技术组合（Spring Boot、Spring MVC、Apache Shiro、MyBatis、Beetl、Bootstrap、AdminLTE）采用经典开发模式，让初学者能够更快的入门并投入到团队开发中去。在线代码生成功能，包括模块如：组织机构、角色用户、菜单及按钮授权、数据权限、系统参数、内容管理、工作流等。采用松耦合设计，模块增减便捷；界面无刷新，一键换肤；众多账号安全设置，密码策略；文件在线预览；消息推送；多元化第三方登录；在线定时任务配置；支持集群，支持SAAS；支持多数据源；支持读写分离、分库分表；支持微服务应用。
+JeeSite 快速开发平台，不仅仅是一个后台开发框架，它是一个企业级快速开发解决方案，后端基于经典组合 Spring Boot、Shiro、MyBatis，前端采用 Beetl、Bootstrap、AdminLTE 经典开发模式，或者分离版 Vue3、Vite、Ant Design Vue、TypeScript、Vben Admin 最先进技术栈。提供在线代码生成功能，包括模块如：组织机构、角色用户、菜单及按钮授权、数据权限、系统参数、内容管理、工作流等。采用松耦合设计，微内核和插件架构，模块增减便捷；界面无刷新，一键换肤；众多账号安全设置，密码策略；文件在线预览；消息推送；多元化第三方登录；在线定时任务配置；支持集群，支持SAAS；支持多数据源；支持读写分离、分库分表；支持微服务应用。
 
-JeeSite 快速开发平台的主要目的是能够让初级的研发人员快速的开发出复杂的业务功能（经典架构会的人多），让开发者注重专注业务，其余有平台来封装技术细节，降低技术难度，从而节省人力成本，缩短项目周期，提高软件安全质量。
+JeeSite 快速开发平台的主要目的是能够让初级的研发人员快速的开发出复杂的业务功能，中高级人员有时间做一些更有用的事情。让开发者注重专注业务，其余有平台来封装技术细节，降低技术难度，从而节省人力成本，缩短项目周期，提高软件安全质量。
 
 JeeSite 自 2013 年发布以来已被广大爱好者用到了企业、政府、医疗、金融、互联网等各个领域中，JeeSite 架构精良、易于扩展、大众思维的设计模式、工匠精神打磨每一个细节，深入开发者的内心，并荣获开源中国《最受欢迎中国开源软件》奖杯，期间也帮助了不少刚毕业的大学生，教师作为入门教材，快速的去实践。
 
@@ -37,24 +37,28 @@ JeeSite4 的升级，作者结合了多年总结和经验，以及各方面的
 
 JeeSite 整体架构清晰、稳定技术先进、源代码书写规范、经典技术会的人多、易于维护、易于扩展、安全稳定。
 
-JeeSite 功能全，JeeSite 的知识点非常多，也非常少。因为她使用的都是一些通用的技术，通俗的设计风格，大多数基础知识点多数人都能掌握，所以每一个 JeeSite 的功能点都非常容易掌握。只要你学会使用这些功能和组件的应用，就可以顺利的完成系统开发了。
+JeeSite 功能全，知识点非常多，也非常少。因为她使用的都是一些通用的技术，通俗的设计风格，大多数基础知识点多数人都能掌握，所以每一个 JeeSite 的功能点都非常容易掌握。只要你学会使用这些功能和组件的应用，就可以顺利的完成系统开发了。
 
 JeeSite 是一个低代码开发平台，具有较高的封装度、扩展性，封装不是限制你去做一些事情，而是在便捷的同时，也具有较好的扩展性，在不具备一些功能的情况下，JeeSite 提供了扩展接口，提供了原生调用方法。
 
-大家都在用 Spring ，在学习 Spring 架构的优点，Spring 提供了较好的扩展性，可又有多少人去修改它的源代码呢，退一步说，大家去修改了 Spring 的源码，反而会对未来升级造成很大困扰，您说不是呢？这样的例子很多，所以不要纠结，JeeSite 也一样具备强大的扩展性。
+大家都在用 Spring，也在学习 Spring 的优点，Spring 提供了较好的扩展性，可又有多少人去修改它的源代码呢，退一步说，大家去修改了 Spring 的源码，反而会对未来升级造成很大困扰，您说不是呢？这样的例子很多，所以不要纠结，我们非常注重着一块，JeeSite 也一样具备强大的扩展性。
 
-**发展至今 JeeSite 平台架构已经非常稳定，JeeSite 是一个专业的平台，是一个让你使用放心的平台。**
+* 至今 JeeSite 平台架构已经非常稳定。
+* JeeSite 精益求精，用心打磨每一个细节。
+* JeeSite 是一个专业的平台，是一个让你使用放心的平台。
 
-### v4 架构特点、安全方面等等的优势：<https://jeesite.com/docs/feature/>
+### 架构特点及安全方面的优势：<https://jeesite.com/docs/feature/>
 
 ## 技术选型
 
-* 主框架：Spring Boot 2.5、Spring Framework 5.3、Apache Shiro 1.7、J2Cache
-* 持久层：Apache MyBatis 3.5、Hibernate Validator 6.1、Alibaba Druid 1.2
+* 主框架：Spring Boot 2.5、Spring Framework 5.3、Apache Shiro 1.8、J2Cache
+* 持久层：Apache MyBatis 3.5、Hibernate Validator 6.2、Alibaba Druid 1.2
 * 视图层：Spring MVC 5.3、Beetl 3.3（替换JSP）、Bootstrap 3.3、AdminLTE 2.4
 * 前端组件：jQuery 3.5、jqGrid 4.7、layer 3.1、zTree 3.5、jQuery Validation
+* 支持 IE9 及以上版本及其他所有现代浏览器，如：谷歌浏览器、火狐浏览器、国产浏览器 等
 * 工作流引擎：Flowable 6.6、符合 BPMN 规范、在线流程设计器、中国式流程、退回、撤回、自由流
 * 技术选型（详细）：<http://jeesite.com/docs/technology/>
+* JeeSite Vue：<http://jeesite.com/docs/jeesite-vue/>
 
 ## 更多介绍
 
@@ -71,6 +75,7 @@ JeeSite 是一个低代码开发平台，具有较高的封装度、扩展性，
 * Flowable业务流程模块（BPM）：<http://jeesite.com/docs/bpm/>
 * 内容管理模块（CMS）：<https://gitee.com/thinkgem/jeesite4-cms>
 * 手机端移动端：<https://gitee.com/thinkgem/jeesite4-uniapp>
+* Vue3分离版本：<http://jeesite.com/docs/jeesite-vue/>
 
 ## 快速体验
 
@@ -80,9 +85,9 @@ JeeSite 是一个低代码开发平台，具有较高的封装度、扩展性，
 2. 账号：system
 3. 密码：admin
 
-### 本地快速运行
+### 本地运行
 
-1. 环境准备：`JDK 1.8 or 11`、`Maven 3.6+`、`MySQL 5.7 or 8.0`（[支持更多数据库](https://jeesite.com/docs/technology/#8已支持数据库)）
+1. 环境准备：`JDK 1.8 or 11、17`、`Maven 3.6+`、`MySQL 5.7 or 8.0`（[支持更多数据库](https://jeesite.com/docs/technology/#_8、已支持数据库)）
 2. 执行命令：`git clone https://gitee.com/thinkgem/jeesite4.git` 下载源码（master分支）
 3. 打开文件：`/web/src/main/resources/config/application.yml` 配置JDBC连接
 4. 执行脚本：`/web/bin/init-data.bat` 初始化数据库
@@ -90,7 +95,7 @@ JeeSite 是一个低代码开发平台，具有较高的封装度、扩展性，
 6. 浏览器访问：<http://127.0.0.1:8980/js/>  账号 system 密码 admin
 7. 部署常见问题：<https://jeesite.com/docs/faq/>
 
-### 开发环境部署
+### 开发环境
 
 1. 部署运行文档：<https://jeesite.com/docs/install-deploy/>
 2. 部署常见问题：<https://jeesite.com/docs/faq/>
@@ -132,16 +137,17 @@ JeeSite 是一个低代码开发平台，具有较高的封装度、扩展性，
 
 ## 授权协议声明
 
-1. 已开源的代码，授权协议采用 AGPL v3 + Apache Licence v2 进行发行。
-2. 您可以免费使用、修改和衍生代码，但不允许修改后和衍生的代码做为闭源软件发布。
-3. 修改后和衍生的代码必须也按照AGPL协议进行流通，对修改后和衍生的代码必须向社会公开。
-4. 如果您修改了代码，需要在被修改的文件中进行说明，并遵守代码格式规范，帮助他人更好的理解您的用意。
-5. 在延伸的代码中（修改和有源代码衍生的代码中）需要带有原来代码中的协议、版权声明和其他原作者规定
-需要包含的说明（请尊重原作者的著作权，不要删除或修改文件中的`@author`信息）。
-6. 您可以应用于商业软件，但必须遵循以上条款原则（请协助改进本作品）。
-7. 您若套用本平台的一些代码或功能参考，需要在您的软件介绍明显位置说明出处。
-8. 请知悉社区版，用户数不可超过100个，最大允许20个用户同时在线（不含匿名）。
-9. 无限制版下载：<https://gitee.com/thinkgem/jeesite4/tree/v4.0_dev/>
+1. 基于 Apache License Version 2.0 协议发布，可用于商业项目，但必须遵守以下补充条款。
+2. 不得将本软件应用于危害国家安全、荣誉和利益的行为，不能以任何形式用于非法为目的的行为。
+3. 在延伸的代码中（修改和有源代码衍生的代码中）需要带有原来代码中的协议、版权声明和其他原作者
+   规定需要包含的说明（请尊重原作者的著作权，不要删除或修改文件中的`Copyright`和`@author`信息）
+   更不要，全局替换源代码中的 jeesite 或 ThinkGem 等字样，否则你将违反本协议条款承担责任。
+4. 您若套用本软件的一些代码或功能参考，请保留源文件中的版权和作者，需要在您的软件介绍明显位置
+   说明出处，举例：本软件基于 JeeSite 快速开发平台，并附带链接：http://jeesite.com
+5. 任何基于本软件而产生的一切法律纠纷和责任，均于我司无关。
+6. 如果你对本软件有改进，希望可以贡献给我们，共同进步。
+7. 本项目已申请软件著作权，请尊重开源，感谢阅读。
+8. 本版本无用户数限制，无在线人数限制。
 
 ## 技术服务与支持
 

common/bin/deploy.bat

@@ -1,6 +1,7 @@
 @echo off
 rem /**
 rem  * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+rem  * No deletion without permission, or be held responsible to law.
 rem  *
 rem  * Author: ThinkGem@163.com
 rem  */

common/bin/deploy.sh

@@ -1,6 +1,7 @@
 #!/bin/sh
 # /**
 #  * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+#  * No deletion without permission, or be held responsible to law.
 #  *
 #  * Author: ThinkGem@163.com
 #  * 

common/bin/package.bat

@@ -1,6 +1,7 @@
 @echo off
 rem /**
 rem  * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+rem  * No deletion without permission, or be held responsible to law.
 rem  *
 rem  * Author: ThinkGem@163.com
 rem  */

common/bin/package.sh

@@ -1,6 +1,7 @@
 #!/bin/sh
 # /**
 #  * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+#  * No deletion without permission, or be held responsible to law.
 #  *
 #  * Author: ThinkGem@163.com
 #  * 

common/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.jeesite</groupId>
 		<artifactId>jeesite-parent</artifactId>
-		<version>4.3.0-SNAPSHOT</version>
+		<version>5.0.0-SNAPSHOT</version>
 		<relativePath>../parent/pom.xml</relativePath>
 	</parent>
 	
@@ -28,6 +28,11 @@
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-lang3</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-text</artifactId>
+		    <version>${commons-text.version}</version>
+		</dependency>
 		<dependency>
 			<groupId>commons-codec</groupId>
 			<artifactId>commons-codec</artifactId>
@@ -37,28 +42,11 @@
 			<artifactId>commons-io</artifactId>
 			<version>${commons-io.version}</version>
 		</dependency>
-		<dependency>
-		    <groupId>commons-fileupload</groupId>
-		    <artifactId>commons-fileupload</artifactId>
-		    <version>${commons-fileupload.version}</version>
-		</dependency>
 		<dependency>
 			<groupId>commons-beanutils</groupId>
 			<artifactId>commons-beanutils</artifactId>
 		    <version>${commons-beanutils.version}</version>
 		</dependency>
-		<dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>commons-text</artifactId>
-		    <version>${commons-text.version}</version>
-		</dependency>
-		
-		<!-- Apache Zip Tools
-		<dependency>
-			<groupId>org.apache.ant</groupId>
-			<artifactId>ant</artifactId>
-			<version>${ant.version}</version>
-		</dependency>  -->
 		
 		<!-- Java serialization -->
 		<dependency>
@@ -88,23 +76,6 @@
 			<version>${fastjson.version}</version>
 		</dependency>
 		
-		<!-- Java xml
-		<dependency>
-			<groupId>org.dom4j</groupId>
-			<artifactId>dom4j</artifactId>
-			<version>${dom4j.version}</version>
-		</dependency> -->
-		
-		<!-- jdk11 JAXB module
-		<dependency>
-			<groupId>jakarta.xml.bind</groupId>
-			<artifactId>jakarta.xml.bind-api</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.glassfish.jaxb</groupId>
-			<artifactId>jaxb-runtime</artifactId>
-		</dependency> -->
-		
 		<!-- XPath xml -->
 		<dependency>
 			<groupId>jaxen</groupId>
@@ -123,13 +94,6 @@
 			<artifactId>httpclient</artifactId>
 		</dependency>
 		
-		<!-- Jsoup HTTP
-		<dependency>
-			<groupId>org.jsoup</groupId>
-			<artifactId>jsoup</artifactId>
-			<version>${jsoup.version}</version>
-		</dependency> -->
-		
 		<!-- Email -->
 		<dependency>
 			<groupId>org.apache.commons</groupId>

common/src/main/java/com/jeesite/common/callback/MethodCallback.java

@@ -1,5 +1,6 @@
 /**
  * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+ * No deletion without permission, or be held responsible to law.
  */
 package com.jeesite.common.callback;
 

common/src/main/java/com/jeesite/common/codec/AesUtils.java

@@ -1,5 +1,6 @@
 /**
  * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+ * No deletion without permission, or be held responsible to law.
  */
 package com.jeesite.common.codec;
 

common/src/main/java/com/jeesite/common/codec/DesUtils.java

@@ -1,5 +1,6 @@
 /**
  * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+ * No deletion without permission, or be held responsible to law.
  */
 package com.jeesite.common.codec;
 

common/src/main/java/com/jeesite/common/codec/DigestUtils.java

@@ -1,5 +1,6 @@
 /**
  * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+ * No deletion without permission, or be held responsible to law.
  */
 package com.jeesite.common.codec;
 

common/src/main/java/com/jeesite/common/codec/EncodeUtils.java

@@ -31,8 +31,9 @@ import com.jeesite.common.lang.StringUtils;
  * 2.自制的base62 编码
  * 3.Commons-Lang的xml/html escape
  * 4.JDK提供的URLEncoder
- * @author calvin
- * @version 2013-01-15
+ * 5、XSS、SQL、orderBy 过滤器
+ * @author calvin、ThinkGem
+ * @version 2022-2-17
  */
 public class EncodeUtils {
 	
@@ -270,7 +271,7 @@ public class EncodeUtils {
 			}
 			if (logger.isInfoEnabled() && !value.equals(oriValue)){
 				logger.info("xssFilter: {}   <=<=<=   {}   source: {}", value, text,
-						request != null ? request.getRequestURL() : StringUtils.EMPTY);
+						request != null ? request.getRequestURL() : "common");
 			}
 			return value;
 		}
@@ -279,16 +280,18 @@ public class EncodeUtils {
 	
 	// 预编译SQL过滤正则表达式
 	private static Pattern sqlPattern = Pattern.compile(
-			"(?:')|(?:--)|(/\\*(?:.|[\\n\\r])*?\\*/)|((extractvalue|updatexml)([\\s]*?)\\()|"
-			+ "(\\b(select|update|and|or|delete|insert|trancate|char|into|substr|ascii|declare|exec|count|master|into|drop|execute|case when|sleep|union|load_file)\\b)",
+			"(?:')|(?:--)|(/\\*(?:.|[\\n\\r])*?\\*/)|((extractvalue|updatexml|if|mid|database|rand|user)([\\s]*?)\\()|"
+			+ "(\\b(select|update|and|or|delete|insert|trancate|char|into|substr|ascii|declare|exec|count|master|into|"
+			+ "drop|execute|case when|sleep|union|load_file)\\b)",
 			Pattern.CASE_INSENSITIVE);
+	private static Pattern orderByPattern = Pattern.compile("[a-z0-9_\\.\\, ]*", Pattern.CASE_INSENSITIVE);
 
 	/**
 	 * SQL过滤，防止注入，传入参数输入有select相关代码，替换空。
 	 * @author ThinkGem
 	 */
 	public static String sqlFilter(String text){
-		return sqlFilter(text, null);
+		return sqlFilter(text, "common");
 	}
 	/**
 	 * SQL过滤，防止注入，传入参数输入有select相关代码，替换空。
@@ -297,9 +300,16 @@ public class EncodeUtils {
 	public static String sqlFilter(String text, String source){
 		if (text != null){
 			String value = text;
-			Matcher matcher = sqlPattern.matcher(value);
-			if (matcher.find()) {
-				value = matcher.replaceAll(StringUtils.EMPTY);
+			if ("orderBy".equals(source)) {
+				Matcher matcher = orderByPattern.matcher(value);
+				if (!matcher.matches()) {
+					value = StringUtils.EMPTY;
+				}
+			} else {
+				Matcher matcher = sqlPattern.matcher(value);
+				if (matcher.find()) {
+					value = matcher.replaceAll(StringUtils.EMPTY);
+				}
 			}
 			if (logger.isWarnEnabled() && !value.equals(text)){
 				logger.info("sqlFilter: {}   <=<=<=   {}   source: {}", value, text, source);
@@ -310,38 +320,38 @@ public class EncodeUtils {
 		return null;
 	}
 	
-	public static void main(String[] args) {
-		int i = 0;
-//		xssFilter((++i)+"你好，<script>alert(document.cookie)</script>我还在。");
-//		xssFilter((++i)+"你好，<strong>加粗文字</strong>我还在。");
-//		xssFilter("<!--HTML-->"+(++i)+"你好，\"><strong>加粗文字</strong>我还在。");
-//		xssFilter("<!--HTML-->"+(++i)+"你好，<iframe src=\"abcdef\"></iframe><strong>加粗文字</strong>我还在。");
-//		xssFilter("<!--HTML-->"+(++i)+"你好，<iframe src=\"abcdef\"/><strong>加粗文字</strong>我还在。");
-//		xssFilter("<!--HTML-->"+(++i)+"你好，<iframe src=\"abcdef\"><strong>加粗文字</strong>我还在。");
-//		xssFilter("<!--HTML-->"+(++i)+"你好，<script type=\"text/javascript\">alert(document.cookie)</script>我还在。");
-//		xssFilter("<!--HTML-->"+(++i)+"你好，<script\n type=\"text/javascript\">\nalert(document.cookie)\n</script>我还在。");
-//		xssFilter("<!--HTML-->"+(++i)+"你好，<script src='' onerror='alert(document.cookie)'></script>我还在。");
-//		xssFilter("<!--HTML-->"+(++i)+"你好，<script type=text/javascript>alert()我还在。");
-//		xssFilter("<!--HTML-->"+(++i)+"你好，<script>alert(document.cookie)</script>我还在。");
-//		xssFilter("<!--HTML-->"+(++i)+"你好，<script>window.location='url'我还在。");
-//		xssFilter("<!--HTML-->"+(++i)+"你好，</script></iframe>我还在。");
-//		xssFilter("<!--HTML-->"+(++i)+"你好，eval(abc)我还在。");
-//		xssFilter("<!--HTML-->"+(++i)+"你好，xpression(abc)我还在。");
-//		xssFilter("<!--HTML-->"+(++i)+"你好，<img src='abc.jpg' onerror='location='';alert(document.cookie);'></img>我还在。");
-//		xssFilter("<!--HTML-->"+(++i)+"你好，<img src='abc.jpg' onerror='alert(document.cookie);'/>我还在。");
-//		xssFilter("<!--HTML-->"+(++i)+"你好，<img src='abc.jpg' onerror='alert(document.cookie);'>我还在。");
-//		xssFilter("<!--HTML-->"+(++i)+"你好，<a onload='alert(\"abc\")'>hello</a>我还在。");
-//		xssFilter("<!--HTML-->"+(++i)+"你好，<a href=\"/abc\">hello</a>我还在。");
-//		xssFilter("<!--HTML-->"+(++i)+"你好，<a href='/abc'>hello</a>我还在。");
-//		xssFilter("<!--HTML-->"+(++i)+"你好，<a href='vbscript:alert(\"abc\");'>hello</a>我还在。");
-//		xssFilter("<!--HTML-->"+(++i)+"你好，<a href='javascript:alert(\"abc\");'>hello</a>我还在。");
-//		xssFilter("<!--HTML-->"+(++i)+"你好，?abc=def&hello=123&world={\"a\":1}我还在。");
-//		xssFilter("<!--HTML-->"+(++i)+"你好，?abc=def&hello=123&world={'a':1}我还在。");
-		sqlFilter((++i)+"你好，select * from xxx where abc=def and 1=1我还在。");
-		sqlFilter((++i)+"你好，insert into xxx values(1,2,3,4,5)我还在。");
-		sqlFilter((++i)+"你好，delete from xxx我还在。");
-		sqlFilter((++i)+"你好，a.audit_result asc,case when 1 like case when length(database())=6 then 1 else exp(11111111111111111) end then 1 else 1/0 end");
-		sqlFilter((++i)+"你好，if(1=2,1,SLEEP(10))");
-	}
+//	public static void main(String[] args) {
+//		xssFilter("1 你好 <script>alert(document.cookie)</script>我还在。");
+//		xssFilter("2 你好 <strong>加粗文字</strong>我还在。");
+//		xssFilter("<!--HTML-->3 你好 \"><strong>加粗文字</strong>我还在。");
+//		xssFilter("<!--HTML-->4 你好 <iframe src=\"abcdef\"></iframe><strong>加粗文字</strong>我还在。");
+//		xssFilter("<!--HTML-->5 你好 <iframe src=\"abcdef\"/><strong>加粗文字</strong>我还在。");
+//		xssFilter("<!--HTML-->6 你好 <iframe src=\"abcdef\"><strong>加粗文字</strong>我还在。");
+//		xssFilter("<!--HTML-->7 你好 <script type=\"text/javascript\">alert(document.cookie)</script>我还在。");
+//		xssFilter("<!--HTML-->8 你好 <script\n type=\"text/javascript\">\nalert(document.cookie)\n</script>我还在。");
+//		xssFilter("<!--HTML-->9 你好 <script src='' onerror='alert(document.cookie)'></script>我还在。");
+//		xssFilter("<!--HTML-->10 你好 <script type=text/javascript>alert()我还在。");
+//		xssFilter("<!--HTML-->11 你好 <script>alert(document.cookie)</script>我还在。");
+//		xssFilter("<!--HTML-->12 你好 <script>window.location='url'我还在。");
+//		xssFilter("<!--HTML-->13 你好 </script></iframe>我还在。");
+//		xssFilter("<!--HTML-->14 你好 eval(abc)我还在。");
+//		xssFilter("<!--HTML-->15 你好 xpression(abc)我还在。");
+//		xssFilter("<!--HTML-->16 你好 <img src='abc.jpg' onerror='location='';alert(document.cookie);'></img>我还在。");
+//		xssFilter("<!--HTML-->17 你好 <img src='abc.jpg' onerror='alert(document.cookie);'/>我还在。");
+//		xssFilter("<!--HTML-->18 你好 <img src='abc.jpg' onerror='alert(document.cookie);'>我还在。");
+//		xssFilter("<!--HTML-->19 你好 <a onload='alert(\"abc\")'>hello</a>我还在。");
+//		xssFilter("<!--HTML-->20 你好 <a href=\"/abc\">hello</a>我还在。");
+//		xssFilter("<!--HTML-->21 你好 <a href='/abc'>hello</a>我还在。");
+//		xssFilter("<!--HTML-->22 你好 <a href='vbscript:alert(\"abc\");'>hello</a>我还在。");
+//		xssFilter("<!--HTML-->23 你好 <a href='javascript:alert(\"abc\");'>hello</a>我还在。");
+//		xssFilter("<!--HTML-->24 你好 ?abc=def&hello=123&world={\"a\":1}我还在。");
+//		xssFilter("<!--HTML-->25 你好 ?abc=def&hello=123&world={'a':1}我还在。");
+//		sqlFilter("1 你好 select * from xxx where abc=def and 1=1我还在。");
+//		sqlFilter("2 你好 insert into xxx values(1,2,3,4,5)我还在。");
+//		sqlFilter("3 你好 delete from xxx我还在。");
+//		sqlFilter("4 a.audit_result asc,case when 1 like case when length(database())=6 then 1 else exp(111) end then 1 else 1/0 end", "orderBy");
+//		sqlFilter("5 if(1=2,1,SLEEP(10)), if(mid(database(),{},1)=\\\"{}\\\",a.id,a.login_name)", "orderBy");
+//		sqlFilter("6 a.audit_result asc, b.audit_result2 desc, b.AuditResult3 desc", "orderBy");
+//	}
 	
 }

common/src/main/java/com/jeesite/common/codec/Md5Utils.java

@@ -1,5 +1,6 @@
 /**
  * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+ * No deletion without permission, or be held responsible to law.
  */
 package com.jeesite.common.codec;
 

common/src/main/java/com/jeesite/common/codec/Sha1Utils.java

@@ -1,5 +1,6 @@
 /**
  * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+ * No deletion without permission, or be held responsible to law.
  */
 package com.jeesite.common.codec;
 

common/src/main/java/com/jeesite/common/collect/ListUtils.java

@@ -1,5 +1,6 @@
 /**
  * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+ * No deletion without permission, or be held responsible to law.
  */
 package com.jeesite.common.collect;
 

common/src/main/java/com/jeesite/common/collect/MapUtils.java

@@ -1,5 +1,6 @@
 /**
  * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+ * No deletion without permission, or be held responsible to law.
  */
 package com.jeesite.common.collect;
 

common/src/main/java/com/jeesite/common/collect/SetUtils.java

@@ -1,5 +1,6 @@
 /**
  * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+ * No deletion without permission, or be held responsible to law.
  */
 package com.jeesite.common.collect;
 

common/src/main/java/com/jeesite/common/exec/CommandUtils.java

@@ -1,5 +1,6 @@
 /**
  * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+ * No deletion without permission, or be held responsible to law.
  */
 package com.jeesite.common.exec;
 

common/src/main/java/com/jeesite/common/idgen/IdGen.java

@@ -1,5 +1,6 @@
 /**
  * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+ * No deletion without permission, or be held responsible to law.
  */
 package com.jeesite.common.idgen;
 

common/src/main/java/com/jeesite/common/idgen/IdWorker.java

@@ -1,5 +1,6 @@
 /**
  * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+ * No deletion without permission, or be held responsible to law.
  */
 package com.jeesite.common.idgen;
 

common/src/main/java/com/jeesite/common/image/CaptchaUtils.java

@@ -1,5 +1,6 @@
 /**
  * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+ * No deletion without permission, or be held responsible to law.
  */
 package com.jeesite.common.image;
 
@@ -58,8 +59,8 @@ public class CaptchaUtils {
 	        		
 	        		// 设置字体大小
 	        		RandomFontFactory ff = new RandomFontFactory();
-	        		ff.setMinSize(28);
-	        		ff.setMaxSize(28);
+	        		ff.setMinSize(25);
+	        		ff.setMaxSize(25);
 	        		ccs.setFontFactory(ff);
 	        		
 	        		// 设置文字渲染边距

common/src/main/java/com/jeesite/common/image/ImageUtils.java

@@ -1,5 +1,6 @@
 /**
  * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+ * No deletion without permission, or be held responsible to law.
  */
 package com.jeesite.common.image;
 

common/src/main/java/com/jeesite/common/image/ZxingUtils.java

@@ -1,5 +1,6 @@
 /**
  * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+ * No deletion without permission, or be held responsible to law.
  */
 package com.jeesite.common.image;
 

common/src/main/java/com/jeesite/common/io/FileUtils.java

@@ -1,5 +1,6 @@
 /**
  * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+ * No deletion without permission, or be held responsible to law.
  */
 package com.jeesite.common.io;
 

common/src/main/java/com/jeesite/common/io/IOUtils.java

@@ -1,5 +1,6 @@
 /**
  * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+ * No deletion without permission, or be held responsible to law.
  */
 package com.jeesite.common.io;
 

common/src/main/java/com/jeesite/common/io/PropertiesUtils.java

@@ -1,5 +1,6 @@
 /**
  * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+ * No deletion without permission, or be held responsible to law.
  */
 package com.jeesite.common.io;
 

common/src/main/java/com/jeesite/common/io/PropertyLoader.java

@@ -1,5 +1,6 @@
 /**
  * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+ * No deletion without permission, or be held responsible to law.
  */
 package com.jeesite.common.io;
 

common/src/main/java/com/jeesite/common/io/ResourceUtils.java

@@ -1,5 +1,6 @@
 /**
  * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+ * No deletion without permission, or be held responsible to law.
  */
 package com.jeesite.common.io;
 

common/src/main/java/com/jeesite/common/lang/ByteUtils.java

@@ -1,5 +1,6 @@
 /**
  * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+ * No deletion without permission, or be held responsible to law.
  */
 package com.jeesite.common.lang;
 

common/src/main/java/com/jeesite/common/lang/DateUtils.java

@@ -1,5 +1,6 @@
 /**
  * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+ * No deletion without permission, or be held responsible to law.
  */
 package com.jeesite.common.lang;
 

common/src/main/java/com/jeesite/common/lang/NumberUtils.java

@@ -1,5 +1,6 @@
 /**
  * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+ * No deletion without permission, or be held responsible to law.
  */
 package com.jeesite.common.lang;
 

common/src/main/java/com/jeesite/common/lang/ObjectUtils.java

@@ -1,5 +1,6 @@
 /**
  * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+ * No deletion without permission, or be held responsible to law.
  */
 package com.jeesite.common.lang;
 
@@ -25,6 +26,12 @@ import org.springframework.core.NamedThreadLocal;
 public class ObjectUtils extends org.apache.commons.lang3.ObjectUtils {
 
 	private static Logger logger = LoggerFactory.getLogger(ObjectUtils.class);
+	private static final boolean isJavaSerialize; 
+	
+	static {
+		String[] ver = StringUtils.split(System.getProperty("java.version"), '.');
+		isJavaSerialize = ver.length > 0 && Integer.parseInt(ver[0]) > 1;
+	}
 	
 	/**
 	 * 转换为 Double 类型
@@ -154,7 +161,16 @@ public class ObjectUtils extends org.apache.commons.lang3.ObjectUtils {
 	 * @return
 	 */
 	public static byte[] serialize(Object object) {
-		return ObjectUtils.serializeFst(object);
+		try {
+			if (isJavaSerialize) {
+				return ObjectUtils.serializeJava(object);
+			}else {
+				return ObjectUtils.serializeFst(object);
+			}
+		} catch (Exception e) {
+			logger.error("serialize", e);
+		}
+		return null;
 	}
 
 	/**
@@ -163,7 +179,16 @@ public class ObjectUtils extends org.apache.commons.lang3.ObjectUtils {
 	 * @return
 	 */
 	public static Object unserialize(byte[] bytes) {
-		return ObjectUtils.unserializeFst(bytes);
+		try {
+			if (isJavaSerialize) {
+				return ObjectUtils.unserializeJava(bytes);
+			}else {
+				return ObjectUtils.unserializeFst(bytes);
+			}
+		} catch (Exception e) {
+			logger.error("unserialize", e);
+		}
+		return null;
 	}
 	
 	/**
@@ -185,7 +210,7 @@ public class ObjectUtils extends org.apache.commons.lang3.ObjectUtils {
 			e.printStackTrace();
 		}
 		long totalTime = System.currentTimeMillis() - beginTime;
-		if (totalTime > 3000){
+		if (totalTime > 30000){
 			logger.warn(object.getClass() + " serialize time: " + TimeUtils.formatDateAgo(totalTime));
 		}
 		return bytes;
@@ -211,7 +236,7 @@ public class ObjectUtils extends org.apache.commons.lang3.ObjectUtils {
 			}
 		}
 		long totalTime = System.currentTimeMillis() - beginTime;
-		if (totalTime > 3000){
+		if (totalTime > 30000 && object != null){
 			logger.warn(object.getClass() + " unserialize time: " + TimeUtils.formatDateAgo(totalTime));
 		}
 		return object;
@@ -236,7 +261,7 @@ public class ObjectUtils extends org.apache.commons.lang3.ObjectUtils {
 		long beginTime = System.currentTimeMillis();
 		byte[] bytes = fstConfiguration.get().asByteArray(object);
 		long totalTime = System.currentTimeMillis() - beginTime;
-		if (totalTime > 3000){
+		if (totalTime > 30000){
 			logger.warn(object.getClass() + " fst serialize time: " + TimeUtils.formatDateAgo(totalTime));
 		}
 		return bytes;
@@ -254,7 +279,7 @@ public class ObjectUtils extends org.apache.commons.lang3.ObjectUtils {
 		long beginTime = System.currentTimeMillis();
 		Object object = fstConfiguration.get().asObject(bytes);
 		long totalTime = System.currentTimeMillis() - beginTime;
-		if (totalTime > 3000){
+		if (totalTime > 30000 && object != null){
 			logger.warn(object.getClass() + " fst unserialize time: " + TimeUtils.formatDateAgo(totalTime));
 		}
 		return object;

common/src/main/java/com/jeesite/common/lang/StringUtils.java

@@ -1,5 +1,6 @@
 /**
  * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+ * No deletion without permission, or be held responsible to law.
  */
 package com.jeesite.common.lang;
 

common/src/main/java/com/jeesite/common/lang/TimeUtils.java

@@ -1,5 +1,6 @@
 /**
  * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+ * No deletion without permission, or be held responsible to law.
  */
 package com.jeesite.common.lang;
 

common/src/main/java/com/jeesite/common/mapper/JsonMapper.java

@@ -1,5 +1,6 @@
 /**
  * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+ * No deletion without permission, or be held responsible to law.
  */
 package com.jeesite.common.mapper;
 
@@ -31,7 +32,6 @@ import com.fasterxml.jackson.databind.introspect.Annotated;
 import com.fasterxml.jackson.databind.introspect.AnnotatedMethod;
 import com.fasterxml.jackson.databind.introspect.JacksonAnnotationIntrospector;
 import com.fasterxml.jackson.databind.util.JSONPObject;
-import com.fasterxml.jackson.module.jaxb.JaxbAnnotationModule;
 import com.jeesite.common.collect.ListUtils;
 import com.jeesite.common.io.PropertiesUtils;
 import com.jeesite.common.lang.DateUtils;
@@ -221,15 +221,15 @@ public class JsonMapper extends ObjectMapper {
 		return this;
 	}
 
-	/**
-	 * 支持使用Jaxb的Annotation，使得POJO上的annotation不用与Jackson耦合。
-	 * 默认会先查找jaxb的annotation，如果找不到再找jackson的。
-	 */
-	public JsonMapper enableJaxbAnnotation() {
-		JaxbAnnotationModule module = new JaxbAnnotationModule();
-		this.registerModule(module);
-		return this;
-	}
+//	/**
+//	 * 支持使用Jaxb的Annotation，使得POJO上的annotation不用与Jackson耦合。
+//	 * 默认会先查找jaxb的annotation，如果找不到再找jackson的。
+//	 */
+//	public JsonMapper enableJaxbAnnotation() {
+//		JaxbAnnotationModule module = new JaxbAnnotationModule();
+//		this.registerModule(module);
+//		return this;
+//	}
 
 	/**
 	 * 取出Mapper做进一步的设置或使用其他序列化API.

common/src/main/java/com/jeesite/common/mapper/XmlMapper.java

@@ -1,5 +1,6 @@
 /**
  * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+ * No deletion without permission, or be held responsible to law.
  */
 package com.jeesite.common.mapper;
 

common/src/main/java/com/jeesite/common/msg/EmailUtils.java

@@ -1,5 +1,6 @@
 /**
  * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+ * No deletion without permission, or be held responsible to law.
  */
 package com.jeesite.common.msg;
 

common/src/main/java/com/jeesite/common/network/MacUtils.java

@@ -1,5 +1,6 @@
 /**
  * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+ * No deletion without permission, or be held responsible to law.
  */
 package com.jeesite.common.network;
 

common/src/main/java/com/jeesite/common/reflect/ClassUtils.java

@@ -1,5 +1,6 @@
 /**
  * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+ * No deletion without permission, or be held responsible to law.
  */
 package com.jeesite.common.reflect;
 
@@ -287,7 +288,10 @@ abstract class VFS {
 
 		// Try each implementation class until a valid one is found
 		VFS vfs = null;
-		for (int i = 0; vfs == null || !vfs.isValid(); i++) {
+		for (int i = 0; true; i++) {
+			if (!(vfs == null || !vfs.isValid())) {
+				break;
+			}
 			Class<? extends VFS> impl = impls.get(i);
 			try {
 				vfs = impl.getDeclaredConstructor().newInstance();
@@ -301,7 +305,7 @@ abstract class VFS {
 			}
 		}
 
-		log.debug("Using VFS adapter " + vfs.getClass().getName());
+		log.debug("Using VFS adapter " + vfs == null ? null : vfs.getClass().getName());
 		return VFS.instance = vfs;
 	}
 

common/src/main/java/com/jeesite/common/text/PinyinUtils.java

@@ -52,7 +52,7 @@ public class PinyinUtils {
 			if (arr[i] > 128) {
 				try {
 					String[] temp = PinyinHelper.toHanyuPinyinStringArray(arr[i], Static.defaultFormat);
-					if (temp != null) {
+					if (temp != null && temp.length > 0) {
 						pybf.append(temp[0].charAt(0));
 					}else{
 						pybf.append(String.valueOf(arr[i]));
@@ -155,6 +155,7 @@ public class PinyinUtils {
 	}
 	
 //	public static void main(String[] args) {
+//		String str = "你好，123，🅻🅾🆅🅴、世界abc,~!#$_Sdf，女；ｈｅｌｌｏ！-";
 //		String str = "你好，123，世界abc,~!#$_Sdf，女；ｈｅｌｌｏ！-";
 //		System.out.println(getFirstSpell(str));
 //		System.out.println(getFirstSpell(str, false));

common/src/main/java/com/jeesite/common/ueditor/upload/BinaryUploader.java

@@ -10,15 +10,9 @@ import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
 
-import org.apache.commons.fileupload.FileItemIterator;
-import org.apache.commons.fileupload.FileItemStream;
-import org.apache.commons.fileupload.FileUploadException;
-import org.apache.commons.fileupload.disk.DiskFileItemFactory;
-import org.apache.commons.fileupload.servlet.ServletFileUpload;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
 
-import com.jeesite.common.codec.EncodeUtils;
 import com.jeesite.common.image.ImageUtils;
 import com.jeesite.common.io.FileUtils;
 import com.jeesite.common.media.VideoUtils;
@@ -33,54 +27,32 @@ public class BinaryUploader {
 
 	public static final State save(HttpServletRequest request,
 			Map<String, Object> conf) {
-		FileItemStream fileStream = null; // 原始上传
-		MultipartFile fileStream2 = null; // Spring MVC 上传
-		boolean isAjaxUpload = request.getHeader("X-Requested-With") != null;
-				
-		if (!ServletFileUpload.isMultipartContent(request)) {
+		
+		String contentType = request.getContentType();
+		if (!("POST".equals(request.getMethod()) && contentType != null
+				&& contentType.startsWith("multipart/"))) {
 			return new BaseState(false, AppInfo.NOT_MULTIPART_CONTENT);
 		}
 
-		ServletFileUpload upload = new ServletFileUpload(new DiskFileItemFactory());
-
-        if ( isAjaxUpload ) {
-            upload.setHeaderEncoding( EncodeUtils.UTF_8 );
-        }
-
 		try {
-			FileItemIterator iterator = upload.getItemIterator(request);
-
-			while (iterator.hasNext()) {
-				fileStream = iterator.next();
-
-				if (!fileStream.isFormField()) {
+			MultipartFile file = null;
+			if (request instanceof MultipartHttpServletRequest){
+				MultipartHttpServletRequest multiRequest = (MultipartHttpServletRequest) request;
+				Iterator<String> it = multiRequest.getFileNames();
+				while (it.hasNext()) {
+					MultipartFile f = multiRequest.getFile(it.next());
+					if (f != null && !f.isEmpty() && f.getOriginalFilename() != null) {
+						file = f;
+					}
 					break;
 				}
-				fileStream = null;
 			}
-
-			if (fileStream == null) {
-				// 原始上传无文件，则检查是否是Spring MVC上传 ThinkGem
-				MultipartFile file = null;
-				if (request instanceof MultipartHttpServletRequest){
-					MultipartHttpServletRequest multiRequest = (MultipartHttpServletRequest) request;
-					Iterator<String> it = multiRequest.getFileNames();
-					while (it.hasNext()) {
-						file = multiRequest.getFile(it.next());
-						break;
-					}
-				}
-				if (file != null && !file.isEmpty() && file.getOriginalFilename() != null) {
-					fileStream2 = file;
-				}
-			}
-			
-			if (fileStream == null && fileStream2 == null) {
+			if (file == null) {
 				return new BaseState(false, AppInfo.NOTFOUND_UPLOAD_DATA);
 			}
 
 			String savePath = (String) conf.get("savePath");
-			String originFileName = fileStream != null ? fileStream.getName() : fileStream2.getOriginalFilename();
+			String originFileName = file.getOriginalFilename();
 			String suffix = FileType.getSuffixByFilename(originFileName);
 
 			originFileName = originFileName.substring(0,
@@ -97,11 +69,18 @@ public class BinaryUploader {
 
 			String physicalPath = FileUtils.path((String) conf.get("rootPath") + savePath);
 
-			InputStream is = fileStream != null ? fileStream.openStream() : fileStream2.getInputStream();
-			State storageState = StorageManager.saveFileByInputStream(is, physicalPath, maxSize);
-			is.close();
+			InputStream is = null;
+			State storageState = null;
+			try {
+				is = file.getInputStream();
+				storageState = StorageManager.saveFileByInputStream(is, physicalPath, maxSize);
+			} finally {
+				if (is != null) {
+					is.close();
+				}
+			}
 
-			if (storageState.isSuccess()) {
+			if (storageState != null && storageState.isSuccess()) {
 				int actionCode = ((Integer) conf.get("actionCode")).intValue();
 				String ctx = request.getContextPath(); // ThinkGem 修正上传图片后返回无contextpath问题
 				
@@ -154,8 +133,6 @@ public class BinaryUploader {
 			}
 
 			return storageState;
-		} catch (FileUploadException e) {
-			return new BaseState(false, AppInfo.PARSE_REQUEST_ERROR);
 		} catch (IOException e) {
 			return new BaseState(false, AppInfo.IO_ERROR);
 		}

common/src/main/java/com/jeesite/common/utils/excel/ExcelException.java

@@ -1,5 +1,6 @@
 /**
  * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+ * No deletion without permission, or be held responsible to law.
  */
 package com.jeesite.common.utils.excel;
 

common/src/main/java/com/jeesite/common/utils/excel/ExcelExport.java

@@ -1,5 +1,6 @@
 /**
  * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+ * No deletion without permission, or be held responsible to law.
  */
 package com.jeesite.common.utils.excel;
 
@@ -8,6 +9,7 @@ import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
+import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
@@ -202,6 +204,16 @@ public class ExcelExport implements Closeable{
 	 */
 	public void createSheet(String sheetName, String title, Class<?> cls, Type type, String... groups){
 		this.annotationList = ListUtils.newArrayList();
+		// Get constructor annotation
+		Constructor<?>[] cs = cls.getConstructors();
+		for (Constructor<?> c : cs) {
+			ExcelFields efs = c.getAnnotation(ExcelFields.class);
+			if (efs != null && efs.value() != null){
+				for (ExcelField ef : efs.value()){
+					addAnnotation(annotationList, ef, c, type, groups);
+				}
+			}
+		}
 		// Get annotation field
 		Field[] fs = cls.getDeclaredFields();
 		for (Field f : fs){

common/src/main/java/com/jeesite/common/utils/excel/ExcelImport.java

@@ -1,5 +1,6 @@
 /**
  * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+ * No deletion without permission, or be held responsible to law.
  */
 package com.jeesite.common.utils.excel;
 
@@ -8,6 +9,7 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
@@ -354,6 +356,16 @@ public class ExcelImport implements Closeable {
 	@SuppressWarnings("unchecked")
 	public <E> List<E> getDataList(Class<E> cls, MethodCallback exceptionCallback, String... groups) throws Exception{
 		List<Object[]> annotationList = ListUtils.newArrayList();
+		// Get constructor annotation
+		Constructor<?>[] cs = cls.getConstructors();
+		for (Constructor<?> c : cs) {
+			ExcelFields efs = c.getAnnotation(ExcelFields.class);
+			if (efs != null && efs.value() != null){
+				for (ExcelField ef : efs.value()){
+					addAnnotation(annotationList, ef, c, Type.IMPORT, groups);
+				}
+			}
+		}
 		// Get annotation field 
 		Field[] fs = cls.getDeclaredFields();
 		for (Field f : fs){

common/src/main/java/com/jeesite/common/utils/excel/ExcelReader.java

@@ -1,5 +1,6 @@
 /**
  * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+ * No deletion without permission, or be held responsible to law.
  */
 package com.jeesite.common.utils.excel;
 

common/src/main/java/com/jeesite/common/utils/excel/ExcelWriter.java

@@ -1,5 +1,6 @@
 /**
  * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+ * No deletion without permission, or be held responsible to law.
  */
 package com.jeesite.common.utils.excel;
 

common/src/main/java/com/jeesite/common/utils/excel/annotation/ExcelField.java

@@ -1,5 +1,6 @@
 /**
  * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+ * No deletion without permission, or be held responsible to law.
  */
 package com.jeesite.common.utils.excel.annotation;
 
@@ -15,7 +16,7 @@ import com.jeesite.common.utils.excel.fieldtype.FieldType;
  * @author ThinkGem
  * @version 2020-3-5
  */
-@Target({ElementType.METHOD, ElementType.FIELD, ElementType.TYPE})
+@Target({ElementType.METHOD, ElementType.FIELD})
 @Retention(RetentionPolicy.RUNTIME)
 public @interface ExcelField {
 

common/src/main/java/com/jeesite/common/utils/excel/annotation/ExcelFields.java

@@ -1,5 +1,6 @@
 /**
  * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+ * No deletion without permission, or be held responsible to law.
  */
 package com.jeesite.common.utils.excel.annotation;
 
@@ -13,7 +14,7 @@ import java.lang.annotation.Target;
  * @author ThinkGem
  * @version 2016-11-9
  */
-@Target({ElementType.METHOD, ElementType.FIELD, ElementType.TYPE})
+@Target({ElementType.METHOD, ElementType.FIELD, ElementType.CONSTRUCTOR})
 @Retention(RetentionPolicy.RUNTIME)
 public @interface ExcelFields {
 

common/src/main/java/com/jeesite/common/utils/excel/fieldtype/FieldType.java

@@ -1,5 +1,6 @@
 /**
  * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+ * No deletion without permission, or be held responsible to law.
  */
 package com.jeesite.common.utils.excel.fieldtype;
 

common/src/main/java/com/jeesite/common/utils/excel/fieldtype/MoneyType.java

@@ -1,5 +1,6 @@
 /**
  * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+ * No deletion without permission, or be held responsible to law.
  */
 package com.jeesite.common.utils.excel.fieldtype;
 

common/src/main/java/com/jeesite/common/web/CookieUtils.java

@@ -1,5 +1,6 @@
 /**
  * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+ * No deletion without permission, or be held responsible to law.
  */
 package com.jeesite.common.web;
 

common/src/main/java/com/jeesite/common/web/http/HttpClientUtils.java

@@ -1,5 +1,6 @@
 /**
  * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+ * No deletion without permission, or be held responsible to law.
  */
 package com.jeesite.common.web.http;
 

common/src/main/java/com/jeesite/common/web/http/ServletUtils.java

@@ -1,5 +1,6 @@
 /**
  * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+ * No deletion without permission, or be held responsible to law.
  */
 package com.jeesite.common.web.http;
 

common/src/main/java/com/jeesite/common/web/http/UserAgentUtils.java

@@ -1,5 +1,6 @@
 /**
  * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+ * No deletion without permission, or be held responsible to law.
  */
 package com.jeesite.common.web.http;
 

common/src/main/resources/static/adminlte/css/skins/skin-black-light2.css

@@ -145,7 +145,8 @@
   border-bottom-left-radius: 0;
 }
 .main-footer {
-  border-top-color: #d2d6de;
+  border-top-color: #e5e5e5;
+  border-radius: 4px;
 }
 .skin-blue.layout-top-nav .main-header > .logo {
   background-color: #2A579A;

common/src/main/resources/static/adminlte/css/skins/skin-blue-light.css

@@ -144,7 +144,8 @@
   border-bottom-left-radius: 0;
 }
 .main-footer {
-  border-top-color: #d2d6de;
+  border-top-color: #e5e5e5;
+  border-radius: 4px;
 }
 .skin-blue.layout-top-nav .main-header > .logo {
   background-color: #2A579A;

common/src/main/resources/static/adminlte/css/skins/skin-blue-light2.css

@@ -5,7 +5,11 @@ a, a:hover, a:active, a:focus, .form-unit, th[aria-selected=true] .ui-jqgrid-sor
   color:#1890ff;
 }
 .main-header .navbar {
-  background-color: #1890ff;
+  background: #1890ff;
+  background: -webkit-gradient(linear, left bottom, right top, color-stop(0, #2684f5), color-stop(1, #1890ff));
+  background: -ms-linear-gradient(left, #2684f5, #1890ff);
+  background: -moz-linear-gradient(left top, #2684f5 0%, #1890ff 100%);
+  background: -o-linear-gradient(#1890ff, #2684f5);
 }
 .main-header .navbar .nav > li > a {
   color: #ffffff;
@@ -146,7 +150,8 @@ a, a:hover, a:active, a:focus, .form-unit, th[aria-selected=true] .ui-jqgrid-sor
   border-bottom-left-radius: 0;
 }
 .main-footer {
-  border-top-color: #d2d6de;
+  border-top-color: #e5e5e5;
+  border-radius: 4px;
 }
 .skin-blue.layout-top-nav .main-header > .logo {
   background-color: #1890ff;
@@ -157,9 +162,22 @@ a, a:hover, a:active, a:focus, .form-unit, th[aria-selected=true] .ui-jqgrid-sor
   background-color: #3b8ab8;
 }
 
-.sidebar-menu .treeview-item.active > a {color:#1890ff;background-color:#e1f1ff;border-right:solid #57a6ee;}
+.sidebar-menu {padding:0 8px 0 7px;}
+.sidebar-menu li>a>.pull-right-container {left:0;}
+.sidebar-menu .treeview-item.active>a {color:#1890ff;background-color:#e7f4ff;border-right:0;border-radius:6px;}
 
-.content-wrapper, .right-side, body {background-color:#f8f8f8;}
+.content-wrapper, .right-side, body {background-color:#f0f2f5;}
+
+/* 页签-经典风格 */
+.tabpanel_mover li {height:26px;padding:1px 16px 2px 3px;margin:6px 0 6px 6px;border:1px solid #e4e4e4;border-radius:3px;background:#fff;}
+.tabpanel_mover li.active {background-color:#3aa0ff;box-shadow:0 0 5px #e6e6e6;}
+.tabpanel_mover li.active div {color:#fff;}
+.tabpanel_mover li .closer {font:11px/1 FontAwesome;top:6px;right:2px;background:none;opacity:0.7;}
+.tabpanel_mover li .closer:before {content:"\f00d";}
+.tabpanel_mover li .closer:hover {background:none;-moz-transform:scale(1.2);-webkit-transform:scale(1.2); 
+     -o-transform:scale(1.2);-ms-transform:scale(1.2);transform:scale(1.2);color:#d30606;}
+.tabpanel_mover li.active .closer:hover {color:#fff;opacity:0.9;}
+.tabpanel_tab_content {background-color:#fafafa;border-bottom-color:#eeeeee;overflow:visible;}
 
 .btn-primary, .btn-primary:hover, .btn-primary:active,
 .btn-primary.hover, .btn-primary.focus, .btn-primary:focus,
@@ -171,34 +189,8 @@ a, a:hover, a:active, a:focus, .form-unit, th[aria-selected=true] .ui-jqgrid-sor
 .select2-container--default .select2-results__option--highlighted[aria-selected],
 .wup_container .placeholder .webuploader-pick {background-color:#1890ff!important;border-color:#1890ff;}
 .form-unit, th[aria-selected=true] .ui-jqgrid-sortable {color:#1890ff;}
-.form-unit {border-bottom: 1px solid #eee;}
+.form-unit {border-bottom:1px solid #eee;}
 
-.tabpanel_mover li {padding:1px 16px 2px 3px;margin:6px 0 6px 6px;border:1px solid #e4e4e4;
-	border-radius:3px;background:#fff;box-shadow:0 0 5px #e6e6e6;}
-.tabpanel_mover li.active {background-color:#3aa0ff;}
-.tabpanel_mover li.active div {color:#fff;}
-.tabpanel_mover li .closer {font:11px/1 FontAwesome;top:6px;right:2px;background:none;opacity:0.7;}
-.tabpanel_mover li .closer:before {content:"\f00d";}
-.tabpanel_mover li .closer:hover {background:none;-moz-transform: scale(1.2);-webkit-transform: scale(1.2); 
-     -o-transform: scale(1.2);-ms-transform: scale(1.2);transform: scale(1.2);color:#d30606;}
-.tabpanel_mover li.active .closer:hover {color:#fff;opacity:0.9;}
-.tabpanel_tab_content {background-color:#fafafa;border-bottom-color:#eeeeee;overflow:visible;}
-/* .tabpanel_mover li {background:#fff;border-right:1px solid #eee;padding:8px 16px 8px 5px;}
-.tabpanel_mover li.active {background-color:#fff;border-bottom:3px solid #3aa0ff;}
-.tabpanel_mover li.active div {color:#0975d9;}
-.tabpanel_mover li .closer {background:none;font:11px/1 FontAwesome;opacity:0.7;}
-.tabpanel_mover li .closer:before {content:"\f00d";}
-.tabpanel_mover li .closer:hover {background:none;-moz-transform: scale(1.2);-webkit-transform: scale(1.2);
-    -o-transform: scale(1.2);-ms-transform: scale(1.2);transform: scale(1.2);color:#d30606;}
-.tabpanel_tab_content {background-color:#fafafa;border-bottom-color:#eeeeee;overflow:visible;} 替换上面 tab 样式，改变 tab 风格。*/
-
-/* .main-content {padding:10px;}
-.ui-layout-container {padding:10px;}
-.ui-layout-resizer {background:transparent;}
-.ui-layout-pane {box-shadow:0 0 5px #e0e0e0;}
-.ui-layout-pane>.main-content {padding:0;}
-.ui-layout-content>.wrapper>.main-content {padding:0;}
-.box-main,.nav-main{border-radius:3px;box-shadow:0 0 5px #e0e0e0;} 解开注释，可给内容页面，添加内边距样式 */
 .box-main>.box-header {border-bottom-color:#eeeeee;}
 .box-main>.box-header .box-title .fa {color:#1890ff;}
 .nav-tabs-custom>.nav-tabs>li.active {border-top-color:#3aa0ff;}
@@ -212,5 +204,5 @@ a, a:hover, a:active, a:focus, .form-unit, th[aria-selected=true] .ui-jqgrid-sor
 .ui-jqgrid tr.ui-row-rtl td, .ui-jqgrid tr.ui-row-ltr td:last-child {border-color:#eaeaea;}
 .ui-state-hover td, .ui-widget-content .ui-state-hover td, .ui-widget-header .ui-state-hover td,
 .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus {background:#f5f5f5;}
-.ui-jqgrid tr.ui-state-highlight.ui-row-ltr td {background-color:#e5f3ff;}
+.ui-jqgrid tr.ui-state-highlight.ui-row-ltr td {background-color:#ecf9ff;}
 /* .ui-jqgrid tr.ui-row-ltr td {border-right:0!important;} 解开注释，可去除表格单元格的竖边框线 */

common/src/main/resources/static/adminlte/css/skins/skin-blue-light3.css

@@ -0,0 +1,233 @@
+/*
+ * http://jeesite.com
+ */
+a, a:hover, a:active, a:focus, .form-unit, th[aria-selected=true] .ui-jqgrid-sortable {
+  color:#1890ff;
+}
+.main-header .navbar {
+  background: #1890ff;
+  background: -webkit-gradient(linear, left bottom, right top, color-stop(0, #2684f5), color-stop(1, #1890ff));
+  background: -ms-linear-gradient(left, #2684f5, #1890ff);
+  background: -moz-linear-gradient(left top, #2684f5 0%, #1890ff 100%);
+  background: -o-linear-gradient(#1890ff, #2684f5);
+}
+.main-header .navbar .nav > li > a {
+  color: #ffffff;
+}
+.main-header .navbar .nav > li > a:hover,
+.main-header .navbar .nav > li > a:active,
+.main-header .navbar .nav > li > a:focus,
+.main-header .navbar .nav .open > a,
+.main-header .navbar .nav .open > a:hover,
+.main-header .navbar .nav .open > a:focus,
+.main-header .navbar .nav > .active > a {
+  background: rgba(0, 0, 0, 0.1);
+  color: #f6f6f6;
+}
+.main-header .navbar .sidebar-toggle {
+  color: #ffffff;
+}
+.main-header .navbar .sidebar-toggle:hover {
+  color: #f6f6f6;
+  background: rgba(0, 0, 0, 0.1);
+}
+.main-header .navbar .sidebar-toggle {
+  color: #fff;
+}
+.main-header .navbar .sidebar-toggle:hover {
+  background-color: #367fa9;
+}
+@media (max-width: 767px) {
+  .main-header .navbar .dropdown-menu li.divider {
+    background-color: rgba(255, 255, 255, 0.1);
+  }
+  .main-header .navbar .dropdown-menu li a {
+    color: #fff;
+  }
+  .main-header .navbar .dropdown-menu li a:hover {
+    background: #367fa9;
+  }
+}
+.main-header .logo {
+  background-color: transparent;
+  color: #ffffff;
+  border-bottom: 0 solid transparent;
+}
+.main-header .logo:hover {
+  background-color: #1890ff;
+}
+.main-header li.user-header {
+  background-color: #1890ff;
+}
+.content-header {
+  background: transparent;
+}
+.sidebar,
+.left-side {
+  background-color: #ffffff;
+}
+.content-wrapper,
+.main-footer {
+  border-left: 1px solid #eeeeee;
+}
+.user-panel > .info,
+.user-panel > .info > a {
+  color: #555;
+}
+.sidebar-menu > li {
+  -webkit-transition: border-left-color 0.3s ease;
+  -o-transition: border-left-color 0.3s ease;
+  transition: border-left-color 0.3s ease;
+}
+.sidebar-menu > li.header {
+  color: #848484;
+  background: #f8f8f8;
+}
+.sidebar-menu > li > a {
+  border-left: 3px solid transparent;
+  font-weight: 600;
+}
+.sidebar-menu > li:hover > a,
+.sidebar-menu > li.active > a {
+  color: #000;
+  background: #ffffff;
+}
+.sidebar-menu > li.active {
+  border-left-color: #1890ff;
+}
+.sidebar-menu > li.active > a {
+  font-weight: 600;
+}
+.sidebar-menu > li.menu-open > a,
+.sidebar-menu > li > .treeview-menu {
+  background: #ffffff;
+}
+.sidebar a {
+  color: #555;
+}
+.sidebar a:hover {
+  text-decoration: none;
+}
+.treeview-menu > li > a {
+  color: #555;
+}
+.treeview-menu > li.active > a,
+.treeview-menu > li > a:hover {
+  color: #000;
+}
+.sidebar-form {
+  border-radius: 3px;
+  border: 1px solid #d2d6de;
+  margin: 10px 10px;
+}
+.sidebar-form input[type="text"],
+.sidebar-form .btn {
+  box-shadow: none;
+  background-color: #fff;
+  border: 1px solid transparent;
+  height: 35px;
+}
+.sidebar-form input[type="text"] {
+  color: #666;
+  border-top-left-radius: 2px;
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+  border-bottom-left-radius: 2px;
+}
+.sidebar-form input[type="text"]:focus,
+.sidebar-form input[type="text"]:focus + .input-group-btn .btn {
+  background-color: #fff;
+  color: #666;
+}
+.sidebar-form input[type="text"]:focus + .input-group-btn .btn {
+  border-left-color: #fff;
+}
+.sidebar-form .btn {
+  color: #999;
+  border-top-left-radius: 0;
+  border-top-right-radius: 2px;
+  border-bottom-right-radius: 2px;
+  border-bottom-left-radius: 0;
+}
+.main-footer {
+  border-top-color: #e5e5e5;
+  border-radius: 4px;
+}
+.skin-blue.layout-top-nav .main-header > .logo {
+  background-color: #1890ff;
+  color: #ffffff;
+  border-bottom: 0 solid transparent;
+}
+.skin-blue.layout-top-nav .main-header > .logo:hover {
+  background-color: #3b8ab8;
+}
+
+.sidebar-menu {padding:0 8px 0 7px;}
+.sidebar-menu li>a>.pull-right-container {left:0;}
+.sidebar-menu .treeview-item.active>a {color:#1890ff;background-color:#e7f4ff;border-right:0;border-radius:6px;}
+
+/* 页签添加内边距 */
+.content-wrapper, .tabpanel_content, .tabpanel_content .html_content, body {background-color:#f0f2f5;}
+.box-main, .nav-main, .ui-layout-pane, iframe {border-radius:5px;}
+.tabpanel_content .html_content {padding:14px 14px 13px 15px;}
+.tabpanel_tab_content {border-bottom:0;}
+.ui-layout-resizer {background:none;}
+.content {padding:0!important}
+
+/* 页签-无界风格 */
+.tabpanel_mover li {height:26px;padding:2px 16px 2px 3px;margin:11px 0 0px 9px;border:0;border-radius:4px;background:#fff;}
+.tabpanel_mover li .title {padding-left:0;text-align:center;}
+.tabpanel_mover li.active {background-color:#3aa0ff;}
+.tabpanel_mover li.active div {color:#fff;}
+.tabpanel_mover li .closer {font:11px/1 FontAwesome;top:6px;right:4px;background:none;opacity:0.7;}
+.tabpanel_mover li .closer:before {content:"\f00d";}
+.tabpanel_mover li .closer:hover {background:none;-moz-transform:scale(1.2);-webkit-transform:scale(1.2); 
+     -o-transform:scale(1.2);-ms-transform:scale(1.2);transform:scale(1.2);color:#d30606;}
+.tabpanel_mover li.active .closer:hover {color:#fff;opacity:0.9;}
+.tabpanel_tab_content {background-color:transparent;border-bottom-color:#eeeeee;overflow:visible;}
+.tabpanel_tab_content .tabpanel_left_scroll, .tabpanel_tab_content .tabpanel_right_scroll {top:12px;}
+.tabpanel_tab_content .tabpanel_mover {margin:0 5px;}
+
+/* 页签-下划线风格
+.tabpanel_mover li {background:#fff;border:0;padding:5px 16px 5px 3px;}
+.tabpanel_mover li .title {padding-left:0;text-align:center;}
+.tabpanel_mover li.active {background-color:#fff;border-bottom:2px solid #3aa0ff;}
+.tabpanel_mover li.active div {color:#0975d9;}
+.tabpanel_mover li .closer {background:none;font:11px/1 FontAwesome;opacity:0.6;right:3px;top:10px;}
+.tabpanel_mover li .closer:before {content:"\f00d";}
+.tabpanel_mover li .closer:hover {background:none;-moz-transform: scale(1.2);-webkit-transform: scale(1.2);
+    -o-transform: scale(1.2);-ms-transform: scale(1.2);transform: scale(1.2);color:#d30606;}
+.tabpanel_tab_content {height:32px;line-height:32px;border:0;background-color:#fff;overflow:visible;}
+.tabpanel_tab_content .tabpanel_move_content {min-height:32px;}
+.tabpanel_tab_content .tabpanel_left_scroll, .tabpanel_tab_content .tabpanel_right_scroll {top:4px;} */
+
+.btn-primary, .btn-primary:hover, .btn-primary:active,
+.btn-primary.hover, .btn-primary.focus, .btn-primary:focus,
+.btn-primary.active.focus, .btn-primary.active:focus, .btn-primary.active:hover,
+.btn-primary:active.focus, .btn-primary:active:focus, .btn-primary:active:hover,
+.open>.dropdown-toggle.btn-primary.focus, .open>.dropdown-toggle.btn-primary:focus,
+.open>.dropdown-toggle.btn-primary:hover, .layui-layer-btn .layui-layer-btn0,
+.select2-container--default .select2-selection--multiple .select2-selection__choice,
+.select2-container--default .select2-results__option--highlighted[aria-selected],
+.wup_container .placeholder .webuploader-pick {background-color:#1890ff!important;border-color:#1890ff!important;}
+.form-unit, th[aria-selected=true] .ui-jqgrid-sortable {color:#1890ff;}
+.form-unit {border-bottom:1px solid #eee;}
+
+.box-main>.box-header {border-bottom-color:#eeeeee;}
+.box-main>.box-header .box-title .fa {color:#1890ff;}
+.nav-tabs-custom>.nav-tabs>li.active {border-top-color:#3aa0ff;}
+.form-control:focus,.select2-container--default.select2-container--focus .select2-selection--multiple,
+.select2-container--default .select2-search--dropdown .select2-search__field,
+.select2-container--default.select2-container--focus .select2-selection--single,
+.select2-container--default.select2-container--focus .select2-selection--multiple {border-color:#40a9ff!important;box-shadow:0 0 0 2px rgba(24,144,255,.2);}
+.table thead tr, .ui-jqgrid-htable thead tr, .ui-jqgrid-hdiv, .ui-jqgrid-hbox {background-color:#fafafa;}
+.ui-jqgrid .ui-jqgrid-labels th, .ui-jqgrid tr.ui-row-ltr td, .ui-jqgrid tr.ui-row-rtl td, .ui-jqgrid tr.ui-row-ltr td:last-child,
+.ui-jqgrid .ui-jqgrid-htable th.ui-th-column-header, .ui-jqgrid .ui-jqgrid-htable th.ui-th-column,
+.ui-jqgrid.ui-widget-content, .ui-jqgrid .ui-widget-content {border-color:#f0f0f0;}
+.ui-state-hover td, .ui-widget-content .ui-state-hover td, .ui-widget-header .ui-state-hover td,
+.ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus {background:#f5f5f5;}
+.ui-jqgrid tr.ui-state-highlight.ui-row-ltr td {background-color:#ecf9ff;}
+/* .ui-jqgrid tr.ui-row-ltr td {border-right:0!important;} 解开注释，可去除表格单元格的竖边框线 */
+.ui-jqgrid .ui-jqgrid-frozen .ui-jqgrid-htable th div {height:46px!important;}
+.ui-jqgrid .ui-jqgrid-htable th div {padding:15px 0 15px 2px;}
+.ui-jqgrid tr.jqgrow td {height: 49px;}

common/src/main/resources/static/adminlte/css/skins/skin-blue2.css

@@ -10,7 +10,6 @@ a, a:hover, a:active, a:focus, .form-unit, th[aria-selected=true] .ui-jqgrid-sor
   background: -ms-linear-gradient(left, #1951be, #2780ec);
   background: -moz-linear-gradient(left top, #1951be 0%, #2780ec 100%);
   background: -o-linear-gradient(#2780ec, #1951be);
-  filter: progid:DXImageTransform.Microsoft.gradient(GradientType = 1,startColorstr='#2780ec', endColorstr='#1951be');
 }
 .main-header .navbar .nav > li > a {
   color: #ffffff;
@@ -151,7 +150,8 @@ a, a:hover, a:active, a:focus, .form-unit, th[aria-selected=true] .ui-jqgrid-sor
   border-bottom-left-radius: 0;
 }
 .main-footer {
-  border-top-color: #d2d6de;
+  border-top-color: #e5e5e5;
+  border-radius: 4px;
 }
 .skin-blue.layout-top-nav .main-header > .logo {
   background-color: #1e5edb;
@@ -162,9 +162,22 @@ a, a:hover, a:active, a:focus, .form-unit, th[aria-selected=true] .ui-jqgrid-sor
   background-color: #3b8ab8;
 }
 
-.sidebar-menu .treeview-item.active > a {color:#001C6B;background-color:#e1f1ff;border-right:solid #7791ce;}
+.sidebar-menu {padding:0 8px 0 7px;}
+.sidebar-menu li>a>.pull-right-container {left:0;}
+.sidebar-menu .treeview-item.active>a {color:#2a50ec;background-color:#edf2fc;border-right:0;border-radius:6px;}
 
-.content-wrapper, .right-side, body {background-color:#f8f8f8;}
+.content-wrapper, .right-side, body {background-color:#f0f2f5;}
+
+/* 页签-经典风格 */
+.tabpanel_mover li {height:26px;padding:1px 16px 2px 3px;margin:6px 0 6px 6px;border:1px solid #e4e4e4;border-radius:3px;background:#fff;}
+.tabpanel_mover li.active {background-color:#1e5edb;box-shadow:0 0 5px #e6e6e6;}
+.tabpanel_mover li.active div {color:#fff;}
+.tabpanel_mover li .closer {font:11px/1 FontAwesome;top:6px;right:2px;background:none;opacity:0.7;}
+.tabpanel_mover li .closer:before {content:"\f00d";}
+.tabpanel_mover li .closer:hover {background:none;-moz-transform:scale(1.2);-webkit-transform:scale(1.2); 
+     -o-transform:scale(1.2);-ms-transform:scale(1.2);transform:scale(1.2);color:#d30606;}
+.tabpanel_mover li.active .closer:hover {color:#fff;opacity:0.9;}
+.tabpanel_tab_content {background-color:#fafafa;border-bottom-color:#eeeeee;overflow:visible;}
 
 .btn-primary, .btn-primary:hover, .btn-primary:active,
 .btn-primary.hover, .btn-primary.focus, .btn-primary:focus,
@@ -176,46 +189,20 @@ a, a:hover, a:active, a:focus, .form-unit, th[aria-selected=true] .ui-jqgrid-sor
 .select2-container--default .select2-results__option--highlighted[aria-selected],
 .wup_container .placeholder .webuploader-pick {background-color:#1e5edb!important;border-color:#1e5edb!important;}
 .form-unit, th[aria-selected=true] .ui-jqgrid-sortable {color:#1e5edb;}
-.form-unit {border-bottom: 1px solid #eee;}
+.form-unit {border-bottom:1px solid #eee;}
 
-.tabpanel_mover li {padding:1px 16px 2px 3px;margin:6px 0 6px 6px;border:1px solid #e4e4e4;
-	border-radius:3px;background:#fff;box-shadow:0 0 5px #e6e6e6;}
-.tabpanel_mover li.active {background-color:#1e5edb;}
-.tabpanel_mover li.active div {color:#fff;}
-.tabpanel_mover li .closer {font:11px/1 FontAwesome;top:6px;right:2px;background:none;opacity:0.7;}
-.tabpanel_mover li .closer:before {content:"\f00d";}
-.tabpanel_mover li .closer:hover {background:none;-moz-transform: scale(1.2);-webkit-transform: scale(1.2); 
-     -o-transform: scale(1.2);-ms-transform: scale(1.2);transform: scale(1.2);color:#d30606;}
-.tabpanel_mover li.active .closer:hover {color:#fff;opacity:0.9;}
-.tabpanel_tab_content {background-color:#fafafa;border-bottom-color:#eeeeee;overflow:visible;}
-/* .tabpanel_mover li {background:#fff;border-right:1px solid #eee;padding:8px 16px 8px 5px;}
-.tabpanel_mover li.active {background-color:#fff;border-bottom:3px solid #1e5edb;}
-.tabpanel_mover li.active div {color:#0975d9;}
-.tabpanel_mover li .closer {background:none;font:11px/1 FontAwesome;opacity:0.7;}
-.tabpanel_mover li .closer:before {content:"\f00d";}
-.tabpanel_mover li .closer:hover {background:none;-moz-transform: scale(1.2);-webkit-transform: scale(1.2);
-    -o-transform: scale(1.2);-ms-transform: scale(1.2);transform: scale(1.2);color:#d30606;}
-.tabpanel_tab_content {background-color:#fafafa;border-bottom-color:#eeeeee;overflow:visible;} 替换上面 tab 样式，改变 tab 风格。*/
-
-/* .main-content {padding:10px;}
-.ui-layout-container {padding:10px;}
-.ui-layout-resizer {background:transparent;}
-.ui-layout-pane {box-shadow:0 0 5px #e0e0e0;}
-.ui-layout-pane>.main-content {padding:0;}
-.ui-layout-content>.wrapper>.main-content {padding:0;}
-.box-main,.nav-main{border-radius:3px;box-shadow:0 0 5px #e0e0e0;} 解开注释，可给内容页面，添加内边距样式 */
 .box-main>.box-header {border-bottom-color:#eeeeee;}
 .box-main>.box-header .box-title .fa {color:#1e5edb;}
 .nav-tabs-custom>.nav-tabs>li.active {border-top-color:#1e5edb;}
 .form-control:focus,.select2-container--default.select2-container--focus .select2-selection--multiple,
 .select2-container--default .select2-search--dropdown .select2-search__field,
 .select2-container--default.select2-container--focus .select2-selection--single,
-.select2-container--default.select2-container--focus .select2-selection--multiple {border-color:#40a9ff!important;box-shadow:0 0 0 2px rgba(24,144,255,.2);}
+.select2-container--default.select2-container--focus .select2-selection--multiple {border-color:#557bfa!important;box-shadow:0 0 0 2px rgba(24,80,236,.2);}
 .table thead tr, .ui-jqgrid-htable thead tr, .ui-jqgrid-hdiv, .ui-jqgrid-hbox {background-color:#f6f6f6;}
 .ui-jqgrid .ui-jqgrid-htable th.ui-th-column-header, .ui-jqgrid .ui-jqgrid-htable th.ui-th-column,
 .ui-jqgrid .ui-jqgrid-labels th, .ui-jqgrid .ui-widget-content, .ui-jqgrid tr.ui-row-ltr td,
 .ui-jqgrid tr.ui-row-rtl td, .ui-jqgrid tr.ui-row-ltr td:last-child {border-color:#eaeaea;}
 .ui-state-hover td, .ui-widget-content .ui-state-hover td, .ui-widget-header .ui-state-hover td,
 .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus {background:#f5f5f5;}
-.ui-jqgrid tr.ui-state-highlight.ui-row-ltr td {background-color:#e5f3ff;}
+.ui-jqgrid tr.ui-state-highlight.ui-row-ltr td {background-color:#f0f5ff;}
 /* .ui-jqgrid tr.ui-row-ltr td {border-right:0!important;} 解开注释，可去除表格单元格的竖边框线 */

common/src/main/resources/static/adminlte/css/skins/skin-blue3.css

@@ -0,0 +1,233 @@
+/*
+ * http://jeesite.com
+ */
+a, a:hover, a:active, a:focus, .form-unit, th[aria-selected=true] .ui-jqgrid-sortable {
+  color:#1e5edb;
+}
+.main-header .navbar {
+  background: #1951be;
+  background: -webkit-gradient(linear, left bottom, right top, color-stop(0, #1951be), color-stop(1, #2780ec));
+  background: -ms-linear-gradient(left, #1951be, #2780ec);
+  background: -moz-linear-gradient(left top, #1951be 0%, #2780ec 100%);
+  background: -o-linear-gradient(#2780ec, #1951be);
+}
+.main-header .navbar .nav > li > a {
+  color: #ffffff;
+}
+.main-header .navbar .nav > li > a:hover,
+.main-header .navbar .nav > li > a:active,
+.main-header .navbar .nav > li > a:focus,
+.main-header .navbar .nav .open > a,
+.main-header .navbar .nav .open > a:hover,
+.main-header .navbar .nav .open > a:focus,
+.main-header .navbar .nav > .active > a {
+  background: rgba(0, 0, 0, 0.1);
+  color: #f6f6f6;
+}
+.main-header .navbar .sidebar-toggle {
+  color: #ffffff;
+}
+.main-header .navbar .sidebar-toggle:hover {
+  color: #f6f6f6;
+  background: rgba(0, 0, 0, 0.1);
+}
+.main-header .navbar .sidebar-toggle {
+  color: #fff;
+}
+.main-header .navbar .sidebar-toggle:hover {
+  background-color: #367fa9;
+}
+@media (max-width: 767px) {
+  .main-header .navbar .dropdown-menu li.divider {
+    background-color: rgba(255, 255, 255, 0.1);
+  }
+  .main-header .navbar .dropdown-menu li a {
+    color: #fff;
+  }
+  .main-header .navbar .dropdown-menu li a:hover {
+    background: #367fa9;
+  }
+}
+.main-header .logo {
+  background-color: transparent;
+  color: #ffffff;
+  border-bottom: 0 solid transparent;
+}
+.main-header .logo:hover {
+  background-color: #1951be;
+}
+.main-header li.user-header {
+  background-color: #1951be;
+}
+.content-header {
+  background: transparent;
+}
+.sidebar,
+.left-side {
+  background-color: #ffffff;
+}
+.content-wrapper,
+.main-footer {
+  border-left: 1px solid #eeeeee;
+}
+.user-panel > .info,
+.user-panel > .info > a {
+  color: #555;
+}
+.sidebar-menu > li {
+  -webkit-transition: border-left-color 0.3s ease;
+  -o-transition: border-left-color 0.3s ease;
+  transition: border-left-color 0.3s ease;
+}
+.sidebar-menu > li.header {
+  color: #848484;
+  background: #f8f8f8;
+}
+.sidebar-menu > li > a {
+  border-left: 3px solid transparent;
+  font-weight: 600;
+}
+.sidebar-menu > li:hover > a,
+.sidebar-menu > li.active > a {
+  color: #000;
+  background: #ffffff;
+}
+.sidebar-menu > li.active {
+  border-left-color: #1e5edb;
+}
+.sidebar-menu > li.active > a {
+  font-weight: 600;
+}
+.sidebar-menu > li.menu-open > a,
+.sidebar-menu > li > .treeview-menu {
+  background: #ffffff;
+}
+.sidebar a {
+  color: #555;
+}
+.sidebar a:hover {
+  text-decoration: none;
+}
+.treeview-menu > li > a {
+  color: #555;
+}
+.treeview-menu > li.active > a,
+.treeview-menu > li > a:hover {
+  color: #000;
+}
+.sidebar-form {
+  border-radius: 3px;
+  border: 1px solid #d2d6de;
+  margin: 10px 10px;
+}
+.sidebar-form input[type="text"],
+.sidebar-form .btn {
+  box-shadow: none;
+  background-color: #fff;
+  border: 1px solid transparent;
+  height: 35px;
+}
+.sidebar-form input[type="text"] {
+  color: #666;
+  border-top-left-radius: 2px;
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+  border-bottom-left-radius: 2px;
+}
+.sidebar-form input[type="text"]:focus,
+.sidebar-form input[type="text"]:focus + .input-group-btn .btn {
+  background-color: #fff;
+  color: #666;
+}
+.sidebar-form input[type="text"]:focus + .input-group-btn .btn {
+  border-left-color: #fff;
+}
+.sidebar-form .btn {
+  color: #999;
+  border-top-left-radius: 0;
+  border-top-right-radius: 2px;
+  border-bottom-right-radius: 2px;
+  border-bottom-left-radius: 0;
+}
+.main-footer {
+  border-top-color: #e5e5e5;
+  border-radius: 4px;
+}
+.skin-blue.layout-top-nav .main-header > .logo {
+  background-color: #1e5edb;
+  color: #ffffff;
+  border-bottom: 0 solid transparent;
+}
+.skin-blue.layout-top-nav .main-header > .logo:hover {
+  background-color: #3b8ab8;
+}
+
+.sidebar-menu {padding:0 8px 0 7px;}
+.sidebar-menu li>a>.pull-right-container {left:0;}
+.sidebar-menu .treeview-item.active>a {color:#2a50ec;background-color:#edf2fc;border-right:0;border-radius:6px;}
+
+/* 页签添加内边距 */
+.content-wrapper, .tabpanel_content, .tabpanel_content .html_content, body {background-color:#f0f2f5;}
+.box-main, .nav-main, .ui-layout-pane, iframe {border-radius:5px;}
+.tabpanel_content .html_content {padding:14px 14px 13px 15px;}
+.tabpanel_tab_content {border-bottom:0;}
+.ui-layout-resizer {background:none;}
+.content {padding:0!important}
+
+/* 页签-无界风格 */
+.tabpanel_mover li {height:26px;padding:2px 16px 2px 3px;margin:11px 0 0px 9px;border:0;border-radius:4px;background:#fff;}
+.tabpanel_mover li .title {padding-left:0;text-align:center;}
+.tabpanel_mover li.active {background-color:#316ee6;}
+.tabpanel_mover li.active div {color:#fff;}
+.tabpanel_mover li .closer {font:11px/1 FontAwesome;top:6px;right:4px;background:none;opacity:0.7;}
+.tabpanel_mover li .closer:before {content:"\f00d";}
+.tabpanel_mover li .closer:hover {background:none;-moz-transform:scale(1.2);-webkit-transform:scale(1.2); 
+     -o-transform:scale(1.2);-ms-transform:scale(1.2);transform:scale(1.2);color:#d30606;}
+.tabpanel_mover li.active .closer:hover {color:#fff;opacity:0.9;}
+.tabpanel_tab_content {background-color:transparent;border-bottom-color:#eeeeee;overflow:visible;}
+.tabpanel_tab_content .tabpanel_left_scroll, .tabpanel_tab_content .tabpanel_right_scroll {top:12px;}
+.tabpanel_tab_content .tabpanel_mover {margin:0 5px;}
+
+/* 页签-下划线风格
+.tabpanel_mover li {background:#fff;border:0;padding:5px 16px 5px 3px;}
+.tabpanel_mover li .title {padding-left:0;text-align:center;}
+.tabpanel_mover li.active {background-color:#fff;border-bottom:2px solid #1e5edb;}
+.tabpanel_mover li.active div {color:#0975d9;}
+.tabpanel_mover li .closer {background:none;font:11px/1 FontAwesome;opacity:0.6;right:3px;top:10px;}
+.tabpanel_mover li .closer:before {content:"\f00d";}
+.tabpanel_mover li .closer:hover {background:none;-moz-transform: scale(1.2);-webkit-transform: scale(1.2);
+    -o-transform: scale(1.2);-ms-transform: scale(1.2);transform: scale(1.2);color:#d30606;}
+.tabpanel_tab_content {height:32px;line-height:32px;border:0;background-color:#fff;overflow:visible;}
+.tabpanel_tab_content .tabpanel_move_content {min-height:32px;}
+.tabpanel_tab_content .tabpanel_left_scroll, .tabpanel_tab_content .tabpanel_right_scroll {top:4px;} */
+
+.btn-primary, .btn-primary:hover, .btn-primary:active,
+.btn-primary.hover, .btn-primary.focus, .btn-primary:focus,
+.btn-primary.active.focus, .btn-primary.active:focus, .btn-primary.active:hover,
+.btn-primary:active.focus, .btn-primary:active:focus, .btn-primary:active:hover,
+.open>.dropdown-toggle.btn-primary.focus, .open>.dropdown-toggle.btn-primary:focus,
+.open>.dropdown-toggle.btn-primary:hover, .layui-layer-btn .layui-layer-btn0,
+.select2-container--default .select2-selection--multiple .select2-selection__choice,
+.select2-container--default .select2-results__option--highlighted[aria-selected],
+.wup_container .placeholder .webuploader-pick {background-color:#1e5edb!important;border-color:#1e5edb!important;}
+.form-unit, th[aria-selected=true] .ui-jqgrid-sortable {color:#1e5edb;}
+.form-unit {border-bottom:1px solid #eee;}
+
+.box-main>.box-header {border-bottom-color:#eeeeee;}
+.box-main>.box-header .box-title .fa {color:#1e5edb;}
+.nav-tabs-custom>.nav-tabs>li.active {border-top-color:#1e5edb;}
+.form-control:focus,.select2-container--default.select2-container--focus .select2-selection--multiple,
+.select2-container--default .select2-search--dropdown .select2-search__field,
+.select2-container--default.select2-container--focus .select2-selection--single,
+.select2-container--default.select2-container--focus .select2-selection--multiple {border-color:#557bfa!important;box-shadow:0 0 0 2px rgba(24,80,236,.2);}
+.table thead tr, .ui-jqgrid-htable thead tr, .ui-jqgrid-hdiv, .ui-jqgrid-hbox {background-color:#fafafa;}
+.ui-jqgrid .ui-jqgrid-labels th, .ui-jqgrid tr.ui-row-ltr td, .ui-jqgrid tr.ui-row-rtl td, .ui-jqgrid tr.ui-row-ltr td:last-child,
+.ui-jqgrid .ui-jqgrid-htable th.ui-th-column-header, .ui-jqgrid .ui-jqgrid-htable th.ui-th-column,
+.ui-jqgrid.ui-widget-content, .ui-jqgrid .ui-widget-content {border-color:#f0f0f0;}
+.ui-state-hover td, .ui-widget-content .ui-state-hover td, .ui-widget-header .ui-state-hover td,
+.ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus {background:#f5f5f5;}
+.ui-jqgrid tr.ui-state-highlight.ui-row-ltr td {background-color:#f0f5ff;}
+/* .ui-jqgrid tr.ui-row-ltr td {border-right:0!important;} 解开注释，可去除表格单元格的竖边框线 */
+.ui-jqgrid .ui-jqgrid-frozen .ui-jqgrid-htable th div {height:46px!important;}
+.ui-jqgrid .ui-jqgrid-htable th div {padding:15px 0 15px 2px;}
+.ui-jqgrid tr.jqgrow td {height: 49px;}

common/src/main/resources/static/jquery-ztree/3.5/css/awesome/zTreeStyle.css

@@ -2,12 +2,12 @@
 zTree Style 3.4 author: Hunter.z、ThinkGem
 -------------------------------------*/
 
-.ztree * {padding:0;margin:0;font-size:13px;}
-.ztree {margin:0;padding:5px;color:#333}
-.ztree li{padding:0;margin:0;list-style:none;line-height:21px;text-align:left;white-space:nowrap;outline:0}
+.ztree * {padding:0;margin:0;}
+.ztree {margin:0;padding:0 5px;color:#333}
+.ztree li{padding:3px 0;margin:0;list-style:none;line-height:21px;text-align:left;white-space:nowrap;outline:0}
 .ztree li ul{ margin:0;padding:0 0 0 18px}
 
-.ztree li a {padding-right:3px;margin:0;cursor:pointer;height:23px;color:#333;background-color: transparent;text-decoration:none;display: inline-block;vertical-align: middle;}
+.ztree li a {padding-right:3px;margin:0;cursor:pointer;height:23px;color:#333;background-color:transparent;text-decoration:none;display:inline-block;vertical-align:middle;}
 .ztree li a:hover {text-decoration:underline}
 .ztree li a.curSelectedNode {padding-top:0px;background-color:#e5e5e5;color:black;height:23px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}
 .ztree li a.curSelectedNode_Edit {padding-top:0px;background-color:#e5e5e5;color:black;height:23px;border:1px #666 solid;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}
@@ -17,77 +17,82 @@ zTree Style 3.4 author: Hunter.z、ThinkGem
 .ztree li a.tmpTargetNode_next {}
 .ztree li a input.rename {height:14px;width:80px;padding:0;margin:0;
     font-size:12px;border:1px #7EC4CC solid;*border:0px}
-.ztree li span {line-height:23px;margin-right:2px}
-.ztree li span.button {line-height:0;margin:0;width:21px;height:21px;display: inline-block;vertical-align:middle;
-    border:0 none;cursor: pointer;outline:none;}
+.ztree li span {line-height:23px;margin-right:4px}
+.ztree li span.button {line-height:0;margin:0;width:21px;height:21px;display:inline-block;vertical-align:middle;
+    border:0 none;cursor:pointer;outline:none;}
 .ztree li span.button.ico_loading{margin-right:2px;background:url(./img/loading.gif) no-repeat scroll 0 0 transparent;vertical-align:top;*vertical-align:middle}
 
 ul.tmpTargetzTree {background-color:#FFE6B0;opacity:0.8;filter:alpha(opacity=80)}
 
-span.tmpzTreeMove_arrow {width:16px;height:21px;display: inline-block;padding:0;margin:2px 0 0 1px;border:0 none;position:absolute;
-    background-color:transparent;background-repeat:no-repeat;background-attachment: scroll;}
+span.tmpzTreeMove_arrow {width:16px;height:21px;display:inline-block;padding:0;margin:2px 0 0 1px;border:0 none;position:absolute;
+    background-color:transparent;background-repeat:no-repeat;background-attachment:scroll;}
 
 ul.ztree.zTreeDragUL {margin:0;padding:0;position:absolute;width:auto;height:auto;overflow:hidden;background-color:#cfcfcf;border:1px #00B83F dotted;opacity:0.8;filter:alpha(opacity=80)}
 .zTreeMask {z-index:10000;background-color:#cfcfcf;opacity:0.0;filter:alpha(opacity=0);position:absolute}
 
 /* 树搜索相关 */
-.treeSearchInput {padding:13px 0 0 20px;}
-.treeSearchInput label {padding:5px 0 3px 0;font-size:13px;font-weight:normal;vertical-align:middle;}
+.treeSearchInput {padding:12px 0 0 20px;}
+.treeSearchInput label {padding:4px 0 3px 0;font-weight:normal;vertical-align:middle;}
 .treeSearchInput input {width:140px;vertical-align:middle;line-height:24px;height:26px;border:1px solid #aaa;padding:0 4px;border-radius:4px;}
-.treeSearchInput button {border:1px solid #aaa;vertical-align:middle;height:26px;height:26px\9;font-size:13px;background:#efefef;padding:0 8px;}
-.treeShowHideButton {position:absolute;right:8px;top:-3px;font-size:12px;color:#333;z-index:3;}
+.treeSearchInput button {border:1px solid #aaa;vertical-align:middle;height:26px;height:26px\9;background:#efefef;padding:0 8px;}
+.treeShowHideButton {position:absolute;right:8px;top:-3px;color:#333;z-index:3;}
 .treeShowHideButton label {cursor:pointer;}
-.treeExpandCollapse {float:right;margin:6px 5px;padding:5px;font-size:12px;color:#333;position:relative;z-index:2;background:#fff;}
+.treeExpandCollapse {float:right;margin:6px 5px;padding:5px;color:#333;position:relative;z-index:2;background:#fff;}
 .treeExpandCollapse a {text-decoration:none;color:#333}
 .treeselect.ztree {padding:10px 20px;}
 
 /* 字体图标风格 */
 .ztree * {box-sizing:content-box;}
 .ztree li li {padding-left:9px;}
-.ztree li ul.line {content:"";border-left:1px dotted #aaa;top:0px;left:0px;margin-top:-2px;padding-top:2px;}
+/* .ztree li ul.line {content:"";border-left:1px dotted #aaa;top:0px;left:0px;margin-top:0;padding-top:2px;} */
 .ztree li ul {position:relative;background:none;margin-left:9px;padding-left:0;}
 .ztree li ul.line {background:none;}
 .ztree li .noline_open + a + ul:before {border-left:none;}
 .ztree li .noline_open + a + ul li:before {border-top:none;}
-.ztree li a {height:26px;padding-left:3px;}
-.ztree li span {height:26px;margin-left:4px;}
+.ztree li a {height:26px;line-height:25px;padding-left:3px;}
+.ztree li span {height:26px;margin-left:6px;}
 .ztree li span.node_name {margin-right:6px;}
 .ztree li span.button.switch,
 .ztree li span.button.chk,
 .ztree li a span.button,
-.ztree li span.button[class$="Page"] {position:relative;width:18px;height:22px;background:none;background-position:center center !important;padding:2px 0;
+.ztree li span.button[class$="Page"] {position:relative;width:18px;height:18px;background:none;background-position:center center !important;padding:0;
 	display:inline-block;font:normal normal normal 15px/1 FontAwesome;text-rendering:auto;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;}
 .ztree li span.button[class$="Page"] {width:15px;}
 .ztree li a span.button[style="width:0px;height:0px;"]:before,
 .ztree li a span.button[style^="background"]:before {content:"";}
 .ztree li span.button.roots_docu, .ztree li span.button.center_docu, .ztree li span.button.bottom_docu {position:relative;height:24px;padding:0;}
-.ztree li span.button.roots_docu:before {content:"";display:block;width:18px;height:11px;border-left:1px dotted #aaa;position:absolute;top:10px;left:9px;}
-.ztree li span.button.roots_docu:after {content:"";display:block;width:9px;height:0;border-top:1px dotted #aaa;position:absolute;top:10px;left:9px;}
-.ztree li span.button.center_docu:before {content:"";display:block;width:0;height:25px;border-left:1px dotted #aaa;position:absolute;top:-3px;left:9px;}
-.ztree li span.button.center_docu:after {content:"";display:block;width:9px;height:0;border-top:1px dotted #aaa;position:absolute;top:10px;left:9px;}
-.ztree li span.button.bottom_docu:before {content:"";display:block;width:0;height:12px;border-left:1px dotted #aaa;position:absolute;top:-3px;left:9px;}
-.ztree li span.button.bottom_docu:after {content:"";display:block;width:9px;height:0;border-top:1px dotted #aaa;position:absolute;top:10px;left:9px;}
-.ztree li span.button:before {display:block;line-height:20px;text-align:left;padding-left:4px;color:#666;}
+/* .ztree li span.button.roots_docu:before {content:"";display:block;width:18px;height:11px;border-left:1px dotted #aaa;position:absolute;top:12px;left:11px;} */
+/* .ztree li span.button.roots_docu:after {content:"";display:block;width:7px;height:0;border-top:1px dotted #aaa;position:absolute;top:12px;left:11px;} */
+/* .ztree li span.button.center_docu:before {content:"";display:block;width:0;height:31px;border-left:1px dotted #aaa;position:absolute;top:-5px;left:11px;} */
+/* .ztree li span.button.center_docu:after {content:"";display:block;width:7px;height:0;border-top:1px dotted #aaa;position:absolute;top:12px;left:12px;} */
+/* .ztree li span.button.bottom_docu:before {content:"";display:block;width:0;height:16px;border-left:1px dotted #aaa;position:absolute;top:-5px;left:11px;} */
+/* .ztree li span.button.bottom_docu:after {content:"";display:block;width:7px;height:0;border-top:1px dotted #aaa;position:absolute;top:12px;left:11px;} */
+.ztree li span.button:before {display:block;text-align:left;padding-left:2px;color:#666;line-height:16px;}
 .ztree li span.button.root_open:before,
 .ztree li span.button.roots_open:before,
 .ztree li span.button.center_open:before,
 .ztree li span.button.bottom_open:before,
-.ztree li span.button.noline_open:before {content:"\f147";}
+.ztree li span.button.noline_open:before,
 .ztree li span.button.root_close:before,
 .ztree li span.button.roots_close:before,
 .ztree li span.button.center_close:before,
 .ztree li span.button.bottom_close:before,
-.ztree li span.button.noline_close:before {content:"\f196";}
+.ztree li span.button.noline_close:before {content:"\f0da";position:absolute;top:1px;left:3px;transition:transform 0.3s;transform:scale(0.83333333) rotate(0deg);}
+.ztree li span.button.root_open:before,
+.ztree li span.button.roots_open:before,
+.ztree li span.button.center_open:before,
+.ztree li span.button.bottom_open:before,
+.ztree li span.button.noline_open:before {transform:scale(0.83333333) rotate(90deg);}
 .ztree li span.button.chk.checkbox_true_full:before,
 .ztree li span.button.chk.checkbox_true_disable:before,
-.ztree li span.button.chk.checkbox_true_full_focus:before {content:"\f046";}
+.ztree li span.button.chk.checkbox_true_full_focus:before {content:"\f046";line-height:19px;}
 .ztree li span.button.chk.checkbox_false_full:before,
 .ztree li span.button.chk.checkbox_false_disable:before,
-.ztree li span.button.chk.checkbox_false_full_focus:before {content:"\f096";}
+.ztree li span.button.chk.checkbox_false_full_focus:before {content:"\f096";line-height:19px;}
 .ztree li span.button.chk.checkbox_true_part:before,
-.ztree li span.button.chk.checkbox_true_part_focus:before {content:"\f14a";}
+.ztree li span.button.chk.checkbox_true_part_focus:before {content:"\f14a";line-height:19px;}
 .ztree li span.button.chk.checkbox_false_part:before,
-.ztree li span.button.chk.checkbox_false_part_focus:before {content:"\f096";}
+.ztree li span.button.chk.checkbox_false_part_focus:before {content:"\f096";line-height:19px;}
 .ztree li span.button.chk.radio_true_full:before,
 .ztree li span.button.chk.radio_true_disable:before,
 .ztree li span.button.chk.radio_true_full_focus:before {content:"\f05d";}

common/src/main/resources/static/layer/3.1/layer.js

@@ -141,9 +141,12 @@ var layer = {
     }, type ? {} : options));
   },
   
-  msg: function(content, options, end){ //最常用提示层
+  //最常用提示层
+  msg: function(content, options, end){
     var type = typeof options === 'function', rskin = ready.config.skin;
     var skin = (rskin ? rskin + ' ' + rskin + '-msg' : '')||'layui-layer-msg';
+    options = options || {};
+    skin = skin + ' ' + (options.positionClass || '');
     var anim = doms.anim.length - 1;
     if(type) end = options;
     return layer.open($.extend({
@@ -152,7 +155,7 @@ var layer = {
       shade: false,
       skin: skin,
       title: false,
-      closeBtn: false,
+      closeBtn: options.time && options.time >= 5000 || false,
       btn: false,
       resize: false,
       end: end
@@ -814,7 +817,7 @@ layer.getFrameIndex = function(name){
 };
 
 //iframe层自适应宽高（diffVal差值范围内，进行自适应高度） 
-layer.iframeAuto = function(index, diffVal){
+layer.iframeAuto = function(index, diffVal, $this){
 	if(!index){
 		return;
 	}
@@ -832,8 +835,8 @@ layer.iframeAuto = function(index, diffVal){
 			if (layerTop > 0){
 				var $iframe = layero.find('iframe');
 				if (Math.abs($iframe.height() - heg) < (diffVal || 9000)){
-					layero.css({height: layerHeight, top: layerTop});
-					$iframe.css({height: heg});
+					layero.animate({height: layerHeight, top: layerTop}, 20);
+					$iframe.animate({height: heg}, 20);
 				}
 			}
 		}

common/src/main/resources/static/layer/3.1/skin/default/layer.css

@@ -187,3 +187,4 @@ html #layuicss-layer{display: none; position: absolute; width: 1989px;}
 	padding-top:3px;padding-bottom:10px;}
 .layui-layer-btn .layui-layer-btn0{border-color:#367fa9;background-color:#367fa9;}
 .layui-layer-btn a {height:auto;padding:0 12px;font-size:13px;background-color:#f4f4f4;}
+.layui-layer.toast-top-full-width {min-width: 60%;}

common/src/main/resources/static/select2/4.0/select2.full.js

@@ -862,17 +862,24 @@ S2.define('select2/results',[
 
     var $selected = $options.filter('[aria-selected=true]');
 
-    // Check if there are any selected options
-    if ($selected.length > 0) {
-      // If there are selected options, highlight the first
-      $selected.first().trigger('mouseenter');
-    } else {
-      // If there are no selected options, highlight the first option
-      // in the dropdown
-      $options.first().trigger('mouseenter');
-    }
+//    // Check if there are any selected options
+//    if ($selected.length > 0) {
+//      // If there are selected options, highlight the first
+//      $selected.first().trigger('mouseenter');
+//    } else {
+//      // If there are no selected options, highlight the first option
+//      // in the dropdown
+//      $options.first().trigger('mouseenter');
+//    }
+//
+//    this.ensureHighlightVisible();
+//	  ThinkGem 禁用 First Item 高亮
 
-    this.ensureHighlightVisible();
+	// ThinkGem 当超过设置最大选择长度时，自动关闭下拉框
+	var msl = this.options.get('maximumSelectionLength');
+	if (msl > 0 && $selected.length >= msl) {
+		this.trigger('close', {});
+	}
   };
 
   Results.prototype.setClasses = function () {
@@ -4492,9 +4499,9 @@ S2.define('select2/i18n/en',[],function () {
     maximumSelected: function (args) {
       var message = '最多只能选择 ' + args.maximum + ' 个项目';
 
-      if (args.maximum != 1) {
-        message += 's';
-      }
+      //if (args.maximum != 1) { // ThinkGem 删除多余的复数
+      //  message += 's';
+      //}
 
       return message;
     },
@@ -5376,7 +5383,10 @@ S2.define('select2/core',[
       } else {
         if (/*key === KEYS.ENTER || */key === KEYS.SPACE || // ThinkGem 去掉回车后打开下拉框，解决jqgrid回车获取下一个输入框按键冲突
             (key === KEYS.DOWN && evt.altKey)) {
-          self.open();
+
+          if (!this.options.get('disabled')){ // 修正禁用的时候，按空格可弹窗下拉框问题
+             self.open();
+          }
 
           evt.preventDefault();
         }

common/src/main/resources/static/select2/4.0/select2.js

@@ -857,11 +857,11 @@ S2.define('select2/results',[
   };
 
   Results.prototype.highlightFirstItem = function () {
-//    var $options = this.$results
-//      .find('.select2-results__option[aria-selected]');
-//
-//    var $selected = $options.filter('[aria-selected=true]');
-//
+    var $options = this.$results
+      .find('.select2-results__option[aria-selected]');
+
+    var $selected = $options.filter('[aria-selected=true]');
+
 //    // Check if there are any selected options
 //    if ($selected.length > 0) {
 //      // If there are selected options, highlight the first
@@ -874,6 +874,12 @@ S2.define('select2/results',[
 //
 //    this.ensureHighlightVisible();
 //	  ThinkGem 禁用 First Item 高亮
+
+	// ThinkGem 当超过设置最大选择长度时，自动关闭下拉框
+	var msl = this.options.get('maximumSelectionLength');
+	if (msl > 0 && $selected.length >= msl) {
+		this.trigger('close', {});
+	}
   };
 
   Results.prototype.setClasses = function () {
@@ -4462,7 +4468,7 @@ S2.define('select2/dropdown/closeOnSelect',[
   return CloseOnSelect;
 });
 
-//ThinkGem 默认为中文
+// ThinkGem 默认为中文
 S2.define('select2/i18n/en',[],function () {
   // English
   return {
@@ -4493,9 +4499,9 @@ S2.define('select2/i18n/en',[],function () {
     maximumSelected: function (args) {
       var message = '最多只能选择 ' + args.maximum + ' 个项目';
 
-      if (args.maximum != 1) {
-        message += 's';
-      }
+      //if (args.maximum != 1) { // ThinkGem 删除多余的复数
+      //  message += 's';
+      //}
 
       return message;
     },

common/src/test/java/com/jeesite/test/CodeStatistic.java

@@ -1,5 +1,6 @@
 /**
  * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+ * No deletion without permission, or be held responsible to law.
  */
 package com.jeesite.test;
 

modules/cms/README.md

@@ -1,8 +1,20 @@
-# jeesite4-cms
+
+# 技术交流
+
+* 交流 QQ 群（千人大群）：`127515876`、`209330483`、`223507718`、`709534275`、`730390092`、`1373527`、`183903863(外包)`
+* 码云Gitee：<https://gitee.com/thinkgem/jeesite4>
+* GitHub：<https://github.com/thinkgem/jeesite4>
+* 作者博客：<https://my.oschina.net/thinkgem>
+* **帮助文档：**<http://docs.jeesite.com>
+* 官方网站：<http://jeesite.com>
+* 问题反馈：<http://jeesite.net> [【新手必读】](https://gitee.com/thinkgem/jeesite4/issues/I18ARR)
+* 关注微信公众号，了解最新动态：
+
+![JeeSite微信公众号](https://images.gitee.com/uploads/images/2020/0727/091951_a3ab258c_6732.jpeg "JeeSite微信公众号")
 
 ## 项目介绍
 
-JeeSite4 CMS 内容管理模块
+JeeSite CMS 内容管理模块
 
 包含功能：站点管理、栏目管理、模板管理、内容发布
 
@@ -19,18 +31,19 @@ JeeSite4 CMS 内容管理模块
 
 ### 本地运行
 
-1. 环境准备：`JDK 1.8 or 11`、`Maven 3.6+`、`MySQL 5.7 or 8.0`
-2. 下载源码：<https://gitee.com/thinkgem/jeesite4-cms>
+1. 环境准备：`JDK 1.8 or 11、17`、`Maven 3.6+`、`MySQL 5.7 or 8.0`
+2. 下载源码：<https://gitee.com/thinkgem/jeesite4/tree/master/modules/cms>
 3. 打开文件：/web`/src/main/resources/config/application.yml` 配置JDBC连接
-4. 执行脚本：/web`/bin/init-data.bat` 初始化数据库
+4. 打开文件：/web`/pom.xml` 打开 `jeesite-module-cms` 模块（去掉的注释标记）
+5. 执行脚本：/web`/bin/init-data.bat` 初始化数据库
 5. 执行脚本：/web`/bin/run-tomcat.bat` 启动服务即可
 6. 浏览器访问：<http://127.0.0.1:8980/js/>  账号 system 密码 admin
-7. 部署常见问题：<http://jeesite.com/?t=284210>
+7. 部署常见问题：<https://jeesite.com/docs/faq/>
 
 ### 开发环境
 
-1. 部署运行：<http://jeesite.com/?t=267354>
-2. 常见问题：<http://jeesite.com/?t=284210>
+1. 部署运行文档：<https://jeesite.com/docs/install-deploy/>
+2. 部署常见问题：<https://jeesite.com/docs/faq/>
 
 ## 在线文档
 
@@ -38,46 +51,35 @@ JeeSite4 CMS 内容管理模块
 
 ## 授权协议声明
 
-1. 已开源的代码，授权协议采用 AGPL v3 + Apache Licence v2 进行发行。
-2. 您可以免费使用、修改和衍生代码，但不允许修改后和衍生的代码做为闭源软件发布。
-3. 修改后和衍生的代码必须也按照AGPL协议进行流通，对修改后和衍生的代码必须向社会公开。
-4. 如果您修改了代码，需要在被修改的文件中进行说明，并遵守代码格式规范，帮助他人更好的理解您的用意。
-5. 在延伸的代码中（修改和有源代码衍生的代码中）需要带有原来代码中的协议、版权声明和其他原作者规定
-需要包含的说明（请尊重原作者的著作权，不要删除或修改文件中的`@author`信息）。
-6. 您可以应用于商业软件，但必须遵循以上条款原则（请协助改进本作品）。
-7. 关系平台的发展战略考虑，底层部分代码暂未开源，但这不影响您的二次开发。
-8. 请知悉社区版，用户数不可超过100个，最大允许20个用户同时在线（不含匿名）。
+1. 基于 Apache License Version 2.0 协议发布，可用于商业项目，但必须遵守以下补充条款。
+2. 不得将本软件应用于危害国家安全、荣誉和利益的行为，不能以任何形式用于非法为目的的行为。
+3. 在延伸的代码中（修改和有源代码衍生的代码中）需要带有原来代码中的协议、版权声明和其他原作者
+   规定需要包含的说明（请尊重原作者的著作权，不要删除或修改文件中的`Copyright`和`@author`信息）
+   更不要，全局替换源代码中的 jeesite 或 ThinkGem 等字样，否则你将违反本协议条款承担责任。
+4. 您若套用本软件的一些代码或功能参考，请保留源文件中的版权和作者，需要在您的软件介绍明显位置
+   说明出处，举例：本软件基于 JeeSite 快速开发平台，并附带链接：http://jeesite.com
+5. 任何基于本软件而产生的一切法律纠纷和责任，均于我司无关。
+6. 如果你对本软件有改进，希望可以贡献给我们，共同进步。
+7. 本项目已申请软件著作权，请尊重开源，感谢阅读。
+8. 本版本无用户数限制，无在线人数限制。
 
 ## 技术服务与支持
 
 * 没有资金的支撑就很难得到发展，特别是一个好的产品，如果 JeeSite 帮助了您，请为我们点赞。支持我们，您可以得到一些回报，有了这些我们会把公益事业做的更好，回报社区和社会，请给我们一些动力吧，在此非常感谢已支持我们的朋友！
-* **联系方式（官方商务）QQ：[1766571055](http://wpa.qq.com/msgrd?v=3&uin=1766571055&site=qq&menu=yes)**
-* 技术服务支持网页：<http://s.jeesite.com>
-
-# 技术交流方式
-
-* QQ 群号：`127515876`、`209330483`、`223507718`、`709534275`、`730390092`、`1373527`、`183903863(外包)`
-* 问题反馈：<https://gitee.com/thinkgem/jeesite4/issues> 　[【新手必读】](https://github.com/ryanhanwu/How-To-Ask-Questions-The-Smart-Way/blob/master/README-zh_CN.md)
-* 码云Gitee：<https://gitee.com/thinkgem/jeesite4>
-* GitHub：<https://github.com/thinkgem/jeesite4>
-* 作者博客：<https://my.oschina.net/thinkgem>
-* **技术服务：**<http://s.jeesite.com>
-* 官方网站：<http://jeesite.com>
-* 官方论坛：<http://jeesite.net>
-* 微信公众号（关注动态）：
-
-![JeeSite4微信公众号](https://static.oschina.net/uploads/space/2018/0302/145133_OGZf_941661.jpg "JeeSite4微信公众号")
+* **联系我们**：请访问技术支持服务页面：<https://jeesite.com/docs/support/> 
 
 ## 今后如何升级？
 
-尽量不修改 web 项目以外的源码项目，如 jeesite-common、jeesite-modele-core，如果修改了，请 Pull Requests 上来，否则代码与官方不同步，会将对你的日后升级增加难度。
+尽量不修改 web 项目以外的源码项目，如 jeesite-common、jeesite-modele-core，如果修改了，请 Pull Requests 上来，否则代码与官方不同步，可能会将对你的日后升级增加难度。
 
 如果您修改了依赖模块代码，也没关系，这时你需要利用 Git 版本控制工具，与官方仓库代码进行同步，合并代码即可。
 
-每个版本升级，我们都会附带详细更新日志：<http://jeesite.com/?t=273830>。
+每个版本升级，我们都会附带详细更新日志：<https://jeesite.com/docs/upgrade/>。
 
 在这里，你可以看到 JeeSite 新增哪些新功能和改进，在每个版本下都有对应升级方法。
 
+如果跨版本升级，可以将版本号直接修改为最新版本，然后去看每个版本的升级方法，修改对应业务。
+
 # Git 全局设置技巧
 
 ```
@@ -88,4 +90,4 @@ git config --global core.autocrlf false
 2、拒绝提交包含混合换行符的文件
 
 git config --global core.safecrlf true
-```
+```

modules/cms/bin/deploy.bat

@@ -1,6 +1,7 @@
 @echo off
 rem /**
 rem  * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+rem  * No deletion without permission, or be held responsible to law.
 rem  *
 rem  * Author: ThinkGem@163.com
 rem  */
@@ -15,5 +16,4 @@ cd ..
 call mvn clean deploy -Dmaven.test.skip=true -Pdeploy
 
 cd bin
-cmd /c msg %username% /time:0 /w "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>..."
 pause

modules/cms/bin/deploy.sh

@@ -0,0 +1,16 @@
+#!/bin/sh
+# /**
+#  * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+#  * No deletion without permission, or be held responsible to law.
+#  *
+#  * Author: ThinkGem@163.com
+#  * 
+#  */
+echo ""
+echo "[信息] 部署工程版本到Nexus服务器。"
+echo ""
+
+cd ..
+mvn clean deploy -Dmaven.test.skip=true -Pdeploy
+
+cd bin

modules/cms/bin/javadoc.bat

@@ -1,18 +0,0 @@
-@echo off
-rem /**
-rem  * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
-rem  *
-rem  * Author: ThinkGem@163.com
-rem  */
-echo.
-echo [<5B><>Ϣ] <20><><EFBFBD>빤<EFBFBD><EBB9A4>Javadoc<6F><63><EFBFBD><EFBFBD><EFBFBD><EFBFBD>jar<61><72><EFBFBD>ļ<EFBFBD><C4BC><EFBFBD>
-echo.
-
-%~d0
-cd %~dp0
-
-cd ..
-call mvn clean package -Pjavadoc
-
-cd bin
-pause

modules/cms/bin/package.bat

@@ -1,6 +1,7 @@
 @echo off
 rem /**
 rem  * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+rem  * No deletion without permission, or be held responsible to law.
 rem  *
 rem  * Author: ThinkGem@163.com
 rem  */
@@ -15,5 +16,4 @@ cd ..
 call mvn clean install -Dmaven.test.skip=true -Ppackage
 
 cd bin
-cmd /c msg %username% /time:0 /w "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>..."
 pause

modules/cms/bin/package.sh

@@ -0,0 +1,16 @@
+#!/bin/sh
+# /**
+#  * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+#  * No deletion without permission, or be held responsible to law.
+#  *
+#  * Author: ThinkGem@163.com
+#  * 
+#  */
+echo ""
+echo "[信息] 打包Web工程，生成war/jar包文件。"
+echo ""
+
+cd ..
+mvn clean install -Dmaven.test.skip=true -Ppackage
+
+cd bin

modules/cms/db/cms.erm

@@ -12,7 +12,7 @@
 	<category_index>0</category_index>
 	<zoom>1.0</zoom>
 	<x>0</x>
-	<y>7</y>
+	<y>0</y>
 	<default_color>
 		<r>128</r>
 		<g>128</g>
@@ -775,6 +775,22 @@
 			<physical_name>extend_i4</physical_name>
 			<type>decimal(p)</type>
 		</word>
+		<word>
+			<id>f777df0683772224af74eaac56ff9ba3086493a1</id>
+			<length>null</length>
+			<decimal>null</decimal>
+			<array>false</array>
+			<array_dimension>null</array_dimension>
+			<unsigned>false</unsigned>
+			<zerofill>false</zerofill>
+			<binary>false</binary>
+			<args></args>
+			<char_semantics>false</char_semantics>
+			<description></description>
+			<logical_name>扩展 JSON</logical_name>
+			<physical_name>extend_json</physical_name>
+			<type>text</type>
+		</word>
 		<word>
 			<id>ad6f9eff50476669df62b7601cbc3a2e0c905d36</id>
 			<length>500</length>
@@ -1912,7 +1928,7 @@
 			<type>nvarchar(n)</type>
 		</word>
 		<word>
-			<id>be17e27c1f73fe128f00468cc83953077b7e00a9</id>
+			<id>16c9c333062ea3614d2e044803b872676c8a5377</id>
 			<length>10</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -1923,12 +1939,12 @@
 			<args></args>
 			<char_semantics>false</char_semantics>
 			<description></description>
-			<logical_name>本级排序号（升序）</logical_name>
+			<logical_name>排序号（升序）</logical_name>
 			<physical_name>tree_sort</physical_name>
 			<type>decimal(p)</type>
 		</word>
 		<word>
-			<id>b0bd388c14e5b2bbab9590f5247961a7edd9eb3b</id>
+			<id>312c35e49a1de2ac558655550904b2d4e275322f</id>
 			<length>1000</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -1939,7 +1955,7 @@
 			<args></args>
 			<char_semantics>false</char_semantics>
 			<description></description>
-			<logical_name>所有级别排序号</logical_name>
+			<logical_name>所有排序号</logical_name>
 			<physical_name>tree_sorts</physical_name>
 			<type>varchar(n)</type>
 		</word>
@@ -2282,7 +2298,7 @@
 			</color>
 			<connections>
 				<relation>
-					<id>b3360c18b956528f86538657fb259817fab21f34</id>
+					<id>bf0ac4b1588841d8f855c9d1030b492190b31adb</id>
 					<source>7f024bd90eec8d89290f4db163b3ea077d6ce26d</source>
 					<target>e9faab162f8d6a9f4bed0be95c9dbb56647656e1</target>
 						<source_xp>-1</source_xp>
@@ -2314,7 +2330,7 @@
 				<normal_column>
 					<id>7b648ef7efea218657b3201e0a0318986ff5e8cb</id>
 					<referenced_column>0d993b7470d7bde3d20e9c7f24d1811518cf44cc</referenced_column>
-					<relation>b3360c18b956528f86538657fb259817fab21f34</relation>
+					<relation>bf0ac4b1588841d8f855c9d1030b492190b31adb</relation>
 					<description></description>
 					<unique_key_name></unique_key_name>
 					<logical_name></logical_name>
@@ -4622,7 +4638,7 @@
 			</color>
 			<connections>
 				<relation>
-					<id>221fc0bc73b3badd39d437e05f24a752587a8a48</id>
+					<id>86d964debc4ef630dc9ec2e2115ee2a2927df3d2</id>
 					<source>388faee80ae30bf2d261c383395ea538ac65d139</source>
 					<target>a64b64022c5b291e365f8bc84c6dcadd1a69b93f</target>
 						<source_xp>-1</source_xp>
@@ -4654,7 +4670,7 @@
 				<normal_column>
 					<id>a1ea205b23430d5e2419ab6fc7b81e6a1063b163</id>
 					<referenced_column>eb5d114785c793115e222f88cbce9d6cda0f1543</referenced_column>
-					<relation>221fc0bc73b3badd39d437e05f24a752587a8a48</relation>
+					<relation>86d964debc4ef630dc9ec2e2115ee2a2927df3d2</relation>
 					<description></description>
 					<unique_key_name></unique_key_name>
 					<logical_name></logical_name>
@@ -4929,7 +4945,7 @@
 			</color>
 			<connections>
 				<relation>
-					<id>8b10442357d1561bb946b77f486c97d2673bde4b</id>
+					<id>1f10e7900c8bbfe93ffd36ad7cc6f8d8f0c7a2e0</id>
 					<source>02c2487dc0cf00bec5bb12635a6b2eaca8dce45b</source>
 					<target>7f024bd90eec8d89290f4db163b3ea077d6ce26d</target>
 						<source_xp>-1</source_xp>
@@ -5028,7 +5044,7 @@
 				<normal_column>
 					<id>f86eb0e3c56d958c2d1ee2c0ea77353b01b89973</id>
 					<referenced_column>f51ed54a54f6cd6b1d74072be62c808f6848470c</referenced_column>
-					<relation>8b10442357d1561bb946b77f486c97d2673bde4b</relation>
+					<relation>1f10e7900c8bbfe93ffd36ad7cc6f8d8f0c7a2e0</relation>
 					<description></description>
 					<unique_key_name></unique_key_name>
 					<logical_name></logical_name>
@@ -5599,7 +5615,7 @@
 			</color>
 			<connections>
 				<relation>
-					<id>102c612ebec0dcaf6a4a4270ed4683aea7346293</id>
+					<id>f2b951b9ecd59350e7e2b1dbdc3bdaf651981042</id>
 					<source>7f024bd90eec8d89290f4db163b3ea077d6ce26d</source>
 					<target>388faee80ae30bf2d261c383395ea538ac65d139</target>
 						<source_xp>-1</source_xp>
@@ -5664,7 +5680,7 @@
 				<normal_column>
 					<id>dde1496bcd5d55330967cc24f53513e102a163c0</id>
 					<referenced_column>0d993b7470d7bde3d20e9c7f24d1811518cf44cc</referenced_column>
-					<relation>102c612ebec0dcaf6a4a4270ed4683aea7346293</relation>
+					<relation>f2b951b9ecd59350e7e2b1dbdc3bdaf651981042</relation>
 					<description></description>
 					<unique_key_name></unique_key_name>
 					<logical_name></logical_name>
@@ -6382,7 +6398,7 @@
 					<referenced_complex_unique_key>null</referenced_complex_unique_key>
 				</relation>
 				<relation>
-					<id>52c8c967a2f0edf6dd988a9bb4cb00d6da008195</id>
+					<id>6917f16fcd1f020c33c9058293719d194ef610c6</id>
 					<source>7f024bd90eec8d89290f4db163b3ea077d6ce26d</source>
 					<target>18893974755ff1a6dc89f298885d6b0d571a8c7b</target>
 						<source_xp>-1</source_xp>
@@ -6447,7 +6463,7 @@
 				<normal_column>
 					<id>835faef487ae6874a525a8cb8ba19825f93091aa</id>
 					<referenced_column>0d993b7470d7bde3d20e9c7f24d1811518cf44cc</referenced_column>
-					<relation>52c8c967a2f0edf6dd988a9bb4cb00d6da008195</relation>
+					<relation>6917f16fcd1f020c33c9058293719d194ef610c6</relation>
 					<description></description>
 					<unique_key_name></unique_key_name>
 					<logical_name></logical_name>
@@ -8596,6 +8612,39 @@
 							<decimal_size>0</decimal_size>
 						</sequence>
 					</normal_column>
+					<normal_column>
+						<word_id>f777df0683772224af74eaac56ff9ba3086493a1</word_id>
+						<id>42c5d8f490f69b93e77698efa030ca23988ae696</id>
+						<description></description>
+						<unique_key_name></unique_key_name>
+						<logical_name></logical_name>
+						<physical_name></physical_name>
+						<type>text</type>
+						<constraint></constraint>
+						<default_value></default_value>
+						<auto_increment>false</auto_increment>
+						<foreign_key>false</foreign_key>
+						<not_null>false</not_null>
+						<primary_key>false</primary_key>
+						<unique_key>false</unique_key>
+						<character_set></character_set>
+						<collation></collation>
+						<sequence>
+							<name></name>
+							<schema></schema>
+							<increment></increment>
+							<min_value></min_value>
+							<max_value></max_value>
+							<start></start>
+							<cache></cache>
+							<nocache>false</nocache>
+							<cycle>false</cycle>
+							<order>false</order>
+							<description></description>
+							<data_type></data_type>
+							<decimal_size>0</decimal_size>
+						</sequence>
+					</normal_column>
 				</columns>
 			</column_group>
 			<column_group>
@@ -8669,7 +8718,7 @@
 						</sequence>
 					</normal_column>
 					<normal_column>
-						<word_id>be17e27c1f73fe128f00468cc83953077b7e00a9</word_id>
+						<word_id>16c9c333062ea3614d2e044803b872676c8a5377</word_id>
 						<id>23f973124aedd0244533f4e7b3b103c548b966be</id>
 						<description></description>
 						<unique_key_name></unique_key_name>
@@ -8702,7 +8751,7 @@
 						</sequence>
 					</normal_column>
 					<normal_column>
-						<word_id>b0bd388c14e5b2bbab9590f5247961a7edd9eb3b</word_id>
+						<word_id>312c35e49a1de2ac558655550904b2d4e275322f</word_id>
 						<id>984d5eac2b3221118a61655e4a5a49c78e0f0151</id>
 						<description></description>
 						<unique_key_name></unique_key_name>

modules/cms/db/db2/cms.sql

@@ -63,6 +63,7 @@ CREATE TABLE js_cms_article_data
 	extend_d2 timestamp,
 	extend_d3 timestamp,
 	extend_d4 timestamp,
+	extend_json clob,
 	PRIMARY KEY (id)
 );
 
@@ -136,6 +137,7 @@ CREATE TABLE js_cms_category
 	extend_d2 timestamp,
 	extend_d3 timestamp,
 	extend_d4 timestamp,
+	extend_json clob,
 	PRIMARY KEY (category_code)
 );
 

modules/cms/db/h2/cms.sql

@@ -63,6 +63,7 @@ CREATE TABLE js_cms_article_data
 	extend_d2 datetime,
 	extend_d3 datetime,
 	extend_d4 datetime,
+	extend_json clob,
 	PRIMARY KEY (id)
 );
 
@@ -136,6 +137,7 @@ CREATE TABLE js_cms_category
 	extend_d2 datetime,
 	extend_d3 datetime,
 	extend_d4 datetime,
+	extend_json clob,
 	PRIMARY KEY (category_code)
 );
 

modules/cms/db/msaccess/cms.sql

@@ -0,0 +1,320 @@
+
+
+/* Create Tables */
+
+-- 文章表
+CREATE TABLE js_cms_article
+(
+	id varchar(64) NOT NULL,
+	category_code varchar(64) NOT NULL,
+	module_type varchar(50),
+	title varchar(255) NOT NULL,
+	href varchar(1000),
+	color varchar(50),
+	image varchar(1000),
+	keywords varchar(500),
+	description varchar(500),
+	weight numeric DEFAULT 0,
+	weight_date datetime,
+	source char(1),
+	copyfrom varchar(255),
+	hits numeric DEFAULT 0,
+	hits_plus numeric,
+	hits_minus numeric,
+	word_count numeric,
+	custom_content_view varchar(255),
+	view_config varchar(1000),
+	status char(1) DEFAULT '0' NOT NULL,
+	create_by varchar(64) NOT NULL,
+	create_date datetime NOT NULL,
+	update_by varchar(64) NOT NULL,
+	update_date datetime NOT NULL,
+	remarks varchar(500),
+	corp_code varchar(64) DEFAULT '0' NOT NULL,
+	corp_name varchar(100) DEFAULT 'JeeSite' NOT NULL,
+	PRIMARY KEY (id)
+);
+
+
+-- 文章详情表
+CREATE TABLE js_cms_article_data
+(
+	id varchar(64) NOT NULL,
+	content memo,
+	relation varchar(1000),
+	is_can_comment char(1),
+	extend_s1 varchar(500),
+	extend_s2 varchar(500),
+	extend_s3 varchar(500),
+	extend_s4 varchar(500),
+	extend_s5 varchar(500),
+	extend_s6 varchar(500),
+	extend_s7 varchar(500),
+	extend_s8 varchar(500),
+	extend_i1 numeric,
+	extend_i2 numeric,
+	extend_i3 numeric,
+	extend_i4 numeric,
+	extend_f1 numeric,
+	extend_f2 numeric,
+	extend_f3 numeric,
+	extend_f4 numeric,
+	extend_d1 datetime,
+	extend_d2 datetime,
+	extend_d3 datetime,
+	extend_d4 datetime,
+	PRIMARY KEY (id)
+);
+
+
+-- 文章推荐位
+CREATE TABLE js_cms_article_posid
+(
+	article_id varchar(64) NOT NULL,
+	postid char(1) NOT NULL
+);
+
+
+-- 文章与标签关系
+CREATE TABLE js_cms_article_tag
+(
+	article_id varchar(64) NOT NULL,
+	tag_name varchar(200) NOT NULL
+);
+
+
+-- 栏目表
+CREATE TABLE js_cms_category
+(
+	category_code varchar(64) NOT NULL,
+	parent_code varchar(64) NOT NULL,
+	parent_codes varchar(1000) NOT NULL,
+	tree_sort numeric NOT NULL,
+	tree_sorts varchar(1000) NOT NULL,
+	tree_leaf char(1) NOT NULL,
+	tree_level numeric NOT NULL,
+	tree_names varchar(1000) NOT NULL,
+	category_name varchar(100) NOT NULL,
+	site_code varchar(64) NOT NULL,
+	module_type varchar(50),
+	image varchar(255),
+	href varchar(255),
+	target varchar(20),
+	keywords varchar(500),
+	description varchar(500),
+	in_menu char(1),
+	in_list char(1),
+	show_modes char(1),
+	is_need_audit char(1),
+	is_can_comment char(1),
+	custom_list_view varchar(255),
+	custom_content_view varchar(255),
+	view_config varchar(1000),
+	status char(1) DEFAULT '0' NOT NULL,
+	create_by varchar(64) NOT NULL,
+	create_date datetime NOT NULL,
+	update_by varchar(64) NOT NULL,
+	update_date datetime NOT NULL,
+	remarks varchar(500),
+	extend_s1 varchar(500),
+	extend_s2 varchar(500),
+	extend_s3 varchar(500),
+	extend_s4 varchar(500),
+	extend_s5 varchar(500),
+	extend_s6 varchar(500),
+	extend_s7 varchar(500),
+	extend_s8 varchar(500),
+	extend_i1 numeric,
+	extend_i2 numeric,
+	extend_i3 numeric,
+	extend_i4 numeric,
+	extend_f1 numeric,
+	extend_f2 numeric,
+	extend_f3 numeric,
+	extend_f4 numeric,
+	extend_d1 datetime,
+	extend_d2 datetime,
+	extend_d3 datetime,
+	extend_d4 datetime,
+	PRIMARY KEY (category_code)
+);
+
+
+-- 栏目与角色关联表
+CREATE TABLE js_cms_category_role
+(
+	category_code varchar(64) NOT NULL,
+	role_code varchar(64) NOT NULL,
+	ctrl_type varchar(32),
+	PRIMARY KEY (category_code, role_code)
+);
+
+
+-- 文章评论表
+CREATE TABLE js_cms_comment
+(
+	id varchar(64) NOT NULL,
+	category_code varchar(64) NOT NULL,
+	article_id varchar(64) NOT NULL,
+	parent_id varchar(64),
+	article_title varchar(255) NOT NULL,
+	content varchar(255) NOT NULL,
+	name varchar(50),
+	ip varchar(100),
+	create_by varchar(64),
+	create_date datetime NOT NULL,
+	audit_user_code varchar(64),
+	audit_date datetime,
+	audit_comment varchar(200),
+	hits_plus numeric,
+	hits_minus numeric,
+	status char(1) NOT NULL,
+	corp_code varchar(64) DEFAULT '0' NOT NULL,
+	corp_name varchar(100) DEFAULT 'JeeSite' NOT NULL,
+	PRIMARY KEY (id)
+);
+
+
+-- 留言板表
+CREATE TABLE js_cms_guestbook
+(
+	id varchar(64) NOT NULL,
+	type char(1) NOT NULL,
+	content varchar(255) NOT NULL,
+	name varchar(100) NOT NULL,
+	email varchar(100) NOT NULL,
+	phone varchar(100) NOT NULL,
+	workunit varchar(100) NOT NULL,
+	ip varchar(100) NOT NULL,
+	create_by varchar(64),
+	create_date datetime,
+	re_user_code varchar(64),
+	re_date datetime,
+	re_content varchar(100),
+	status char(1) NOT NULL,
+	corp_code varchar(64) DEFAULT '0' NOT NULL,
+	corp_name varchar(100) DEFAULT 'JeeSite' NOT NULL,
+	PRIMARY KEY (id)
+);
+
+
+-- 内容举报表
+CREATE TABLE js_cms_report
+(
+	id varchar(64) NOT NULL,
+	report_source char(1),
+	report_content varchar(500),
+	report_url varchar(1000),
+	report_type char(1),
+	report_cause varchar(500),
+	PRIMARY KEY (id)
+);
+
+
+-- 站点表
+CREATE TABLE js_cms_site
+(
+	site_code varchar(64) NOT NULL,
+	site_name varchar(100) NOT NULL,
+	site_sort numeric,
+	title varchar(100) NOT NULL,
+	logo varchar(1000),
+	domain varchar(500),
+	keywords varchar(500),
+	description varchar(500),
+	theme varchar(500),
+	copyright varchar(1000),
+	custom_index_view varchar(500),
+	status char(1) DEFAULT '0' NOT NULL,
+	create_by varchar(64) NOT NULL,
+	create_date datetime NOT NULL,
+	update_by varchar(64) NOT NULL,
+	update_date datetime NOT NULL,
+	remarks varchar(500),
+	PRIMARY KEY (site_code)
+);
+
+
+-- 内容标签
+CREATE TABLE js_cms_tag
+(
+	tag_name varchar(200) NOT NULL,
+	clicknum numeric NOT NULL,
+	PRIMARY KEY (tag_name)
+);
+
+
+-- 访问日志表
+CREATE TABLE js_cms_visit_log
+(
+	id varchar(64) NOT NULL,
+	request_url varchar(1000),
+	request_url_host varchar(128),
+	source_referer varchar(1000),
+	source_referer_host varchar(128),
+	source_type char(1),
+	search_engine varchar(200),
+	search_word varchar(200),
+	remote_addr varchar(50),
+	user_agent varchar(500),
+	user_language varchar(32),
+	user_screen_size varchar(32),
+	user_device varchar(32),
+	user_os_name varchar(32),
+	user_browser varchar(32),
+	user_browser_version varchar(16),
+	unique_visit_id varchar(64),
+	visit_date char(8),
+	visit_time datetime,
+	is_new_visit char(1),
+	first_visit_time numeric,
+	prev_remain_time numeric,
+	total_remain_time numeric,
+	site_code varchar(64),
+	site_name varchar(100),
+	category_code varchar(64),
+	category_name varchar(100),
+	content_id varchar(64),
+	content_title varchar(255),
+	visit_user_code varchar(100),
+	visit_user_name varchar(100),
+	corp_code varchar(64) DEFAULT '0' NOT NULL,
+	corp_name varchar(100) DEFAULT 'JeeSite' NOT NULL,
+	PRIMARY KEY (id)
+);
+
+
+
+/* Create Indexes */
+
+CREATE INDEX idx_cms_article_cb ON js_cms_article (create_by);
+CREATE INDEX idx_cms_article_cc ON js_cms_article (category_code);
+CREATE INDEX idx_cms_article_corp_code ON js_cms_article (corp_code);
+CREATE INDEX idx_cms_article_status ON js_cms_article (status);
+CREATE INDEX idx_cms_article_ud ON js_cms_article (update_date);
+CREATE INDEX idx_cms_article_weight ON js_cms_article (weight);
+CREATE INDEX idx_cms_category_pc ON js_cms_category (parent_code);
+CREATE INDEX idx_cms_category_ts ON js_cms_category (tree_sort);
+CREATE INDEX idx_cms_category_status ON js_cms_category (status);
+CREATE INDEX idx_cms_category_tss ON js_cms_category (tree_sorts);
+CREATE INDEX idx_cms_comment_catc ON js_cms_comment (category_code);
+CREATE INDEX idx_cms_comment_ai ON js_cms_comment (article_id);
+CREATE INDEX idx_cms_comment_cc ON js_cms_comment (corp_code);
+CREATE INDEX idx_cms_comment_status ON js_cms_comment (status);
+CREATE INDEX idx_cms_guestbook_cc ON js_cms_guestbook (corp_code);
+CREATE INDEX idx_cms_guestbook_status ON js_cms_guestbook (status);
+CREATE INDEX idx_cms_guestbook_type ON js_cms_guestbook (type);
+CREATE INDEX idx_cms_site_status ON js_cms_site (status);
+CREATE INDEX cms_visit_log_cc ON js_cms_visit_log (category_code);
+CREATE INDEX cms_visit_log_ci ON js_cms_visit_log (content_id);
+CREATE INDEX cms_visit_log_fvt ON js_cms_visit_log (first_visit_time);
+CREATE INDEX cms_visit_log_inv ON js_cms_visit_log (is_new_visit);
+CREATE INDEX cms_visit_log_ra ON js_cms_visit_log (remote_addr);
+CREATE INDEX cms_visit_log_sc ON js_cms_visit_log (site_code);
+CREATE INDEX cms_visit_log_uvid ON js_cms_visit_log (unique_visit_id);
+CREATE INDEX cms_visit_log_vd ON js_cms_visit_log (visit_date);
+CREATE INDEX cms_visit_log_vt ON js_cms_visit_log (visit_time);
+CREATE INDEX idx_cms_visit_log_corpc ON js_cms_visit_log (corp_code);
+
+
+

modules/cms/db/mssql/cms.sql

@@ -63,6 +63,7 @@ CREATE TABLE [js_cms_article_data]
 	[extend_d2] datetime,
 	[extend_d3] datetime,
 	[extend_d4] datetime,
+	[extend_json] text,
 	PRIMARY KEY ([id])
 );
 
@@ -136,6 +137,7 @@ CREATE TABLE [js_cms_category]
 	[extend_d2] datetime,
 	[extend_d3] datetime,
 	[extend_d4] datetime,
+	[extend_json] text,
 	PRIMARY KEY ([category_code])
 );
 

modules/cms/db/mysql/cms.sql

@@ -64,6 +64,7 @@ CREATE TABLE js_cms_article_data
 	extend_d2 datetime COMMENT '扩展 Date 2',
 	extend_d3 datetime COMMENT '扩展 Date 3',
 	extend_d4 datetime COMMENT '扩展 Date 4',
+	extend_json text COMMENT '扩展 JSON',
 	PRIMARY KEY (id)
 ) COMMENT = '文章详情表';
 
@@ -90,8 +91,8 @@ CREATE TABLE js_cms_category
 	category_code varchar(64) NOT NULL COMMENT '栏目编码',
 	parent_code varchar(64) NOT NULL COMMENT '父级编号',
 	parent_codes varchar(1000) NOT NULL COMMENT '所有父级编号',
-	tree_sort decimal(10) NOT NULL COMMENT '本级排序号（升序）',
-	tree_sorts varchar(1000) NOT NULL COMMENT '所有级别排序号',
+	tree_sort decimal(10) NOT NULL COMMENT '排序号（升序）',
+	tree_sorts varchar(1000) NOT NULL COMMENT '所有排序号',
 	tree_leaf char(1) NOT NULL COMMENT '是否最末级',
 	tree_level decimal(4) NOT NULL COMMENT '层次级别',
 	tree_names varchar(1000) NOT NULL COMMENT '全节点名',
@@ -137,6 +138,7 @@ CREATE TABLE js_cms_category
 	extend_d2 datetime COMMENT '扩展 Date 2',
 	extend_d3 datetime COMMENT '扩展 Date 3',
 	extend_d4 datetime COMMENT '扩展 Date 4',
+	extend_json text COMMENT '扩展 JSON',
 	PRIMARY KEY (category_code)
 ) COMMENT = '栏目表';
 

modules/cms/db/oracle/cms.sql

@@ -63,6 +63,7 @@ CREATE TABLE js_cms_article_data
 	extend_d2 timestamp,
 	extend_d3 timestamp,
 	extend_d4 timestamp,
+	extend_json clob,
 	PRIMARY KEY (id)
 );
 
@@ -136,6 +137,7 @@ CREATE TABLE js_cms_category
 	extend_d2 timestamp,
 	extend_d3 timestamp,
 	extend_d4 timestamp,
+	extend_json clob,
 	PRIMARY KEY (category_code)
 );
 
@@ -373,6 +375,7 @@ COMMENT ON COLUMN js_cms_article_data.extend_d1 IS '扩展 Date 1';
 COMMENT ON COLUMN js_cms_article_data.extend_d2 IS '扩展 Date 2';
 COMMENT ON COLUMN js_cms_article_data.extend_d3 IS '扩展 Date 3';
 COMMENT ON COLUMN js_cms_article_data.extend_d4 IS '扩展 Date 4';
+COMMENT ON COLUMN js_cms_article_data.extend_json IS '扩展 JSON';
 COMMENT ON TABLE js_cms_article_posid IS '文章推荐位';
 COMMENT ON COLUMN js_cms_article_posid.article_id IS '内容编号';
 COMMENT ON COLUMN js_cms_article_posid.postid IS '推荐位置（1轮播图 2首页推荐 3栏目页面）';
@@ -383,8 +386,8 @@ COMMENT ON TABLE js_cms_category IS '栏目表';
 COMMENT ON COLUMN js_cms_category.category_code IS '栏目编码';
 COMMENT ON COLUMN js_cms_category.parent_code IS '父级编号';
 COMMENT ON COLUMN js_cms_category.parent_codes IS '所有父级编号';
-COMMENT ON COLUMN js_cms_category.tree_sort IS '本级排序号（升序）';
-COMMENT ON COLUMN js_cms_category.tree_sorts IS '所有级别排序号';
+COMMENT ON COLUMN js_cms_category.tree_sort IS '排序号（升序）';
+COMMENT ON COLUMN js_cms_category.tree_sorts IS '所有排序号';
 COMMENT ON COLUMN js_cms_category.tree_leaf IS '是否最末级';
 COMMENT ON COLUMN js_cms_category.tree_level IS '层次级别';
 COMMENT ON COLUMN js_cms_category.tree_names IS '全节点名';
@@ -430,6 +433,7 @@ COMMENT ON COLUMN js_cms_category.extend_d1 IS '扩展 Date 1';
 COMMENT ON COLUMN js_cms_category.extend_d2 IS '扩展 Date 2';
 COMMENT ON COLUMN js_cms_category.extend_d3 IS '扩展 Date 3';
 COMMENT ON COLUMN js_cms_category.extend_d4 IS '扩展 Date 4';
+COMMENT ON COLUMN js_cms_category.extend_json IS '扩展 JSON';
 COMMENT ON TABLE js_cms_category_role IS '栏目与角色关联表';
 COMMENT ON COLUMN js_cms_category_role.category_code IS '栏目编码';
 COMMENT ON COLUMN js_cms_category_role.role_code IS '角色编码';

modules/cms/db/postgresql/cms.sql

@@ -63,6 +63,7 @@ CREATE TABLE js_cms_article_data
 	extend_d2 timestamp,
 	extend_d3 timestamp,
 	extend_d4 timestamp,
+	extend_json text,
 	PRIMARY KEY (id)
 ) WITHOUT OIDS;
 
@@ -136,6 +137,7 @@ CREATE TABLE js_cms_category
 	extend_d2 timestamp,
 	extend_d3 timestamp,
 	extend_d4 timestamp,
+	extend_json text,
 	PRIMARY KEY (category_code)
 ) WITHOUT OIDS;
 
@@ -373,6 +375,7 @@ COMMENT ON COLUMN js_cms_article_data.extend_d1 IS '扩展 Date 1';
 COMMENT ON COLUMN js_cms_article_data.extend_d2 IS '扩展 Date 2';
 COMMENT ON COLUMN js_cms_article_data.extend_d3 IS '扩展 Date 3';
 COMMENT ON COLUMN js_cms_article_data.extend_d4 IS '扩展 Date 4';
+COMMENT ON COLUMN js_cms_article_data.extend_json IS '扩展 JSON';
 COMMENT ON TABLE js_cms_article_posid IS '文章推荐位';
 COMMENT ON COLUMN js_cms_article_posid.article_id IS '内容编号';
 COMMENT ON COLUMN js_cms_article_posid.postid IS '推荐位置（1轮播图 2首页推荐 3栏目页面）';
@@ -383,8 +386,8 @@ COMMENT ON TABLE js_cms_category IS '栏目表';
 COMMENT ON COLUMN js_cms_category.category_code IS '栏目编码';
 COMMENT ON COLUMN js_cms_category.parent_code IS '父级编号';
 COMMENT ON COLUMN js_cms_category.parent_codes IS '所有父级编号';
-COMMENT ON COLUMN js_cms_category.tree_sort IS '本级排序号（升序）';
-COMMENT ON COLUMN js_cms_category.tree_sorts IS '所有级别排序号';
+COMMENT ON COLUMN js_cms_category.tree_sort IS '排序号（升序）';
+COMMENT ON COLUMN js_cms_category.tree_sorts IS '所有排序号';
 COMMENT ON COLUMN js_cms_category.tree_leaf IS '是否最末级';
 COMMENT ON COLUMN js_cms_category.tree_level IS '层次级别';
 COMMENT ON COLUMN js_cms_category.tree_names IS '全节点名';
@@ -430,6 +433,7 @@ COMMENT ON COLUMN js_cms_category.extend_d1 IS '扩展 Date 1';
 COMMENT ON COLUMN js_cms_category.extend_d2 IS '扩展 Date 2';
 COMMENT ON COLUMN js_cms_category.extend_d3 IS '扩展 Date 3';
 COMMENT ON COLUMN js_cms_category.extend_d4 IS '扩展 Date 4';
+COMMENT ON COLUMN js_cms_category.extend_json IS '扩展 JSON';
 COMMENT ON TABLE js_cms_category_role IS '栏目与角色关联表';
 COMMENT ON COLUMN js_cms_category_role.category_code IS '栏目编码';
 COMMENT ON COLUMN js_cms_category_role.role_code IS '角色编码';

modules/cms/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.jeesite</groupId>
 		<artifactId>jeesite-parent</artifactId>
-		<version>4.3.0-SNAPSHOT</version>
+		<version>5.0.0-SNAPSHOT</version>
 		<relativePath>../../parent/pom.xml</relativePath>
 	</parent>
 

modules/cms/src/main/java/com/jeesite/modules/cms/dao/ArticleDao.java

@@ -1,5 +1,6 @@
 /**
  * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+ * No deletion without permission, or be held responsible to law.
  */
 package com.jeesite.modules.cms.dao;
 

modules/cms/src/main/java/com/jeesite/modules/cms/dao/ArticleDataDao.java

@@ -1,5 +1,6 @@
 /**
  * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+ * No deletion without permission, or be held responsible to law.
  */
 package com.jeesite.modules.cms.dao;
 

modules/cms/src/main/java/com/jeesite/modules/cms/dao/ArticlePosidDao.java

@@ -1,5 +1,6 @@
 /**
  * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+ * No deletion without permission, or be held responsible to law.
  */
 package com.jeesite.modules.cms.dao;
 

modules/cms/src/main/java/com/jeesite/modules/cms/dao/ArticleTagDao.java

@@ -1,5 +1,6 @@
 /**
  * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+ * No deletion without permission, or be held responsible to law.
  */
 package com.jeesite.modules.cms.dao;
 

modules/cms/src/main/java/com/jeesite/modules/cms/dao/CategoryDao.java

@@ -1,5 +1,6 @@
 /**
  * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+ * No deletion without permission, or be held responsible to law.
  */
 package com.jeesite.modules.cms.dao;
 

modules/cms/src/main/java/com/jeesite/modules/cms/dao/CategoryRoleDao.java

@@ -1,5 +1,6 @@
 /**
  * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+ * No deletion without permission, or be held responsible to law.
  */
 package com.jeesite.modules.cms.dao;
 

modules/cms/src/main/java/com/jeesite/modules/cms/dao/CommentDao.java

@@ -1,5 +1,6 @@
 /**
  * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+ * No deletion without permission, or be held responsible to law.
  */
 package com.jeesite.modules.cms.dao;
 

modules/cms/src/main/java/com/jeesite/modules/cms/dao/ReportDao.java

@@ -1,5 +1,6 @@
 /**
  * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+ * No deletion without permission, or be held responsible to law.
  */
 package com.jeesite.modules.cms.dao;
 

modules/cms/src/main/java/com/jeesite/modules/cms/dao/SiteDao.java

@@ -1,5 +1,6 @@
 /**
  * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+ * No deletion without permission, or be held responsible to law.
  */
 package com.jeesite.modules.cms.dao;
 

modules/cms/src/main/java/com/jeesite/modules/cms/dao/TagDao.java

@@ -1,5 +1,6 @@
 /**
  * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+ * No deletion without permission, or be held responsible to law.
  */
 package com.jeesite.modules.cms.dao;
 

modules/cms/src/main/java/com/jeesite/modules/cms/dao/VisitLogDao.java

@@ -1,5 +1,6 @@
 /**
  * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+ * No deletion without permission, or be held responsible to law.
  */
 package com.jeesite.modules.cms.dao;
 

modules/cms/src/main/java/com/jeesite/modules/cms/db/InitCmsData.java

@@ -1,5 +1,6 @@
 /**
  * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+ * No deletion without permission, or be held responsible to law.
  */
 package com.jeesite.modules.cms.db;
 

modules/cms/src/main/java/com/jeesite/modules/cms/entity/Article.java

@@ -1,5 +1,6 @@
 /**
  * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+ * No deletion without permission, or be held responsible to law.
  */
 package com.jeesite.modules.cms.entity;
 
@@ -8,7 +9,7 @@ import java.util.Date;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 
-import org.hibernate.validator.constraints.Length;
+import javax.validation.constraints.Size;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.jeesite.common.entity.BaseEntity;
@@ -115,7 +116,7 @@ public class Article extends DataEntity<Article> {
 		this.category = category;
 	}
 
-	@Length(min = 0, max = 50, message = "模块类型长度不能超过 50 个字符")
+	@Size(min = 0, max = 50, message = "模块类型长度不能超过 50 个字符")
 	public String getModuleType() {
 		return moduleType;
 	}
@@ -125,7 +126,7 @@ public class Article extends DataEntity<Article> {
 	}
 
 	@NotBlank(message = "内容标题不能为空")
-	@Length(min = 0, max = 255, message = "内容标题长度不能超过 255 个字符")
+	@Size(min = 0, max = 255, message = "内容标题长度不能超过 255 个字符")
 	public String getTitle() {
 		return title;
 	}
@@ -134,7 +135,7 @@ public class Article extends DataEntity<Article> {
 		this.title = title;
 	}
 
-	@Length(min = 0, max = 1000, message = "外部链接长度不能超过 1000 个字符")
+	@Size(min = 0, max = 1000, message = "外部链接长度不能超过 1000 个字符")
 	public String getHref() {
 		return href;
 	}
@@ -143,7 +144,7 @@ public class Article extends DataEntity<Article> {
 		this.href = href;
 	}
 
-	@Length(min = 0, max = 50, message = "标题颜色长度不能超过 50 个字符")
+	@Size(min = 0, max = 50, message = "标题颜色长度不能超过 50 个字符")
 	public String getColor() {
 		return color;
 	}
@@ -152,7 +153,7 @@ public class Article extends DataEntity<Article> {
 		this.color = color;
 	}
 
-	@Length(min = 0, max = 1000, message = "内容图片长度不能超过 1000 个字符")
+	@Size(min = 0, max = 1000, message = "内容图片长度不能超过 1000 个字符")
 	public String getImage() {
 		return image;
 	}
@@ -161,7 +162,7 @@ public class Article extends DataEntity<Article> {
 		this.image = image;
 	}
 
-	@Length(min = 0, max = 500, message = "关键字长度不能超过 500 个字符")
+	@Size(min = 0, max = 500, message = "关键字长度不能超过 500 个字符")
 	public String getKeywords() {
 		return keywords;
 	}
@@ -170,7 +171,7 @@ public class Article extends DataEntity<Article> {
 		this.keywords = keywords;
 	}
 
-	@Length(min = 0, max = 500, message = "描述长度不能超过 500 个字符")
+	@Size(min = 0, max = 500, message = "描述长度不能超过 500 个字符")
 	public String getDescription() {
 		return description;
 	}
@@ -196,7 +197,7 @@ public class Article extends DataEntity<Article> {
 		this.weightDate = weightDate;
 	}
 
-	@Length(min = 0, max = 1, message = "来源长度不能超过 1 个字符")
+	@Size(min = 0, max = 1, message = "来源长度不能超过 1 个字符")
 	public String getSource() {
 		return source;
 	}
@@ -205,7 +206,7 @@ public class Article extends DataEntity<Article> {
 		this.source = source;
 	}
 
-	@Length(min = 0, max = 255, message = "文章来源出处长度不能超过 255 个字符")
+	@Size(min = 0, max = 255, message = "文章来源出处长度不能超过 255 个字符")
 	public String getCopyfrom() {
 		return copyfrom;
 	}
@@ -248,7 +249,7 @@ public class Article extends DataEntity<Article> {
 		this.wordCount = wordCount;
 	}
 
-	@Length(min = 0, max = 255, message = "自定义内容视图长度不能超过 255 个字符")
+	@Size(min = 0, max = 255, message = "自定义内容视图长度不能超过 255 个字符")
 	public String getCustomContentView() {
 		return customContentView;
 	}
@@ -257,7 +258,7 @@ public class Article extends DataEntity<Article> {
 		this.customContentView = customContentView;
 	}
 
-	@Length(min = 0, max = 1000, message = "视图配置长度不能超过 1000 个字符")
+	@Size(min = 0, max = 1000, message = "视图配置长度不能超过 1000 个字符")
 	public String getViewConfig() {
 		return viewConfig;
 	}

modules/cms/src/main/java/com/jeesite/modules/cms/entity/ArticleData.java

@@ -1,9 +1,10 @@
 /**
  * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+ * No deletion without permission, or be held responsible to law.
  */
 package com.jeesite.modules.cms.entity;
 
-import org.hibernate.validator.constraints.Length;
+import javax.validation.constraints.Size;
 
 import com.jeesite.common.entity.DataEntity;
 import com.jeesite.common.entity.Extend;
@@ -47,7 +48,7 @@ public class ArticleData extends DataEntity<ArticleData> {
 		this.content = content;
 	}
 
-	@Length(min = 0, max = 1000, message = "相关文章长度不能超过 1000 个字符")
+	@Size(min = 0, max = 1000, message = "相关文章长度不能超过 1000 个字符")
 	public String getRelation() {
 		return relation;
 	}
@@ -56,7 +57,7 @@ public class ArticleData extends DataEntity<ArticleData> {
 		this.relation = relation;
 	}
 
-	@Length(min = 0, max = 1, message = "是否允许评论长度不能超过 1 个字符")
+	@Size(min = 0, max = 1, message = "是否允许评论长度不能超过 1 个字符")
 	public String getIsCanComment() {
 		return isCanComment;
 	}

modules/cms/src/main/java/com/jeesite/modules/cms/entity/ArticlePosid.java

@@ -1,5 +1,6 @@
 /**
  * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+ * No deletion without permission, or be held responsible to law.
  */
 package com.jeesite.modules.cms.entity;
 

modules/cms/src/main/java/com/jeesite/modules/cms/entity/ArticleTag.java

@@ -1,5 +1,6 @@
 /**
  * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+ * No deletion without permission, or be held responsible to law.
  */
 package com.jeesite.modules.cms.entity;
 

modules/cms/src/main/java/com/jeesite/modules/cms/entity/Category.java

@@ -1,5 +1,6 @@
 /**
  * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+ * No deletion without permission, or be held responsible to law.
  */
 package com.jeesite.modules.cms.entity;
 
@@ -7,7 +8,7 @@ import java.util.List;
 
 import javax.validation.constraints.NotBlank;
 
-import org.hibernate.validator.constraints.Length;
+import javax.validation.constraints.Size;
 
 import com.jeesite.common.collect.ListUtils;
 import com.jeesite.common.entity.DataEntity;
@@ -110,7 +111,7 @@ public class Category extends TreeEntity<Category> {
 	}
 
 	@NotBlank(message = "栏目名称不能为空")
-	@Length(min = 0, max = 100, message = "栏目名称长度不能超过 100 个字符")
+	@Size(min = 0, max = 100, message = "栏目名称长度不能超过 100 个字符")
 	public String getCategoryName() {
 		return categoryName;
 	}
@@ -130,7 +131,7 @@ public class Category extends TreeEntity<Category> {
 		this.site = site;
 	}
 
-	@Length(min = 0, max = 50, message = "模块类型长度不能超过 50 个字符")
+	@Size(min = 0, max = 50, message = "模块类型长度不能超过 50 个字符")
 	public String getModuleType() {
 		return moduleType;
 	}
@@ -139,7 +140,7 @@ public class Category extends TreeEntity<Category> {
 		this.moduleType = moduleType;
 	}
 
-	@Length(min = 0, max = 255, message = "栏目图片长度不能超过 255 个字符")
+	@Size(min = 0, max = 255, message = "栏目图片长度不能超过 255 个字符")
 	public String getImage() {
 		return image;
 	}
@@ -148,7 +149,7 @@ public class Category extends TreeEntity<Category> {
 		this.image = image;
 	}
 
-	@Length(min = 0, max = 255, message = "链接长度不能超过 255 个字符")
+	@Size(min = 0, max = 255, message = "链接长度不能超过 255 个字符")
 	public String getHref() {
 		return href;
 	}
@@ -157,7 +158,7 @@ public class Category extends TreeEntity<Category> {
 		this.href = href;
 	}
 
-	@Length(min = 0, max = 20, message = "目标长度不能超过 20 个字符")
+	@Size(min = 0, max = 20, message = "目标长度不能超过 20 个字符")
 	public String getTarget() {
 		return target;
 	}
@@ -166,7 +167,7 @@ public class Category extends TreeEntity<Category> {
 		this.target = target;
 	}
 
-	@Length(min = 0, max = 500, message = "关键字长度不能超过 500 个字符")
+	@Size(min = 0, max = 500, message = "关键字长度不能超过 500 个字符")
 	public String getKeywords() {
 		return keywords;
 	}
@@ -175,7 +176,7 @@ public class Category extends TreeEntity<Category> {
 		this.keywords = keywords;
 	}
 
-	@Length(min = 0, max = 500, message = "描述长度不能超过 500 个字符")
+	@Size(min = 0, max = 500, message = "描述长度不能超过 500 个字符")
 	public String getDescription() {
 		return description;
 	}
@@ -184,7 +185,7 @@ public class Category extends TreeEntity<Category> {
 		this.description = description;
 	}
 
-	@Length(min = 0, max = 1, message = "是否在导航中显示长度不能超过 1 个字符")
+	@Size(min = 0, max = 1, message = "是否在导航中显示长度不能超过 1 个字符")
 	public String getInMenu() {
 		return inMenu;
 	}
@@ -193,7 +194,7 @@ public class Category extends TreeEntity<Category> {
 		this.inMenu = inMenu;
 	}
 
-	@Length(min = 0, max = 1, message = "是否在分类页中显示列表长度不能超过 1 个字符")
+	@Size(min = 0, max = 1, message = "是否在分类页中显示列表长度不能超过 1 个字符")
 	public String getInList() {
 		return inList;
 	}
@@ -202,7 +203,7 @@ public class Category extends TreeEntity<Category> {
 		this.inList = inList;
 	}
 
-	@Length(min = 0, max = 1, message = "展现模式长度不能超过 1 个字符")
+	@Size(min = 0, max = 1, message = "展现模式长度不能超过 1 个字符")
 	public String getShowModes() {
 		return showModes;
 	}
@@ -211,7 +212,7 @@ public class Category extends TreeEntity<Category> {
 		this.showModes = showModes;
 	}
 
-	@Length(min = 0, max = 1, message = "是否需要审核长度不能超过 1 个字符")
+	@Size(min = 0, max = 1, message = "是否需要审核长度不能超过 1 个字符")
 	public String getIsNeedAudit() {
 		return isNeedAudit;
 	}
@@ -220,7 +221,7 @@ public class Category extends TreeEntity<Category> {
 		this.isNeedAudit = isNeedAudit;
 	}
 
-	@Length(min = 0, max = 1, message = "是否允许评论长度不能超过 1 个字符")
+	@Size(min = 0, max = 1, message = "是否允许评论长度不能超过 1 个字符")
 	public String getIsCanComment() {
 		return isCanComment;
 	}
@@ -229,7 +230,7 @@ public class Category extends TreeEntity<Category> {
 		this.isCanComment = isCanComment;
 	}
 
-	@Length(min = 0, max = 255, message = "自定义列表视图长度不能超过 255 个字符")
+	@Size(min = 0, max = 255, message = "自定义列表视图长度不能超过 255 个字符")
 	public String getCustomListView() {
 		return customListView;
 	}
@@ -238,7 +239,7 @@ public class Category extends TreeEntity<Category> {
 		this.customListView = customListView;
 	}
 
-	@Length(min = 0, max = 255, message = "自定义内容视图长度不能超过 255 个字符")
+	@Size(min = 0, max = 255, message = "自定义内容视图长度不能超过 255 个字符")
 	public String getCustomContentView() {
 		return customContentView;
 	}
@@ -247,7 +248,7 @@ public class Category extends TreeEntity<Category> {
 		this.customContentView = customContentView;
 	}
 
-	@Length(min = 0, max = 1000, message = "视图配置长度不能超过 1000 个字符")
+	@Size(min = 0, max = 1000, message = "视图配置长度不能超过 1000 个字符")
 	public String getViewConfig() {
 		return viewConfig;
 	}