caojiahao/dev_caojiahao
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

'代码合并'

Browse Source
This commit is contained in:
fengtianyangyang 2022-03-03 17:22:13 +08:00
commit 441cb6ddcb
42 changed files with 1357 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
DB/version4.1to4.2.sql
View File

@ -6,7 +6,11 @@ ALTER TABLE li_distribution ADD settlement_bank_branch_name varchar ( 200 );
/** 文章分类添加默认值**/
ALTER TABLE li_article_category alter column sort set default 0;
/** 添加分销提现菜单**/
<<<<<<< HEAD
INSERT INTO `rxshop`.`li_menu`(`id`, `create_by`, `create_time`, `delete_flag`, `update_by`, `update_time`, `description`, `front_route`, `icon`, `level`, `name`, `parent_id`, `path`, `sort_order`, `title`, `front_component`) VALUES (1410862675914764290, 'admin', '2021-07-02 15:27:29', b'0', 'admin', '2021-07-02 15:27:45', 'null', 'distribution/distributionCash', '', 2, 'distributionCash', '1374173575405109248', 'distributionCash', 5.00, '分销提现', 'null');
=======
INSERT INTO `lilishop`.`li_menu`(`id`, `create_by`, `create_time`, `delete_flag`, `update_by`, `update_time`, `description`, `front_route`, `icon`, `level`, `name`, `parent_id`, `path`, `sort_order`, `title`, `front_component`) VALUES (1410862675914764290, 'admin', '2021-07-02 15:27:29', b'0', 'admin', '2021-07-02 15:27:45', 'null', 'distribution/distributionCash', '', 2, 'distributionCash', '1374173575405109248', 'distributionCash', 5.00, '分销提现', 'null');
>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
/** 促销商品添加商品类型**/
ALTER TABLE li_promotion_goods ADD goods_type varchar (200);
@ -16,7 +20,11 @@ update li_member_points_history set point_type = 'INCREASE' where point_type=1;
update li_member_points_history set point_type = 'REDUCE' where point_type=0;
/** 添加分词管理菜单*/
<<<<<<< HEAD
INSERT INTO `rxshop`.`li_menu` (`id`, `create_by`, `create_time`, `delete_flag`, `update_by`, `update_time`, `description`, `front_route`, `icon`, `level`, `name`, `parent_id`, `path`, `sort_order`, `title`, `front_component`) VALUES (1349247640584085511, 'admin', '2021-01-13 14:51:20', b'0', 'admin', '2021-02-25 09:02:59', 'null', 'customWords/index', 'ios-american-football', 2, 'customWords', '1349237129847005184', 'customWords', 8.00, '分词管理', 'null');
=======
INSERT INTO `lilishop`.`li_menu` (`id`, `create_by`, `create_time`, `delete_flag`, `update_by`, `update_time`, `description`, `front_route`, `icon`, `level`, `name`, `parent_id`, `path`, `sort_order`, `title`, `front_component`) VALUES (1349247640584085511, 'admin', '2021-01-13 14:51:20', b'0', 'admin', '2021-02-25 09:02:59', 'null', 'customWords/index', 'ios-american-football', 2, 'customWords', '1349237129847005184', 'customWords', 8.00, '分词管理', 'null');
>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
/** 修改会员评价店铺图片字段类型 **/
alter table li_member_evaluation modify column reply_image text;
@ -25,4 +33,8 @@ alter table li_member_evaluation modify column reply_image text;
alter table li_after_sale modify column after_sale_image text;
/** 提现申请审核sql **/
INSERT INTO `rxshop`.`li_menu`(`id`, `create_by`, `create_time`, `delete_flag`, `update_by`, `update_time`, `description`, `front_route`, `icon`, `level`, `name`, `parent_id`, `path`, `sort_order`, `title`, `front_component`) VALUES (1367042804944994305, 'admin', '2021-03-03 09:22:58', b'0', NULL, NULL, NULL, 'member/advance/withdrawApply', 'ios-alert', 2, 'withdrawApply', '1367042490443497472', 'withdrawApply', 1.00, '提现申请', NULL);
<<<<<<< HEAD
INSERT INTO `rxshop`.`li_menu`(`id`, `create_by`, `create_time`, `delete_flag`, `update_by`, `update_time`, `description`, `front_route`, `icon`, `level`, `name`, `parent_id`, `path`, `sort_order`, `title`, `front_component`) VALUES (1367042804944994305, 'admin', '2021-03-03 09:22:58', b'0', NULL, NULL, NULL, 'member/advance/withdrawApply', 'ios-alert', 2, 'withdrawApply', '1367042490443497472', 'withdrawApply', 1.00, '提现申请', NULL);
=======
INSERT INTO `lilishop`.`li_menu`(`id`, `create_by`, `create_time`, `delete_flag`, `update_by`, `update_time`, `description`, `front_route`, `icon`, `level`, `name`, `parent_id`, `path`, `sort_order`, `title`, `front_component`) VALUES (1367042804944994305, 'admin', '2021-03-03 09:22:58', b'0', NULL, NULL, NULL, 'member/advance/withdrawApply', 'ios-alert', 2, 'withdrawApply', '1367042490443497472', 'withdrawApply', 1.00, '提现申请', NULL);
>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7

677
LICENSE
View File

@ -1,3 +1,4 @@
<<<<<<< HEAD
GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 2007
@ -672,3 +673,679 @@ may consider it more useful to permit linking proprietary applications with
the library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License. But first, please read
<http://www.gnu.org/philosophy/why-not-lgpl.html>.
=======
GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 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 General Public License is a free, copyleft license for
software and other kinds of works.
The licenses for most software and other practical works are designed
to take away your freedom to share and change the works. By contrast,
the GNU General Public License is intended to guarantee your freedom to
share and change all versions of a program--to make sure it remains free
software for all its users. We, the Free Software Foundation, use the
GNU General Public License for most of our software; it applies also to
any other work released this way by its authors. You can apply it to
your programs, too.
When we speak of free software, we are referring to freedom, not
price. Our General Public Licenses are designed to make sure that you
have the freedom to distribute copies of free software (and charge for
them if you wish), that you receive source code or can get it if you
want it, that you can change the software or use pieces of it in new
free programs, and that you know you can do these things.
To protect your rights, we need to prevent others from denying you
these rights or asking you to surrender the rights. Therefore, you have
certain responsibilities if you distribute copies of the software, or if
you modify it: responsibilities to respect the freedom of others.
For example, if you distribute copies of such a program, whether
gratis or for a fee, you must pass on to the recipients the same
freedoms that you received. You must make sure that they, too, receive
or can get the source code. And you must show them these terms so they
know their rights.
Developers that use the GNU GPL protect your rights with two steps:
(1) assert copyright on the software, and (2) offer you this License
giving you legal permission to copy, distribute and/or modify it.
For the developers' and authors' protection, the GPL clearly explains
that there is no warranty for this free software. For both users' and
authors' sake, the GPL requires that modified versions be marked as
changed, so that their problems will not be attributed erroneously to
authors of previous versions.
Some devices are designed to deny users access to install or run
modified versions of the software inside them, although the manufacturer
can do so. This is fundamentally incompatible with the aim of
protecting users' freedom to change the software. The systematic
pattern of such abuse occurs in the area of products for individuals to
use, which is precisely where it is most unacceptable. Therefore, we
have designed this version of the GPL to prohibit the practice for those
products. If such problems arise substantially in other domains, we
stand ready to extend this provision to those domains in future versions
of the GPL, as needed to protect the freedom of users.
Finally, every program is threatened constantly by software patents.
States should not allow patents to restrict development and use of
software on general-purpose computers, but in those that do, we wish to
avoid the special danger that patents applied to a free program could
make it effectively proprietary. To prevent this, the GPL assures that
patents cannot be used to render the program non-free.
The precise terms and conditions for copying, distribution and
modification follow.
TERMS AND CONDITIONS
0. Definitions.
"This License" refers to version 3 of the GNU General Public License.
"Copyright" also means copyright-like laws that apply to other kinds of
works, such as semiconductor masks.
"The Program" refers to any copyrightable work licensed under this
License. Each licensee is addressed as "you". "Licensees" and
"recipients" may be individuals or organizations.
To "modify" a work means to copy from or adapt all or part of the work
in a fashion requiring copyright permission, other than the making of an
exact copy. The resulting work is called a "modified version" of the
earlier work or a work "based on" the earlier work.
A "covered work" means either the unmodified Program or a work based
on the Program.
To "propagate" a work means to do anything with it that, without
permission, would make you directly or secondarily liable for
infringement under applicable copyright law, except executing it on a
computer or modifying a private copy. Propagation includes copying,
distribution (with or without modification), making available to the
public, and in some countries other activities as well.
To "convey" a work means any kind of propagation that enables other
parties to make or receive copies. Mere interaction with a user through
a computer network, with no transfer of a copy, is not conveying.
An interactive user interface displays "Appropriate Legal Notices"
to the extent that it includes a convenient and prominently visible
feature that (1) displays an appropriate copyright notice, and (2)
tells the user that there is no warranty for the work (except to the
extent that warranties are provided), that licensees may convey the
work under this License, and how to view a copy of this License. If
the interface presents a list of user commands or options, such as a
menu, a prominent item in the list meets this criterion.
1. Source Code.
The "source code" for a work means the preferred form of the work
for making modifications to it. "Object code" means any non-source
form of a work.
A "Standard Interface" means an interface that either is an official
standard defined by a recognized standards body, or, in the case of
interfaces specified for a particular programming language, one that
is widely used among developers working in that language.
The "System Libraries" of an executable work include anything, other
than the work as a whole, that (a) is included in the normal form of
packaging a Major Component, but which is not part of that Major
Component, and (b) serves only to enable use of the work with that
Major Component, or to implement a Standard Interface for which an
implementation is available to the public in source code form. A
"Major Component", in this context, means a major essential component
(kernel, window system, and so on) of the specific operating system
(if any) on which the executable work runs, or a compiler used to
produce the work, or an object code interpreter used to run it.
The "Corresponding Source" for a work in object code form means all
the source code needed to generate, install, and (for an executable
work) run the object code and to modify the work, including scripts to
control those activities. However, it does not include the work's
System Libraries, or general-purpose tools or generally available free
programs which are used unmodified in performing those activities but
which are not part of the work. For example, Corresponding Source
includes interface definition files associated with source files for
the work, and the source code for shared libraries and dynamically
linked subprograms that the work is specifically designed to require,
such as by intimate data communication or control flow between those
subprograms and other parts of the work.
The Corresponding Source need not include anything that users
can regenerate automatically from other parts of the Corresponding
Source.
The Corresponding Source for a work in source code form is that
same work.
2. Basic Permissions.
All rights granted under this License are granted for the term of
copyright on the Program, and are irrevocable provided the stated
conditions are met. This License explicitly affirms your unlimited
permission to run the unmodified Program. The output from running a
covered work is covered by this License only if the output, given its
content, constitutes a covered work. This License acknowledges your
rights of fair use or other equivalent, as provided by copyright law.
You may make, run and propagate covered works that you do not
convey, without conditions so long as your license otherwise remains
in force. You may convey covered works to others for the sole purpose
of having them make modifications exclusively for you, or provide you
with facilities for running those works, provided that you comply with
the terms of this License in conveying all material for which you do
not control copyright. Those thus making or running the covered works
for you must do so exclusively on your behalf, under your direction
and control, on terms that prohibit them from making any copies of
your copyrighted material outside their relationship with you.
Conveying under any other circumstances is permitted solely under
the conditions stated below. Sublicensing is not allowed; section 10
makes it unnecessary.
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
No covered work shall be deemed part of an effective technological
measure under any applicable law fulfilling obligations under article
11 of the WIPO copyright treaty adopted on 20 December 1996, or
similar laws prohibiting or restricting circumvention of such
measures.
When you convey a covered work, you waive any legal power to forbid
circumvention of technological measures to the extent such circumvention
is effected by exercising rights under this License with respect to
the covered work, and you disclaim any intention to limit operation or
modification of the work as a means of enforcing, against the work's
users, your or third parties' legal rights to forbid circumvention of
technological measures.
4. Conveying Verbatim Copies.
You may convey verbatim copies of the Program's source code as you
receive it, in any medium, provided that you conspicuously and
appropriately publish on each copy an appropriate copyright notice;
keep intact all notices stating that this License and any
non-permissive terms added in accord with section 7 apply to the code;
keep intact all notices of the absence of any warranty; and give all
recipients a copy of this License along with the Program.
You may charge any price or no price for each copy that you convey,
and you may offer support or warranty protection for a fee.
5. Conveying Modified Source Versions.
You may convey a work based on the Program, or the modifications to
produce it from the Program, in the form of source code under the
terms of section 4, provided that you also meet all of these conditions:
a) The work must carry prominent notices stating that you modified
it, and giving a relevant date.
b) The work must carry prominent notices stating that it is
released under this License and any conditions added under section
7. This requirement modifies the requirement in section 4 to
"keep intact all notices".
c) You must license the entire work, as a whole, under this
License to anyone who comes into possession of a copy. This
License will therefore apply, along with any applicable section 7
additional terms, to the whole of the work, and all its parts,
regardless of how they are packaged. This License gives no
permission to license the work in any other way, but it does not
invalidate such permission if you have separately received it.
d) If the work has interactive user interfaces, each must display
Appropriate Legal Notices; however, if the Program has interactive
interfaces that do not display Appropriate Legal Notices, your
work need not make them do so.
A compilation of a covered work with other separate and independent
works, which are not by their nature extensions of the covered work,
and which are not combined with it such as to form a larger program,
in or on a volume of a storage or distribution medium, is called an
"aggregate" if the compilation and its resulting copyright are not
used to limit the access or legal rights of the compilation's users
beyond what the individual works permit. Inclusion of a covered work
in an aggregate does not cause this License to apply to the other
parts of the aggregate.
6. Conveying Non-Source Forms.
You may convey a covered work in object code form under the terms
of sections 4 and 5, provided that you also convey the
machine-readable Corresponding Source under the terms of this License,
in one of these ways:
a) Convey the object code in, or embodied in, a physical product
(including a physical distribution medium), accompanied by the
Corresponding Source fixed on a durable physical medium
customarily used for software interchange.
b) Convey the object code in, or embodied in, a physical product
(including a physical distribution medium), accompanied by a
written offer, valid for at least three years and valid for as
long as you offer spare parts or customer support for that product
model, to give anyone who possesses the object code either (1) a
copy of the Corresponding Source for all the software in the
product that is covered by this License, on a durable physical
medium customarily used for software interchange, for a price no
more than your reasonable cost of physically performing this
conveying of source, or (2) access to copy the
Corresponding Source from a network server at no charge.
c) Convey individual copies of the object code with a copy of the
written offer to provide the Corresponding Source. This
alternative is allowed only occasionally and noncommercially, and
only if you received the object code with such an offer, in accord
with subsection 6b.
d) Convey the object code by offering access from a designated
place (gratis or for a charge), and offer equivalent access to the
Corresponding Source in the same way through the same place at no
further charge. You need not require recipients to copy the
Corresponding Source along with the object code. If the place to
copy the object code is a network server, the Corresponding Source
may be on a different server (operated by you or a third party)
that supports equivalent copying facilities, provided you maintain
clear directions next to the object code saying where to find the
Corresponding Source. Regardless of what server hosts the
Corresponding Source, you remain obligated to ensure that it is
available for as long as needed to satisfy these requirements.
e) Convey the object code using peer-to-peer transmission, provided
you inform other peers where the object code and Corresponding
Source of the work are being offered to the general public at no
charge under subsection 6d.
A separable portion of the object code, whose source code is excluded
from the Corresponding Source as a System Library, need not be
included in conveying the object code work.
A "User Product" is either (1) a "consumer product", which means any
tangible personal property which is normally used for personal, family,
or household purposes, or (2) anything designed or sold for incorporation
into a dwelling. In determining whether a product is a consumer product,
doubtful cases shall be resolved in favor of coverage. For a particular
product received by a particular user, "normally used" refers to a
typical or common use of that class of product, regardless of the status
of the particular user or of the way in which the particular user
actually uses, or expects or is expected to use, the product. A product
is a consumer product regardless of whether the product has substantial
commercial, industrial or non-consumer uses, unless such uses represent
the only significant mode of use of the product.
"Installation Information" for a User Product means any methods,
procedures, authorization keys, or other information required to install
and execute modified versions of a covered work in that User Product from
a modified version of its Corresponding Source. The information must
suffice to ensure that the continued functioning of the modified object
code is in no case prevented or interfered with solely because
modification has been made.
If you convey an object code work under this section in, or with, or
specifically for use in, a User Product, and the conveying occurs as
part of a transaction in which the right of possession and use of the
User Product is transferred to the recipient in perpetuity or for a
fixed term (regardless of how the transaction is characterized), the
Corresponding Source conveyed under this section must be accompanied
by the Installation Information. But this requirement does not apply
if neither you nor any third party retains the ability to install
modified object code on the User Product (for example, the work has
been installed in ROM).
The requirement to provide Installation Information does not include a
requirement to continue to provide support service, warranty, or updates
for a work that has been modified or installed by the recipient, or for
the User Product in which it has been modified or installed. Access to a
network may be denied when the modification itself materially and
adversely affects the operation of the network or violates the rules and
protocols for communication across the network.
Corresponding Source conveyed, and Installation Information provided,
in accord with this section must be in a format that is publicly
documented (and with an implementation available to the public in
source code form), and must require no special password or key for
unpacking, reading or copying.
7. Additional Terms.
"Additional permissions" are terms that supplement the terms of this
License by making exceptions from one or more of its conditions.
Additional permissions that are applicable to the entire Program shall
be treated as though they were included in this License, to the extent
that they are valid under applicable law. If additional permissions
apply only to part of the Program, that part may be used separately
under those permissions, but the entire Program remains governed by
this License without regard to the additional permissions.
When you convey a copy of a covered work, you may at your option
remove any additional permissions from that copy, or from any part of
it. (Additional permissions may be written to require their own
removal in certain cases when you modify the work.) You may place
additional permissions on material, added by you to a covered work,
for which you have or can give appropriate copyright permission.
Notwithstanding any other provision of this License, for material you
add to a covered work, you may (if authorized by the copyright holders of
that material) supplement the terms of this License with terms:
a) Disclaiming warranty or limiting liability differently from the
terms of sections 15 and 16 of this License; or
b) Requiring preservation of specified reasonable legal notices or
author attributions in that material or in the Appropriate Legal
Notices displayed by works containing it; or
c) Prohibiting misrepresentation of the origin of that material, or
requiring that modified versions of such material be marked in
reasonable ways as different from the original version; or
d) Limiting the use for publicity purposes of names of licensors or
authors of the material; or
e) Declining to grant rights under trademark law for use of some
trade names, trademarks, or service marks; or
f) Requiring indemnification of licensors and authors of that
material by anyone who conveys the material (or modified versions of
it) with contractual assumptions of liability to the recipient, for
any liability that these contractual assumptions directly impose on
those licensors and authors.
All other non-permissive additional terms are considered "further
restrictions" within the meaning of section 10. If the Program as you
received it, or any part of it, contains a notice stating that it is
governed by this License along with a term that is a further
restriction, you may remove that term. If a license document contains
a further restriction but permits relicensing or conveying under this
License, you may add to a covered work material governed by the terms
of that license document, provided that the further restriction does
not survive such relicensing or conveying.
If you add terms to a covered work in accord with this section, you
must place, in the relevant source files, a statement of the
additional terms that apply to those files, or a notice indicating
where to find the applicable terms.
Additional terms, permissive or non-permissive, may be stated in the
form of a separately written license, or stated as exceptions;
the above requirements apply either way.
8. Termination.
You may not propagate or modify a covered work except as expressly
provided under this License. Any attempt otherwise to propagate or
modify it is void, and will automatically terminate your rights under
this License (including any patent licenses granted under the third
paragraph of section 11).
However, if you cease all violation of this License, then your
license from a particular copyright holder is reinstated (a)
provisionally, unless and until the copyright holder explicitly and
finally terminates your license, and (b) permanently, if the copyright
holder fails to notify you of the violation by some reasonable means
prior to 60 days after the cessation.
Moreover, your license from a particular copyright holder is
reinstated permanently if the copyright holder notifies you of the
violation by some reasonable means, this is the first time you have
received notice of violation of this License (for any work) from that
copyright holder, and you cure the violation prior to 30 days after
your receipt of the notice.
Termination of your rights under this section does not terminate the
licenses of parties who have received copies or rights from you under
this License. If your rights have been terminated and not permanently
reinstated, you do not qualify to receive new licenses for the same
material under section 10.
9. Acceptance Not Required for Having Copies.
You are not required to accept this License in order to receive or
run a copy of the Program. Ancillary propagation of a covered work
occurring solely as a consequence of using peer-to-peer transmission
to receive a copy likewise does not require acceptance. However,
nothing other than this License grants you permission to propagate or
modify any covered work. These actions infringe copyright if you do
not accept this License. Therefore, by modifying or propagating a
covered work, you indicate your acceptance of this License to do so.
10. Automatic Licensing of Downstream Recipients.
Each time you convey a covered work, the recipient automatically
receives a license from the original licensors, to run, modify and
propagate that work, subject to this License. You are not responsible
for enforcing compliance by third parties with this License.
An "entity transaction" is a transaction transferring control of an
organization, or substantially all assets of one, or subdividing an
organization, or merging organizations. If propagation of a covered
work results from an entity transaction, each party to that
transaction who receives a copy of the work also receives whatever
licenses to the work the party's predecessor in interest had or could
give under the previous paragraph, plus a right to possession of the
Corresponding Source of the work from the predecessor in interest, if
the predecessor has it or can get it with reasonable efforts.
You may not impose any further restrictions on the exercise of the
rights granted or affirmed under this License. For example, you may
not impose a license fee, royalty, or other charge for exercise of
rights granted under this License, and you may not initiate litigation
(including a cross-claim or counterclaim in a lawsuit) alleging that
any patent claim is infringed by making, using, selling, offering for
sale, or importing the Program or any portion of it.
11. Patents.
A "contributor" is a copyright holder who authorizes use under this
License of the Program or a work on which the Program is based. The
work thus licensed is called the contributor's "contributor version".
A contributor's "essential patent claims" are all patent claims
owned or controlled by the contributor, whether already acquired or
hereafter acquired, that would be infringed by some manner, permitted
by this License, of making, using, or selling its contributor version,
but do not include claims that would be infringed only as a
consequence of further modification of the contributor version. For
purposes of this definition, "control" includes the right to grant
patent sublicenses in a manner consistent with the requirements of
this License.
Each contributor grants you a non-exclusive, worldwide, royalty-free
patent license under the contributor's essential patent claims, to
make, use, sell, offer for sale, import and otherwise run, modify and
propagate the contents of its contributor version.
In the following three paragraphs, a "patent license" is any express
agreement or commitment, however denominated, not to enforce a patent
(such as an express permission to practice a patent or covenant not to
sue for patent infringement). To "grant" such a patent license to a
party means to make such an agreement or commitment not to enforce a
patent against the party.
If you convey a covered work, knowingly relying on a patent license,
and the Corresponding Source of the work is not available for anyone
to copy, free of charge and under the terms of this License, through a
publicly available network server or other readily accessible means,
then you must either (1) cause the Corresponding Source to be so
available, or (2) arrange to deprive yourself of the benefit of the
patent license for this particular work, or (3) arrange, in a manner
consistent with the requirements of this License, to extend the patent
license to downstream recipients. "Knowingly relying" means you have
actual knowledge that, but for the patent license, your conveying the
covered work in a country, or your recipient's use of the covered work
in a country, would infringe one or more identifiable patents in that
country that you have reason to believe are valid.
If, pursuant to or in connection with a single transaction or
arrangement, you convey, or propagate by procuring conveyance of, a
covered work, and grant a patent license to some of the parties
receiving the covered work authorizing them to use, propagate, modify
or convey a specific copy of the covered work, then the patent license
you grant is automatically extended to all recipients of the covered
work and works based on it.
A patent license is "discriminatory" if it does not include within
the scope of its coverage, prohibits the exercise of, or is
conditioned on the non-exercise of one or more of the rights that are
specifically granted under this License. You may not convey a covered
work if you are a party to an arrangement with a third party that is
in the business of distributing software, under which you make payment
to the third party based on the extent of your activity of conveying
the work, and under which the third party grants, to any of the
parties who would receive the covered work from you, a discriminatory
patent license (a) in connection with copies of the covered work
conveyed by you (or copies made from those copies), or (b) primarily
for and in connection with specific products or compilations that
contain the covered work, unless you entered into that arrangement,
or that patent license was granted, prior to 28 March 2007.
Nothing in this License shall be construed as excluding or limiting
any implied license or other defenses to infringement that may
otherwise be available to you under applicable patent law.
12. No Surrender of Others' Freedom.
If conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
excuse you from the conditions of this License. If you cannot convey a
covered work so as to satisfy simultaneously your obligations under this
License and any other pertinent obligations, then as a consequence you may
not convey it at all. For example, if you agree to terms that obligate you
to collect a royalty for further conveying from those to whom you convey
the Program, the only way you could satisfy both those terms and this
License would be to refrain entirely from conveying the Program.
13. Use with the GNU Affero General Public License.
Notwithstanding any other provision of this License, you have
permission to link or combine any covered work with a work licensed
under version 3 of the GNU Affero General Public License into a single
combined work, and to convey the resulting work. The terms of this
License will continue to apply to the part which is the covered work,
but the special requirements of the GNU Affero General Public License,
section 13, concerning interaction through a network will apply to the
combination as such.
14. Revised Versions of this License.
The Free Software Foundation may publish revised and/or new versions of
the GNU General Public License from time to time. Such new versions will
be similar in spirit to the present version, but may differ in detail to
address new problems or concerns.
Each version is given a distinguishing version number. If the
Program specifies that a certain numbered version of the GNU General
Public License "or any later version" applies to it, you have the
option of following the terms and conditions either of that numbered
version or of any later version published by the Free Software
Foundation. If the Program does not specify a version number of the
GNU General Public License, you may choose any version ever published
by the Free Software Foundation.
If the Program specifies that a proxy can decide which future
versions of the GNU General Public License can be used, that proxy's
public statement of acceptance of a version permanently authorizes you
to choose that version for the Program.
Later license versions may give you additional or different
permissions. However, no additional obligations are imposed on any
author or copyright holder as a result of your choosing to follow a
later version.
15. Disclaimer of Warranty.
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
16. Limitation of Liability.
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
SUCH DAMAGES.
17. Interpretation of Sections 15 and 16.
If the disclaimer of warranty and limitation of liability provided
above cannot be given local legal effect according to their terms,
reviewing courts shall apply local law that most closely approximates
an absolute waiver of all civil liability in connection with the
Program, unless a warranty or assumption of liability accompanies a
copy of the Program in return for a fee.
END OF TERMS AND CONDITIONS
How to Apply These Terms to Your New Programs
If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
free software which everyone can redistribute and change under these terms.
To do so, attach the following notices to the program. It is safest
to attach them to the start of each source file to most effectively
state the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.
<one line to give the program's name and a brief idea of what it does.>
Copyright (C) <year> <name of author>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
Also add information on how to contact you by electronic and paper mail.
If the program does terminal interaction, make it output a short
notice like this when it starts in an interactive mode:
<program> Copyright (C) <year> <name of author>
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
The hypothetical commands `show w' and `show c' should show the appropriate
parts of the General Public License. Of course, your program's commands
might be different; for a GUI interface, you would use an "about box".
You should also get your employer (if you work as a programmer) or school,
if any, to sign a "copyright disclaimer" for the program, if necessary.
For more information on this, and how to apply and follow the GNU GPL, see
<http://www.gnu.org/licenses/>.
The GNU General Public License does not permit incorporating your program
into proprietary programs. If your program is a subroutine library, you
may consider it more useful to permit linking proprietary applications with
the library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License. But first, please read
<http://www.gnu.org/philosophy/why-not-lgpl.html>.
>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7

10
README.md
View File

@ -6,10 +6,20 @@
#### 欢迎交流需求，交流业务，交流技术（基础问题自行解决，进群先看文档后提问）
<<<<<<< HEAD
##### 交流 qq 1群 961316482（已满）
##### 交流 qq 2群 875294241
=======
##### 交流 qq 1群 961316482（已满）
<a target="_blank" href="https://qm.qq.com/cgi-bin/qm/qr?k=BAhURE3DG2YWhQk6kRxVapbLykqMoPS8&jump_from=webapi"><img border="0" src="https://pub.idqqimg.com/wpa/images/group.png" alt="Lilishop交流群" title="Lilishop交流群">点击快捷加群</a>
##### 交流 qq 2群 875294241
<a target="_blank" href="https://qm.qq.com/cgi-bin/qm/qr?k=_lrekOvr5k2p5uTn5GRidI-chKEmpCX3&jump_from=webapi"><img border="0" src="https://pub.idqqimg.com/wpa/images/group.png" alt="Lilishop交流群2群" title="Lilishop交流群2群">点击快捷加群</a>
>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
##### 体验 公众号/小程序/APP 体验，扫描二维码

13
admin/pom.xml
View File

@ -32,10 +32,17 @@
<artifactId>logstash-logback-encoder</artifactId>
<version>${logstash-logback-encoder}</version>
</dependency>
<<<<<<< HEAD
<!-- <dependency>-->
<!-- <groupId>org.springframework.boot</groupId>-->
<!-- <artifactId>spring-boot-starter-mail</artifactId>-->
<!-- </dependency> -->
=======
<!-- <dependency>-->
<!-- <groupId>org.springframework.boot</groupId>-->
<!-- <artifactId>spring-boot-starter-mail</artifactId>-->
<!-- </dependency> -->
>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
</dependencies>
<build>
@ -47,4 +54,8 @@
</plugins>
</build>
</project>
<<<<<<< HEAD
</project>
=======
</project>
>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7

3
admin/src/main/resources/application.properties
View File

@ -16,6 +16,9 @@ spring.mail.username=1814994716@qq.com
spring.mail.password=abcdefg123456!@#$%^
# 日志文件路径
logging.file.path=lili-logs/admin
<<<<<<< HEAD
lili.data.logstash.server=106.124.130.167:4560
=======
>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
# 文件格式
logging.pattern.file=%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(%5p) %clr(${PID}){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n%wEx

7
buyer-api/src/main/java/cn/lili/controller/other/PageBuyerController.java
View File

@ -36,12 +36,15 @@ public class PageBuyerController {
public ResultMessage<PageDataVO> getIndex(@RequestParam String clientType) {
PageDataDTO pageDataDTO = new PageDataDTO(PageEnum.INDEX.name());
pageDataDTO.setPageClientType(clientType);
return ResultUtil.data(pageService.getPageData(pageDataDTO));
PageDataVO pageDataVO=pageService.getPageData(pageDataDTO);
return ResultUtil.data(pageDataVO);
}
@ApiOperation(value = "获取页面数据")
@GetMapping
public ResultMessage<PageDataVO> get(PageDataDTO pageDataDTO) {
return ResultUtil.data(pageService.getPageData(pageDataDTO));
PageDataVO pageDataVO=pageService.getPageData(pageDataDTO);
return ResultUtil.data(pageDataVO);
}
}

53
buyer-api/src/main/resources/application.yml
View File

@ -1,5 +1,10 @@
server:
<<<<<<< HEAD
port: 8885
=======
port: 8888
>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
servlet:
context-path: /
#
@ -51,9 +56,15 @@ spring:
# Redis
redis:
<<<<<<< HEAD
host: 120.71.145.134
port: 6379
password: ekLhvPGraSj8DGO0
=======
host: 127.0.0.1
port: 6379
password: lilishop
>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
lettuce:
pool:
# 连接池最大连接数（使用负值表示没有限制） 默认 8
@ -72,9 +83,15 @@ spring:
default-datasource:
type: com.alibaba.druid.pool.DruidDataSource
driverClassName: com.mysql.cj.jdbc.Driver
<<<<<<< HEAD
url: jdbc:mysql://120.71.183.195:3306/zyt_shop?useUnicode=true&characterEncoding=UTF-8&serverTimezone=UTC&allowPublicKeyRetrieval=true&verifyServerCertificate=false&useSSL=false
username: zyt_shop
password: Gb84505016@zytshop
=======
url: jdbc:mysql://127.0.0.1:3306/lilishop?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
username: root
password: lilishop
>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
maxActive: 50
initialSize: 10
maxWait: 60000
@ -128,6 +145,10 @@ ignored:
- /weixin/**
- /source/**
- /buyer/payment/cashier/**
<<<<<<< HEAD
=======
- /buyer/payment/cashierRefund/**
>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
- /buyer/other/pageData/**
- /buyer/other/article/**
- /buyer/goods/**
@ -160,8 +181,13 @@ ignored:
# Swagger界面内容配置
swagger:
<<<<<<< HEAD
title: API接口文档
description: Api Documentation
=======
title: lili API接口文档
description: lili Api Documentation
>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
version: 1.0.0
termsOfServiceUrl: https://pickmall.cn
contact:
@ -184,7 +210,11 @@ logging:
# 输出级别
level:
root: info
<<<<<<< HEAD
# org.springframework: debug
=======
# org.springframework: debug
>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
file:
# 指定路径
path: lili-logs
@ -201,7 +231,11 @@ jasypt:
lili:
system:
<<<<<<< HEAD
isDemoSite: false
=======
isDemoSite: true
>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
statistics:
# 在线人数统计 X 小时。这里设置48，即统计过去48小时每小时在线人数
onlineMember: 48
@ -219,10 +253,17 @@ lili:
admin: https://admin-b2b2c.pickmall.cn
#api地址
api:
<<<<<<< HEAD
buyer: https://zshop-api.sx1788.cn/buyer-api
common: https://zshop-api.sx1788.cn/common-api
manager: https://zshop-api.sx1788.cn/manager-api
store: https://zshop-api.sx1788.cn/seller-api
=======
buyer: https://buyer-api.pickmall.cn
common: https://common-api.pickmall.cn
manager: https://admin-api.pickmall.cn
store: https://store-api.pickmall.cn
>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
# jwt 细节设定
jwt-setting:
@ -241,7 +282,11 @@ lili:
data:
elasticsearch:
cluster-name: elasticsearch
<<<<<<< HEAD
cluster-nodes: 106.124.130.167:9200
=======
cluster-nodes: 127.0.0.1:9200
>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
index:
number-of-replicas: 0
number-of-shards: 3
@ -251,7 +296,11 @@ lili:
# username: elastic
# password: LiLiShopES
logstash:
<<<<<<< HEAD
server: 106.124.130.167:4560
=======
server: 192.168.0.116:4560
>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
rocketmq:
promotion-topic: lili_promotion_topic
promotion-group: lili_promotion_group
@ -272,7 +321,11 @@ lili:
after-sale-topic: lili_after_sale_topic
after-sale-group: lili_after_sale_group
rocketmq:
<<<<<<< HEAD
name-server: 106.124.130.167:9876
=======
name-server: 127.0.0.1:9876
>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
producer:
group: lili_group
send-message-timeout: 30000

76
buyer-api/src/test/resources/application.yml
View File

@ -24,6 +24,7 @@ spring:
boot:
admin:
client:
<<<<<<< HEAD
url: http://127.0.0.1:8000
# mongodb
data:
@ -35,16 +36,28 @@ spring:
password: Gb84505016
authentication-database: admin
# replica-set-name: mongoreplset
=======
url: http://192.168.0.116:8000
>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
cache:
type: redis
#amqp
# rabbitmq:
<<<<<<< HEAD
# host: 106.124.130.167
# Redis
redis:
host: 120.71.145.134
port: 6379
password: ekLhvPGraSj8DGO0
=======
# host: 192.168.0.116
# Redis
redis:
host: 192.168.0.116
port: 6379
password: lilishop
>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
lettuce:
pool:
# 连接池最大连接数（使用负值表示没有限制） 默认 8
@ -73,9 +86,15 @@ spring:
default-datasource:
type: com.alibaba.druid.pool.DruidDataSource
driverClassName: com.mysql.cj.jdbc.Driver
<<<<<<< HEAD
url: jdbc:mysql://120.71.183.195:3306/zyt_shop?useUnicode=true&characterEncoding=UTF-8&serverTimezone=UTC&allowPublicKeyRetrieval=true&verifyServerCertificate=false&useSSL=false
username: zyt_shop
password: Gb84505016@zytshop
=======
url: jdbc:mysql://192.168.0.116:3306/new-lili?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
username: root
password: lilishop
>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
maxActive: 20
initialSize: 5
maxWait: 60000
@ -117,7 +136,11 @@ spring:
props:
#是否打印逻辑SQL语句和实际SQL语句，建议调试时打印，在生产环境关闭
sql:
<<<<<<< HEAD
show: true
=======
show: false
>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
# 忽略鉴权url
ignored:
@ -143,8 +166,13 @@ ignored:
- /buyer/memberEvaluation/**/goodsEvaluation
- /buyer/memberEvaluation/**/evaluationNumber
- /store/login/**
<<<<<<< HEAD
- /manager/passport/user/login
- /manager/passport/user/refresh/**
=======
- /manager/user/login
- /manager/user/refresh/**
>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
- /druid/**
- /swagger-ui.html
- /doc.html
@ -161,6 +189,7 @@ ignored:
# Swagger界面内容配置
swagger:
<<<<<<< HEAD
title: API接口文档
description: Api Documentation
version: 1.0.0
@ -169,6 +198,16 @@ swagger:
name: rx
url:
email:
=======
title: lili API接口文档
description: lili Api Documentation
version: 1.0.0
termsOfServiceUrl: https://pickmall.cn
contact:
name: lili
url: https://pickmall.cn
email: admin@pickmall.com
>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
# Mybatis-plus
mybatis-plus:
@ -186,7 +225,10 @@ logging:
cn.lili: info
# org.hibernate: debug
# org.springframework: debug
<<<<<<< HEAD
# org.springframework.data.mongodb.core: debug
=======
>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
file:
# 指定路径
path: lili-logs
@ -201,7 +243,11 @@ jasypt:
lili:
system:
<<<<<<< HEAD
isDemoSite: false
=======
isDemoSite: true
>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
statistics:
# 在线人数统计 X 小时。这里设置48，即统计过去48小时每小时在线人数
onlineMember: 48
@ -213,6 +259,7 @@ lili:
sk: zhNKVrJK6UPOhqIjn8AQvG37b9sz6
#域名
domain:
<<<<<<< HEAD
pc: http://106.124.130.167:8885
wap: http://106.124.130.167:8885
seller: http://106.124.130.167:8885
@ -223,6 +270,18 @@ lili:
base: http://106.124.130.167:8885
manager: http://106.124.130.167:8885
seller: http://106.124.130.167:8885
=======
pc: http://192.168.0.116:8888
wap: http://192.168.0.116:8888
seller: http://192.168.0.116:8888
admin: http://192.168.0.116:8888
#api地址
api:
buyer: https://z171l91606.51mypc.cn
base: http://192.168.0.116:8888
manager: http://192.168.0.116:8888
seller: http://192.168.0.116:8888
>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
# jwt 细节设定
jwt-setting:
@ -241,7 +300,11 @@ lili:
data:
elasticsearch:
cluster-name: elasticsearch
<<<<<<< HEAD
cluster-nodes: 106.124.130.167:9200
=======
cluster-nodes: 192.168.0.116:9200
>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
index:
number-of-replicas: 0
number-of-shards: 3
@ -250,7 +313,12 @@ lili:
# account:
# username: elastic
# password: LiLiShopES
<<<<<<< HEAD
=======
logstash:
server: 127.0.0.1:4560
>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
rocketmq:
promotion-topic: lili_promotion_topic
promotion-group: lili_promotion_group
@ -269,7 +337,11 @@ lili:
notice-send-topic: lili_send_notice_topic
notice-send-group: lili_send_notice_group
rocketmq:
<<<<<<< HEAD
name-server: 106.124.130.167:9876
=======
name-server: 192.168.0.116:9876
>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
producer:
group: lili_group
send-message-timeout: 30000
@ -277,7 +349,11 @@ rocketmq:
xxl:
job:
admin:
<<<<<<< HEAD
addresses: http://127.0.0.1:9001/xxl-job-admin
=======
addresses: http://192.168.0.116:9001/xxl-job-admin
>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
executor:
appname: xxl-job-executor-lilishop
address:

60
common-api/src/main/resources/application.yml
View File

@ -1,5 +1,9 @@
server:
port: 8890
<<<<<<< HEAD
=======
>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
servlet:
context-path: /
@ -32,9 +36,15 @@ spring:
type: redis
# Redis
redis:
<<<<<<< HEAD
host: 120.71.145.134
port: 6379
password: ekLhvPGraSj8DGO0
=======
host: 127.0.0.1
port: 6379
password: lilishop
>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
lettuce:
pool:
# 连接池最大连接数（使用负值表示没有限制） 默认 8
@ -63,9 +73,15 @@ spring:
default-datasource:
type: com.alibaba.druid.pool.DruidDataSource
driverClassName: com.mysql.cj.jdbc.Driver
<<<<<<< HEAD
url: jdbc:mysql://120.71.183.195:3306/zyt_shop?useUnicode=true&characterEncoding=UTF-8&serverTimezone=UTC&allowPublicKeyRetrieval=true&verifyServerCertificate=false&useSSL=false
username: zyt_shop
password: Gb84505016@zytshop
=======
url: jdbc:mysql://127.0.0.1:3306/lilishop?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
username: root
password: lilishop
>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
maxActive: 20
initialSize: 5
maxWait: 60000
@ -136,8 +152,13 @@ ignored:
# Swagger界面内容配置
swagger:
<<<<<<< HEAD
title: API接口文档
description: Api Documentation
=======
title: lili API接口文档
description: lili Api Documentation
>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
version: 1.0.0
termsOfServiceUrl: https://pickmall.cn
contact:
@ -190,6 +211,7 @@ lili:
#短信模版配置
sms:
#登录
<<<<<<< HEAD
LOGIN: SMS_185821482
#注册
REGISTER: SMS_185821482
@ -201,6 +223,19 @@ lili:
WALLET_PASSWORD: SMS_185821482
system:
isTestModel: false
=======
LOGIN: SMS_205755300
#注册
REGISTER: SMS_205755298
#找回密码
FIND_USER: SMS_205755301
#设置密码
UPDATE_PASSWORD: SMS_205755297
#支付密码
WALLET_PASSWORD: SMS_205755301
system:
isTestModel: true
>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
statistics:
# 在线人数统计 X 小时。这里设置48，即统计过去48小时每小时在线人数
onlineMember: 48
@ -212,6 +247,7 @@ lili:
sk: zhNKVrJK6UPOhqIjn8AQvG37b9sz6
#域名
domain:
<<<<<<< HEAD
pc: https://zbuyer.sx1788.cn
wap: https://zshop.sx1788.cn
store: https://zseller.sx1788.cn
@ -222,6 +258,18 @@ lili:
common: https://zshop-api.sx1788.cn/common-api
manager: https://zshop-api.sx1788.cn/manager-api
store: https://zshop-api.sx1788.cn/seller-api
=======
pc: https://pc.b2b2c.pickmall.cn
wap: https://m.b2b2c.pickmall.cn
store: https://store.b2b2c.pickmall.cn
admin: https://admin.b2b2c.pickmall.cn
#api地址
api:
buyer: https://buyer-api.pickmall.cn
common: https://common-api.pickmall.cn
manager: https://admin-api.pickmall.cn
store: https://store-api.pickmall.cn
>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
# jwt 细节设定
jwt-setting:
@ -240,7 +288,11 @@ lili:
data:
elasticsearch:
cluster-name: elasticsearch
<<<<<<< HEAD
cluster-nodes: 106.124.130.167:9200
=======
cluster-nodes: 127.0.0.1:9200
>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
index:
number-of-replicas: 0
number-of-shards: 3
@ -250,7 +302,11 @@ lili:
# username: elastic
# password: LiLiShopES
logstash:
<<<<<<< HEAD
server: 106.124.130.167:4560
=======
server: 127.0.0.1:4560
>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
rocketmq:
promotion-topic: lili_promotion_topic
promotion-group: lili_promotion_group
@ -269,7 +325,11 @@ lili:
notice-send-topic: lili_send_notice_topic
notice-send-group: lili_send_notice_group
rocketmq:
<<<<<<< HEAD
name-server: 106.124.130.167:9876
=======
name-server: 127.0.0.1:9876
>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
producer:
group: lili_group
send-message-timeout: 30000

82
config/application.yml
View File

@ -24,6 +24,7 @@ spring:
boot:
admin:
client:
<<<<<<< HEAD
url: http://127.0.0.1:8000
# mongodb
data:
@ -33,15 +34,31 @@ spring:
database: rx-shop
username: goboo
password: Gb84505016
=======
url: http://192.168.0.116:8000
# mongodb
data:
mongodb:
uri: 192.168.0.116:27017
database: lilishop
username: root
password: lilishop
>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
authentication-database: admin
# replica-set-name: mongoreplset
cache:
type: redis
# Redis
redis:
<<<<<<< HEAD
host: 120.71.145.134
port: 6379
password: ekLhvPGraSj8DGO0
=======
host: 192.168.0.116
port: 6379
password: lilishop
>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
lettuce:
pool:
# 连接池最大连接数（使用负值表示没有限制） 默认 8
@ -70,9 +87,15 @@ spring:
default-datasource:
type: com.alibaba.druid.pool.DruidDataSource
driverClassName: com.mysql.cj.jdbc.Driver
<<<<<<< HEAD
url: jdbc:mysql://120.71.183.195:3306/zyt_shop?useUnicode=true&characterEncoding=UTF-8&serverTimezone=UTC&allowPublicKeyRetrieval=true&verifyServerCertificate=false&useSSL=false
username: zyt_shop
password: Gb84505016@zytshop
=======
url: jdbc:mysql://192.168.0.116:3306/shengxing?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
username: root
password: lilishop
>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
maxActive: 50
initialSize: 20
maxWait: 60000
@ -167,6 +190,7 @@ ignored:
# Swagger界面内容配置
swagger:
<<<<<<< HEAD
title: API接口文档
description: Api Documentation
version: 1.0.0
@ -175,6 +199,16 @@ swagger:
name: rx
url:
email:
=======
title: lilishop API接口文档
description: lilishop Api Documentation
version: 4.2.2
termsOfServiceUrl: https://pickmall.cn
contact:
name: lili
url: https://pickmall.cn
email: admin@pickmall.com
>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
# Mybatis-plus
mybatis-plus:
@ -214,7 +248,11 @@ lili:
#图形验证码有效时间 秒 包含滑块验证码有效时间， 以及验证通过之后，缓存中存储的验证结果有效时间
effectiveTime: 300
#水印
<<<<<<< HEAD
watermark:
=======
watermark: LILI-SHOP
>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
#干扰项数量 最大2 默认0
interfereNum: 1
#允许误差像素
@ -222,6 +260,7 @@ lili:
#短信模版配置
sms:
#登录
<<<<<<< HEAD
LOGIN: SMS_185821482
#注册
REGISTER: SMS_185821482
@ -234,6 +273,20 @@ lili:
system:
isDemoSite: false
isTestModel: false
=======
LOGIN: SMS_205755300
#注册
REGISTER: SMS_205755298
#找回密码
FIND_USER: SMS_205755301
#设置密码
UPDATE_PASSWORD: SMS_205755297
#支付密码
WALLET_PASSWORD: SMS_205755301
system:
isDemoSite: false
isTestModel: true
>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
# 脱敏级别：
# 0：不做脱敏处理
# 1：管理端用户手机号等信息脱敏
@ -251,6 +304,7 @@ lili:
sk: zhNKVrJK6UPOhqIjn8AQvG37b9sz6
#域名
domain:
<<<<<<< HEAD
pc: http://106.124.130.167:8885
wap: http://106.124.130.167:8885
seller: http://106.124.130.167:8885
@ -261,6 +315,18 @@ lili:
base: http://106.124.130.167:8885
manager: http://106.124.130.167:8885
seller: http://106.124.130.167:8885
=======
pc: http://192.168.0.116:8888
wap: http://192.168.0.116:8888
seller: http://192.168.0.116:8888
admin: http://192.168.0.116:8888
#api地址
api:
buyer: https://z171l91606.51mypc.cn
base: http://192.168.0.116:8888
manager: http://192.168.0.116:8888
seller: http://192.168.0.116:8888
>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
# jwt 细节设定
jwt-setting:
@ -279,7 +345,11 @@ lili:
data:
elasticsearch:
cluster-name: elasticsearch
<<<<<<< HEAD
cluster-nodes: 106.124.130.167:9200
=======
cluster-nodes: 192.168.0.116:9200
>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
index:
number-of-replicas: 0
number-of-shards: 3
@ -290,7 +360,11 @@ lili:
# password: LiLiShopES
logstash:
<<<<<<< HEAD
server: 106.124.130.167:4560
=======
server: 192.168.0.116:4560
>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
rocketmq:
promotion-topic: lili_promotion_topic
promotion-group: lili_promotion_group
@ -311,7 +385,11 @@ lili:
after-sale-topic: lili_after_sale_topic
after-sale-group: lili_after_sale_group
rocketmq:
<<<<<<< HEAD
name-server: 106.124.130.167:9876
=======
name-server: 192.168.0.116:9876
>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
isVIPChannel: false
producer:
group: lili_group
@ -320,7 +398,11 @@ rocketmq:
xxl:
job:
admin:
<<<<<<< HEAD
addresses: http://127.0.0.1:9001/xxl-job-admin
=======
addresses: http://192.168.0.116:9001/xxl-job-admin
>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
executor:
appname: xxl-job-executor-lilishop
address:

55
consumer/src/main/resources/application.yml
View File

@ -1,5 +1,9 @@
server:
port: 8886
<<<<<<< HEAD
=======
>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
servlet:
context-path: /
@ -35,9 +39,15 @@ spring:
type: redis
# Redis
redis:
<<<<<<< HEAD
host: 120.71.145.134
port: 6379
password: ekLhvPGraSj8DGO0
=======
host: 127.0.0.1
port: 6379
password: lilishop
>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
lettuce:
pool:
# 连接池最大连接数（使用负值表示没有限制） 默认 8
@ -66,9 +76,15 @@ spring:
default-datasource:
type: com.alibaba.druid.pool.DruidDataSource
driverClassName: com.mysql.cj.jdbc.Driver
<<<<<<< HEAD
url: jdbc:mysql://120.71.183.195:3306/zyt_shop?useUnicode=true&characterEncoding=UTF-8&serverTimezone=UTC&allowPublicKeyRetrieval=true&verifyServerCertificate=false&useSSL=false
username: zyt_shop
password: Gb84505016@zytshop
=======
url: jdbc:mysql://127.0.0.1:3306/lilishop?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
username: root
password: lilishop
>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
maxActive: 20
initialSize: 5
maxWait: 60000
@ -137,8 +153,13 @@ ignored:
- /buyer/memberEvaluation/**/goodsEvaluation
- /buyer/memberEvaluation/**/evaluationNumber
- /store/login/**
<<<<<<< HEAD
- /manager/passport/user/login
- /manager/passport/user/refresh/**
=======
- /manager/user/login
- /manager/user/refresh/**
>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
- /druid/**
- /swagger-ui.html
- /doc.html
@ -155,8 +176,13 @@ ignored:
# Swagger界面内容配置
swagger:
<<<<<<< HEAD
title: API接口文档
description: Api Documentation
=======
title: lili API接口文档
description: lili Api Documentation
>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
version: 1.0.0
termsOfServiceUrl: https://pickmall.cn
contact:
@ -197,7 +223,11 @@ jasypt:
lili:
system:
<<<<<<< HEAD
isDemoSite: false
=======
isDemoSite: true
>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
statistics:
# 在线人数统计 X 小时。这里设置48，即统计过去48小时每小时在线人数
onlineMember: 48
@ -209,6 +239,7 @@ lili:
sk: zhNKVrJK6UPOhqIjn8AQvG37b9sz6
#域名
domain:
<<<<<<< HEAD
pc: https://zbuyer.sx1788.cn
wap: https://zshop.sx1788.cn
store: https://zseller.sx1788.cn
@ -219,6 +250,18 @@ lili:
common: https://zshop-api.sx1788.cn/common-api
manager: https://zshop-api.sx1788.cn/manager-api
store: https://zshop-api.sx1788.cn/seller-api
=======
pc: https://pc.b2b2c.pickmall.cn
wap: https://m.b2b2c.pickmall.cn
store: https://store.b2b2c.pickmall.cn
admin: https://admin.b2b2c.pickmall.cn
#api地址
api:
buyer: https://buyer-api.pickmall.cn
common: https://common-api.pickmall.cn
manager: https://admin-api.pickmall.cn
store: https://store-api.pickmall.cn
>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
# jwt 细节设定
jwt-setting:
@ -237,7 +280,11 @@ lili:
data:
elasticsearch:
cluster-name: elasticsearch
<<<<<<< HEAD
cluster-nodes: 106.124.130.167:9200
=======
cluster-nodes: 127.0.0.1:9200
>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
index:
number-of-replicas: 0
number-of-shards: 3
@ -247,7 +294,11 @@ lili:
# username: elastic
# password: LiLiShopES
logstash:
<<<<<<< HEAD
server: 106.124.130.167:4560
=======
server: 127.0.0.1:4560
>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
rocketmq:
promotion-topic: lili_promotion_topic
promotion-group: lili_promotion_group
@ -268,7 +319,11 @@ lili:
after-sale-topic: lili_after_sale_topic
after-sale-group: lili_after_sale_group
rocketmq:
<<<<<<< HEAD
name-server: 106.124.130.167:9876
=======
name-server: 127.0.0.1:9876
>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
producer:
group: lili_group
send-message-timeout: 30000

3
framework/pom.xml
View File

@ -15,6 +15,7 @@
<packaging>jar</packaging>
<dependencies>
<<<<<<< HEAD
<dependency>
@ -28,6 +29,8 @@
<version>7.4.0</version>
</dependency>
=======
>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-properties-migrator</artifactId>

1
framework/src/main/java/cn/lili/common/properties/VerificationCodeProperties.java
View File

@ -25,7 +25,6 @@ public class VerificationCodeProperties {
* 水印
*/
private String watermark = "";
/**
* 干扰数量 最大数量
*/

3
framework/src/main/java/cn/lili/elasticsearch/BaseElasticsearchService.java
View File

@ -346,8 +346,7 @@ public abstract class BaseElasticsearchService {
" }\n" +
" }\n";
PutMappingRequest request = new PutMappingRequest(index)
.source(source, XContentType.JSON);
PutMappingRequest request = new PutMappingRequest(index).source(source, XContentType.JSON);
CountDownLatch latch = new CountDownLatch(1);
AtomicReference<AcknowledgedResponse> response = new AtomicReference<>();
client.indices().putMappingAsync(

4
framework/src/main/java/cn/lili/modules/connect/config/AuthConfig.java
View File

@ -77,7 +77,11 @@ public class AuthConfig {
/**
* 针对国外服务可以单独设置代理
* HttpConfig config = new HttpConfig();
<<<<<<< HEAD
* config.setProxy(new Proxy(Proxy.Type.HTTP, new InetSocketAddress("106.124.130.167", 10080)));
=======
* config.setProxy(new Proxy(Proxy.Type.HTTP, new InetSocketAddress("127.0.0.1", 10080)));
>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
* config.setTimeout(15000);
*
* @since 1.15.5

3
framework/src/main/java/cn/lili/modules/file/serviceimpl/FileServiceImpl.java
View File

@ -4,9 +4,7 @@ import cn.hutool.core.text.CharSequenceUtil;
import cn.lili.common.enums.ResultCode;
import cn.lili.common.exception.ServiceException;
import cn.lili.common.security.AuthUser;
import cn.lili.modules.file.plugin.QiNiuManagerPlugin;
import cn.lili.mybatis.util.PageUtil;
import cn.lili.common.utils.StringUtils;
import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.SearchVO;
import cn.lili.modules.file.entity.File;
@ -14,7 +12,6 @@ import cn.lili.modules.file.entity.dto.FileOwnerDTO;
import cn.lili.modules.file.mapper.FileMapper;
import cn.lili.modules.file.plugin.FileManagerPlugin;
import cn.lili.modules.file.service.FileService;
import cn.lili.mybatis.util.PageUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

2
framework/src/main/java/cn/lili/modules/goods/entity/dos/Goods.java
View File

@ -275,4 +275,4 @@ public class Goods extends BaseEntity {
return mobileIntro;
}
}
}

2
framework/src/main/java/cn/lili/modules/goods/service/GoodsService.java
View File

@ -190,4 +190,4 @@ public interface GoodsService extends IService<Goods> {
*/
long countStoreGoodsNum(String storeId);
}
}

2
framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsServiceImpl.java
View File

@ -666,4 +666,4 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
return queryWrapper;
}
}
}

1
framework/src/main/java/cn/lili/modules/member/entity/vo/MemberVO.java
View File

@ -32,6 +32,7 @@ public class MemberVO implements Serializable {
private String username;
@ApiModelProperty(value = "昵称")
private String nickName;
@ApiModelProperty(value = "会员性别,1为男，0为女")

3
framework/src/main/java/cn/lili/modules/member/mapper/FootprintMapper.java
View File

@ -34,7 +34,8 @@ public interface FootprintMapper extends BaseMapper<FootPrint> {
*
* @param memberId 会员ID
*/
@Delete("DELETE FROM li_foot_print WHERE id IN (" +
@Delete("DELETE FROM li_foot_print WHERE id IN ("+
"SELECT l2.id FROM (" +
"SELECT l3.id FROM li_foot_print l3 WHERE l3.member_id=${memberId} ORDER BY id DESC LIMIT 100,100) l2)")
void deleteLastFootPrint(String memberId);

3
framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java
View File

@ -624,8 +624,7 @@ public class MemberServiceImpl extends ServiceImpl<MemberMapper, Member> impleme
*/
private void checkMember(String userName, String mobilePhone) {
//判断手机号是否存在
Long aa = findMember(userName, mobilePhone);
if (aa > 0) {
if (findMember(userName, mobilePhone) > 0) {
throw new ServiceException(ResultCode.USER_EXIST);
}
}

37
framework/src/main/java/cn/lili/modules/page/serviceimpl/PageDataServiceImpl.java
View File

@ -1,10 +1,14 @@
package cn.lili.modules.page.serviceimpl;
import cn.hutool.core.text.CharSequenceUtil;
import cn.hutool.core.util.StrUtil;
import cn.lili.common.enums.ClientTypeEnum;
import cn.lili.common.enums.ResultCode;
import cn.lili.common.enums.SwitchEnum;
import cn.lili.common.exception.ServiceException;
import cn.lili.common.properties.SystemSettingProperties;
import cn.lili.common.security.context.UserContext;
import cn.lili.common.security.enums.UserEnums;
import cn.lili.common.vo.PageVO;
import cn.lili.modules.page.entity.dos.PageData;
import cn.lili.modules.page.entity.dto.PageDataDTO;
@ -14,6 +18,7 @@ import cn.lili.modules.page.entity.vos.PageDataVO;
import cn.lili.modules.page.mapper.PageDataMapper;
import cn.lili.modules.page.service.PageDataService;
import cn.lili.mybatis.util.PageUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@ -60,9 +65,9 @@ public class PageDataServiceImpl extends ServiceImpl<PageDataMapper, PageData> i
@Transactional(rollbackFor = Exception.class)
public PageData addPageData(PageData pageData) {
//如果页面为发布，则关闭其他页面，开启此页面
//演示站点不可以开启楼层
if (!Boolean.TRUE.equals(systemSettingProperties.getIsDemoSite()) && pageData.getPageShow().equals(SwitchEnum.OPEN.name())) {
if (pageData.getPageShow().equals(SwitchEnum.OPEN.name())) {
LambdaUpdateWrapper<PageData> lambdaUpdateWrapper = Wrappers.lambdaUpdate();
lambdaUpdateWrapper.eq(CharSequenceUtil.equals(UserContext.getCurrentUser().getRole().name(), UserEnums.STORE.name()),PageData::getNum,UserContext.getCurrentUser().getStoreId());
lambdaUpdateWrapper.eq(PageData::getPageType, pageData.getPageType());
lambdaUpdateWrapper.eq(PageData::getPageClientType, pageData.getPageClientType());
lambdaUpdateWrapper.set(PageData::getPageShow, SwitchEnum.CLOSE.name());
@ -70,7 +75,6 @@ public class PageDataServiceImpl extends ServiceImpl<PageDataMapper, PageData> i
} else {
pageData.setPageShow(SwitchEnum.CLOSE.name());
}
pageData.setPageData(pageData.getPageData().replace("?x-oss-process=style/200X200", "").replace("?x-oss-process=style/400X400", ""));
this.save(pageData);
return pageData;
}
@ -78,21 +82,24 @@ public class PageDataServiceImpl extends ServiceImpl<PageDataMapper, PageData> i
@Override
@Transactional(rollbackFor = Exception.class)
public PageData updatePageData(PageData pageData) {
//如果页面为发布，则关闭其他页面，开启此页面
if (pageData.getPageShow() != null && pageData.getPageShow().equals(SwitchEnum.OPEN.name())) {
LambdaUpdateWrapper<PageData> lambdaUpdateWrapper = Wrappers.lambdaUpdate();
lambdaUpdateWrapper.eq(PageData::getPageType, pageData.getPageType());
lambdaUpdateWrapper.eq(PageData::getPageClientType, pageData.getPageClientType());
lambdaUpdateWrapper.set(PageData::getPageShow, SwitchEnum.CLOSE.name());
lambdaUpdateWrapper.set(StrUtil.isNotEmpty(pageData.getNum()), PageData::getNum, SwitchEnum.CLOSE.name());
this.update(lambdaUpdateWrapper);
} else {
pageData.setPageShow(SwitchEnum.CLOSE.name());
}
LambdaUpdateWrapper<PageData> lambdaUpdateWrapper = Wrappers.lambdaUpdate();
String dataPage = pageData.getPageData().replace("?x-oss-process=style/200X200", "").replace("?x-oss-process=style/400X400", "");
lambdaUpdateWrapper.set(PageData::getPageData,dataPage);
lambdaUpdateWrapper.set(PageData::getPageData, pageData.getPageData());
lambdaUpdateWrapper.eq(PageData::getId, pageData.getId());
pageData.setPageData(dataPage);
lambdaUpdateWrapper.eq(CharSequenceUtil.equals(UserContext.getCurrentUser().getRole().name(), UserEnums.STORE.name()),PageData::getPageType,PageEnum.STORE.name());
lambdaUpdateWrapper.eq(CharSequenceUtil.equals(UserContext.getCurrentUser().getRole().name(), UserEnums.STORE.name()),PageData::getNum,UserContext.getCurrentUser().getStoreId());
this.updateById(pageData);
return pageData;
}
@ -100,8 +107,13 @@ public class PageDataServiceImpl extends ServiceImpl<PageDataMapper, PageData> i
@Override
@Transactional(rollbackFor = Exception.class)
public PageData releasePageData(String id) {
PageData pageData = this.getById(id);
PageData pageData = this.getOne(new LambdaQueryWrapper<PageData>()
.eq(CharSequenceUtil.equals(UserContext.getCurrentUser().getRole().name(), UserEnums.STORE.name()),PageData::getPageType,PageEnum.STORE.name())
.eq(CharSequenceUtil.equals(UserContext.getCurrentUser().getRole().name(), UserEnums.STORE.name()),PageData::getNum,UserContext.getCurrentUser().getStoreId())
.eq(PageData::getId,id));
if(pageData==null){
throw new ServiceException(ResultCode.PAGE_NOT_EXIST);
}
//如果已经发布，不能重复发布
if (pageData.getPageShow().equals(SwitchEnum.OPEN.name())) {
@ -130,7 +142,14 @@ public class PageDataServiceImpl extends ServiceImpl<PageDataMapper, PageData> i
@Override
@Transactional(rollbackFor = Exception.class)
public boolean removePageData(String id) {
PageData pageData = this.getById(id);
PageData pageData = this.getOne(new LambdaQueryWrapper<PageData>()
.eq(CharSequenceUtil.equals(UserContext.getCurrentUser().getRole().name(), UserEnums.STORE.name()),PageData::getPageType,PageEnum.STORE.name())
.eq(CharSequenceUtil.equals(UserContext.getCurrentUser().getRole().name(), UserEnums.STORE.name()),PageData::getNum,UserContext.getCurrentUser().getStoreId())
.eq(PageData::getId,id));
if(pageData==null){
throw new ServiceException(ResultCode.PAGE_NOT_EXIST);
}
//专题则直接进行删除
if (pageData.getPageType().equals(PageEnum.SPECIAL.name())) {
return this.removeById(id);

2
framework/src/main/java/cn/lili/modules/payment/kit/core/XmlHelper.java
View File

@ -246,4 +246,4 @@ public class XmlHelper {
private static XPathFactory xPathFactory = XPathFactory.newInstance();
}
}
}

2
framework/src/main/java/cn/lili/modules/promotion/service/SeckillApplyService.java
View File

@ -97,7 +97,6 @@ public interface SeckillApplyService extends IService<SeckillApply> {
* @param quantity 库存
*/
void updateSeckillApplyQuantity(String seckillId, String skuId, Integer quantity);
/**
* 更新秒杀活动时间
*
@ -105,5 +104,4 @@ public interface SeckillApplyService extends IService<SeckillApply> {
* @return 是否更新成功
*/
boolean updateSeckillApplyTime(Seckill seckill);
}

3
framework/src/main/java/cn/lili/modules/promotion/serviceimpl/SeckillApplyServiceImpl.java
View File

@ -246,6 +246,7 @@ public class SeckillApplyServiceImpl extends ServiceImpl<SeckillApplyMapper, Sec
}
/**
<<<<<<< HEAD
* 更新秒杀活动时间
*
* @param seckill 秒杀活动
@ -281,6 +282,8 @@ public class SeckillApplyServiceImpl extends ServiceImpl<SeckillApplyMapper, Sec
}
/**
=======
>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
* 检查秒杀活动申请列表参数信息
*
* @param hours 秒杀活动时间段

1
framework/src/main/java/cn/lili/modules/promotion/serviceimpl/SeckillServiceImpl.java
View File

@ -132,6 +132,7 @@ public class SeckillServiceImpl extends AbstractPromotionsServiceImpl<SeckillMap
}
/**
<<<<<<< HEAD
* 通用促销更新
* 调用顺序:
* 1. checkStatus 检查促销状态

3
framework/src/main/java/cn/lili/modules/store/entity/dos/Store.java
View File

@ -97,10 +97,11 @@ public class Store extends BaseEntity {
@ApiModelProperty(value = "腾讯云智服小程序唯一标识")
private String yzfMpSign;
@ApiModelProperty(value = "udesk IM标识")
private String merchantEuid;
@ApiModelProperty(value = "默认页面是否开启")
private Boolean pageShow;
public Store(Member member) {
this.memberId = member.getId();

1
framework/src/main/java/cn/lili/modules/store/entity/dos/StoreDetail.java
View File

@ -184,7 +184,6 @@ public class StoreDetail extends BaseIdEntity {
@ApiModelProperty(value = "福禄appKEY商户key")
private String appMerchantKey;
public StoreDetail(Store store, AdminStoreApplyDTO adminStoreApplyDTO) {
this.storeId = store.getId();
//设置店铺公司信息、设置店铺银行信息、设置店铺其他信息

3
framework/src/main/java/cn/lili/modules/store/entity/dto/StoreSettingDTO.java
View File

@ -33,4 +33,7 @@ public class StoreSettingDTO {
@ApiModelProperty(value = "经纬度")
private String storeCenter;
@ApiModelProperty(value = "默认页面是否开启")
private Boolean pageShow;
}

3
framework/src/main/java/cn/lili/modules/store/entity/vos/StoreBasicInfoVO.java
View File

@ -58,4 +58,7 @@ public class StoreBasicInfoVO {
@ApiModelProperty(value = "udesk标识")
private String merchantEuid;
@ApiModelProperty
private String pageShow;
}

2
framework/src/main/java/cn/lili/modules/store/mapper/StoreDetailMapper.java
View File

@ -61,7 +61,6 @@ public interface StoreDetailMapper extends BaseMapper<StoreDetail> {
"from li_store_detail s where s.store_id=#{storeId}")
StoreAfterSaleAddressDTO getStoreAfterSaleAddressDTO(String storeId);
/**
* 获取店铺福禄配置DTO
*
@ -71,7 +70,6 @@ public interface StoreDetailMapper extends BaseMapper<StoreDetail> {
@Select("select s.app_secret_key,s.merchant_number,s.app_merchant_key from li_store_detail s where s.store_id =#{storeId}")
FuLuConfigureDTO getFuLuConfigureDTO(String storeId);
/**
* 获取待结算店铺列表
*

4
framework/src/main/java/cn/lili/modules/store/service/StoreDetailService.java
View File

@ -76,6 +76,7 @@ public interface StoreDetailService extends IService<StoreDetail> {
* @return 店铺福禄配置
*/
FuLuConfigureDTO getFuLuConfigureDTO();
/**
* 获取某一个店铺的退货收件地址信息
*
@ -93,6 +94,7 @@ public interface StoreDetailService extends IService<StoreDetail> {
boolean editStoreAfterSaleAddressDTO(StoreAfterSaleAddressDTO storeAfterSaleAddressDTO);
/**
<<<<<<< HEAD
* 修改当前登录店铺福禄配置
*
* @param fuLuConfigureDTO 店铺福禄配置DTO
@ -101,6 +103,8 @@ public interface StoreDetailService extends IService<StoreDetail> {
boolean editFuLuConfigureDTO(FuLuConfigureDTO fuLuConfigureDTO);
/**
=======
>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
* 修改店铺库存预警数量
*
* @param stockWarning 库存预警数量

6
framework/src/main/java/cn/lili/modules/system/entity/enums/SettingEnum.java
View File

@ -21,13 +21,9 @@ public enum SettingEnum {
KUAIDI_SETTING,
//订单配置
ORDER_SETTING,
//阿里OSS配置
OSS_SETTING,
//阿里短信配置
//阿里短信配置
SMS_SETTING,
//积分设置
POINT_SETTING,

1
framework/src/main/java/cn/lili/modules/verification/service/impl/VerificationSourceServiceImpl.java
View File

@ -1,6 +1,5 @@
package cn.lili.modules.verification.service.impl;
import cn.hutool.core.util.StrUtil;
import cn.lili.cache.Cache;
import cn.lili.modules.system.mapper.VerificationSourceMapper;
import cn.lili.modules.verification.entity.dos.VerificationSource;

46
manager-api/src/main/resources/application.yml
View File

@ -33,9 +33,15 @@ spring:
type: redis
# Redis
redis:
<<<<<<< HEAD
host: 120.71.145.134
port: 6379
password: ekLhvPGraSj8DGO0
=======
host: 127.0.0.1
port: 6379
password: lilishop
>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
lettuce:
pool:
# 连接池最大连接数（使用负值表示没有限制） 默认 8
@ -64,9 +70,15 @@ spring:
default-datasource:
type: com.alibaba.druid.pool.DruidDataSource
driverClassName: com.mysql.cj.jdbc.Driver
<<<<<<< HEAD
url: jdbc:mysql://120.71.183.195:3306/zyt_shop?useUnicode=true&characterEncoding=UTF-8&serverTimezone=UTC&allowPublicKeyRetrieval=true&verifyServerCertificate=false&useSSL=false
username: zyt_shop
password: Gb84505016@zytshop
=======
url: jdbc:mysql://127.0.0.1:3306/lilishop?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
username: root
password: lilishop
>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
maxActive: 20
initialSize: 5
maxWait: 60000
@ -139,8 +151,13 @@ ignored:
# Swagger界面内容配置
swagger:
<<<<<<< HEAD
title: API接口文档
description: Api Documentation
=======
title: lili API接口文档
description: lili Api Documentation
>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
version: 1.0.0
termsOfServiceUrl: https://pickmall.cn
contact:
@ -181,7 +198,11 @@ jasypt:
lili:
system:
<<<<<<< HEAD
isDemoSite: false
=======
isDemoSite: true
>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
# 脱敏级别：
# 0：不做脱敏处理
# 1：管理端用户手机号等信息脱敏
@ -198,6 +219,7 @@ lili:
sk: zhNKVrJK6UPOhqIjn8AQvG37b9sz6
#域名
domain:
<<<<<<< HEAD
pc: https://zbuyer.sx1788.cn
wap: https://zshop.sx1788.cn
store: https://zseller.sx1788.cn
@ -208,6 +230,18 @@ lili:
common: https://zshop-api.sx1788.cn/common-api
manager: https://zshop-api.sx1788.cn/manager-api
store: https://zshop-api.sx1788.cn/seller-api
=======
pc: https://pc.b2b2c.pickmall.cn
wap: https://m.b2b2c.pickmall.cn
store: https://store.b2b2c.pickmall.cn
admin: https://admin.b2b2c.pickmall.cn
#api地址
api:
buyer: https://buyer-api.pickmall.cn
common: https://common-api.pickmall.cn
manager: https://admin-api.pickmall.cn
store: https://store-api.pickmall.cn
>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
# jwt 细节设定
jwt-setting:
@ -226,7 +260,11 @@ lili:
data:
elasticsearch:
cluster-name: elasticsearch
<<<<<<< HEAD
cluster-nodes: 106.124.130.167:9200
=======
cluster-nodes: 127.0.0.1:9200
>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
index:
number-of-replicas: 0
number-of-shards: 3
@ -236,7 +274,11 @@ lili:
# username: elastic
# password: LiLiShopES
logstash:
<<<<<<< HEAD
server: 106.124.130.167:4560
=======
server: 127.0.0.1:4560
>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
rocketmq:
promotion-topic: lili_promotion_topic
promotion-group: lili_promotion_group
@ -257,7 +299,11 @@ lili:
after-sale-topic: lili_after_sale_topic
after-sale-group: lili_after_sale_group
rocketmq:
<<<<<<< HEAD
name-server: 106.124.130.167:9876
=======
name-server: 127.0.0.1:9876
>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
producer:
group: lili_group
send-message-timeout: 30000

4
pom.xml
View File

@ -18,7 +18,11 @@
<properties>
<java.version>1.8</java.version>
<<<<<<< HEAD
<revision>4.3.0</revision>
=======
<revision>4.2.4</revision>
>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<skipTests>true</skipTests>

4
seller-api/src/main/java/cn/lili/controller/goods/GoodsStoreController.java
View File

@ -22,6 +22,7 @@ import cn.lili.modules.store.entity.dto.FuLuConfigureDTO;
import cn.lili.modules.store.service.StoreDetailService;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import cn.lili.modules.store.service.StoreDetailService;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;
@ -33,6 +34,8 @@ import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import java.util.*;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
/**
@ -278,5 +281,4 @@ public class GoodsStoreController {
return ResultUtil.success();
}
}

98
seller-api/src/main/java/cn/lili/controller/other/PageDataStoreController.java Normal file
View File

@ -0,0 +1,98 @@
package cn.lili.controller.other;
import cn.lili.common.aop.annotation.DemoSite;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.security.context.UserContext;
import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.page.entity.dos.PageData;
import cn.lili.modules.page.entity.dto.PageDataDTO;
import cn.lili.modules.page.entity.enums.PageEnum;
import cn.lili.modules.page.entity.vos.PageDataListVO;
import cn.lili.modules.page.service.PageDataService;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import javax.validation.constraints.NotNull;
/**
* 店铺端,页面设置管理接口
*
* @author paulGao
* @since 2020-05-06 15:18:56
*/
@RestController
@Api(tags = "店铺端,页面设置管理接口")
@RequestMapping("/store/other/pageData")
public class PageDataStoreController {
@Autowired
private PageDataService pageDataService;
@ApiOperation(value = "获取页面信息")
@ApiImplicitParam(name = "id", value = "页面ID", required = true, dataType = "String", paramType = "path")
@GetMapping(value = "/{id}")
public ResultMessage<PageData> getPageData(@PathVariable String id) {
//查询当前店铺下的页面数据
PageData pageData = pageDataService.getOne(
new LambdaQueryWrapper<PageData>()
.eq(PageData::getPageType, PageEnum.STORE.name())
.eq(PageData::getNum, UserContext.getCurrentUser().getStoreId())
.eq(PageData::getId, id));
return ResultUtil.data(pageData);
}
@ApiOperation(value = "添加页面")
@PostMapping("/add")
public ResultMessage<PageData> addPageData(@Valid PageData pageData) {
//添加店铺类型，填写店铺ID
pageData.setPageType(PageEnum.STORE.name());
pageData.setNum(UserContext.getCurrentUser().getStoreId());
return ResultUtil.data(pageDataService.addPageData(pageData));
}
@ApiOperation(value = "修改页面")
@ApiImplicitParams({
@ApiImplicitParam(name = "id", value = "页面ID", required = true, dataType = "String", paramType = "path")
})
@DemoSite
@PutMapping("/update/{id}")
public ResultMessage<PageData> updatePageData(@Valid PageData pageData, @NotNull @PathVariable String id) {
pageData.setId(id);
//添加店铺类型，填写店铺ID
pageData.setPageType(PageEnum.STORE.name());
pageData.setNum(UserContext.getCurrentUser().getStoreId());
return ResultUtil.data(pageDataService.updatePageData(pageData));
}
@ApiOperation(value = "页面列表")
@GetMapping("/pageDataList")
public ResultMessage<IPage<PageDataListVO>> pageDataList(PageVO pageVO, PageDataDTO pageDataDTO) {
pageDataDTO.setPageType(PageEnum.STORE.name());
pageDataDTO.setNum(UserContext.getCurrentUser().getStoreId());
return ResultUtil.data(pageDataService.getPageDataList(pageVO, pageDataDTO));
}
@ApiOperation(value = "发布页面")
@ApiImplicitParam(name = "id", value = "页面ID", required = true, dataType = "String", paramType = "path")
@PutMapping("/release/{id}")
@DemoSite
public ResultMessage<PageData> release(@PathVariable String id) {
return ResultUtil.data(pageDataService.releasePageData(id));
}
@ApiOperation(value = "删除页面")
@DemoSite
@ApiImplicitParam(name = "id", value = "页面ID", required = true, dataType = "String", paramType = "path")
@DeleteMapping("/remove/{id}")
public ResultMessage<Object> remove(@PathVariable String id) {
return ResultUtil.data(pageDataService.removePageData(id));
}
}

56
seller-api/src/main/resources/application.yml
View File

@ -33,9 +33,15 @@ spring:
type: redis
# Redis
redis:
<<<<<<< HEAD
host: 120.71.145.134
port: 6379
password: ekLhvPGraSj8DGO0
=======
host: 127.0.0.1
port: 6379
password: lilishop
>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
lettuce:
pool:
# 连接池最大连接数（使用负值表示没有限制） 默认 8
@ -64,9 +70,15 @@ spring:
default-datasource:
type: com.alibaba.druid.pool.DruidDataSource
driverClassName: com.mysql.cj.jdbc.Driver
<<<<<<< HEAD
url: jdbc:mysql://120.71.183.195:3306/zyt_shop?useUnicode=true&characterEncoding=UTF-8&serverTimezone=UTC&allowPublicKeyRetrieval=true&verifyServerCertificate=false&useSSL=false
username: zyt_shop
password: Gb84505016@zytshop
=======
url: jdbc:mysql://127.0.0.1:3306/lilishop?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
username: root
password: lilishop
>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
maxActive: 20
initialSize: 5
maxWait: 60000
@ -108,7 +120,11 @@ spring:
props:
#是否打印逻辑SQL语句和实际SQL语句，建议调试时打印，在生产环境关闭
sql:
<<<<<<< HEAD
show: true
=======
show: false
>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
# 忽略鉴权url
ignored:
@ -137,6 +153,7 @@ ignored:
# Swagger界面内容配置
swagger:
<<<<<<< HEAD
title: API接口文档
description: Api Documentation
version: 1.0.0
@ -145,6 +162,16 @@ swagger:
name: rx
url:
email:
=======
title: lili API接口文档
description: lili Api Documentation
version: 1.0.0
termsOfServiceUrl: https://pickmall.cn
contact:
name: lili
url: https://pickmall.cn
email: admin@pickmall.com
>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
# Mybatis-plus
mybatis-plus:
@ -179,7 +206,11 @@ jasypt:
lili:
system:
<<<<<<< HEAD
isDemoSite: false
=======
isDemoSite: true
>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
statistics:
# 在线人数统计 X 小时。这里设置48，即统计过去48小时每小时在线人数
onlineMember: 48
@ -191,6 +222,7 @@ lili:
sk: zhNKVrJK6UPOhqIjn8AQvG37b9sz6
#域名
domain:
<<<<<<< HEAD
pc: https://zbuyer.sx1788.cn
wap: https://zshop.sx1788.cn
store: https://zseller.sx1788.cn
@ -201,6 +233,18 @@ lili:
common: https://zshop-api.sx1788.cn/common-api
manager: https://zshop-api.sx1788.cn/manager-api
store: https://zshop-api.sx1788.cn/seller-api
=======
pc: https://pc.b2b2c.pickmall.cn
wap: https://m.b2b2c.pickmall.cn
store: https://store.b2b2c.pickmall.cn
admin: https://admin.b2b2c.pickmall.cn
#api地址
api:
buyer: https://buyer-api.pickmall.cn
common: https://common-api.pickmall.cn
manager: https://admin-api.pickmall.cn
store: https://store-api.pickmall.cn
>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
# jwt 细节设定
jwt-setting:
@ -219,7 +263,11 @@ lili:
data:
elasticsearch:
cluster-name: elasticsearch
<<<<<<< HEAD
cluster-nodes: 106.124.130.167:9200
=======
cluster-nodes: 127.0.0.1:9200
>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
index:
number-of-replicas: 0
number-of-shards: 3
@ -229,7 +277,11 @@ lili:
# username: elastic
# password: LiLiShopES
logstash:
<<<<<<< HEAD
server: 106.124.130.167:4560
=======
server: 127.0.0.1:4560
>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
rocketmq:
promotion-topic: lili_promotion_topic
promotion-group: lili_promotion_group
@ -250,7 +302,11 @@ lili:
after-sale-topic: lili_after_sale_topic
after-sale-group: lili_after_sale_group
rocketmq:
<<<<<<< HEAD
name-server: 106.124.130.167:9876
=======
name-server: 127.0.0.1:9876
>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
producer:
group: lili_group
send-message-timeout: 30000

37
xxl-job/XXLJOB-README.md
View File

@ -1,3 +1,40 @@
<<<<<<< HEAD
=======
<p align="center" >
<img src="https://www.xuxueli.com/doc/static/xxl-job/images/xxl-logo.jpg" width="150">
<h3 align="center">XXL-JOB</h3>
<p align="center">
XXL-JOB, a distributed task scheduling framework.
<br>
<a href="https://www.xuxueli.com/xxl-job/"><strong>-- Home Page --</strong></a>
<br>
<br>
<a href="https://github.com/xuxueli/xxl-job/actions">
<img src="https://github.com/xuxueli/xxl-job/workflows/Java%20CI/badge.svg" >
</a>
<a href="https://maven-badges.herokuapp.com/maven-central/com.xuxueli/xxl-job/">
<img src="https://maven-badges.herokuapp.com/maven-central/com.xuxueli/xxl-job/badge.svg" >
</a>
<a href="https://github.com/xuxueli/xxl-job/releases">
<img src="https://img.shields.io/github/release/xuxueli/xxl-job.svg" >
</a>
<a href="https://github.com/xuxueli/xxl-job/">
<img src="https://img.shields.io/github/stars/xuxueli/xxl-job" >
</a>
<a href="https://hub.docker.com/r/xuxueli/xxl-job-admin/">
<img src="https://img.shields.io/docker/pulls/xuxueli/xxl-job-admin" >
</a>
<a href="http://www.gnu.org/licenses/gpl-3.0.html">
<img src="https://img.shields.io/badge/license-GPLv3-blue.svg" >
</a>
<a href="https://www.xuxueli.com/page/donate.html">
<img src="https://img.shields.io/badge/%24-donate-ff69b4.svg?style=flat" >
</a>
</p>
</p>
>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
## Introduction
XXL-JOB is a distributed task scheduling framework.
It's core design goal is to develop quickly and learn simple, lightweight, and easy to expand.

6
xxl-job/application.properties
View File

@ -23,9 +23,15 @@ mybatis.mapper-locations=classpath:/mybatis-mapper/*Mapper.xml
#mybatis.type-aliases-package=com.xxl.job.admin.core.model
### xxl-job, datasource
<<<<<<< HEAD
spring.datasource.url=jdbc:mysql://120.71.183.195:3306/zyt_shop/xxl_job?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&serverTimezone=Asia/Shanghai
spring.datasource.username=zyt_shop
spring.datasource.password=Gb84505016@zytshop
=======
spring.datasource.url=jdbc:mysql://192.168.0.106:3306/xxl_job?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&serverTimezone=Asia/Shanghai
spring.datasource.username=root
spring.datasource.password=lilishop
>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
### datasource-pool