From b855cfb5f8dcd4dd643503226d31451c6c900458 Mon Sep 17 00:00:00 2001 From: Chopper Date: Wed, 26 May 2021 09:27:27 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E7=A7=AF=E5=88=86=E5=95=86=E5=93=81?= =?UTF-8?q?=E5=BA=97=E9=93=BA=E5=90=8D=E7=A7=B0=E9=97=AE=E9=A2=98=E5=A4=84?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lili/controller/promotion/PointsGoodsManagerController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manager-api/src/main/java/cn/lili/controller/promotion/PointsGoodsManagerController.java b/manager-api/src/main/java/cn/lili/controller/promotion/PointsGoodsManagerController.java index a69a9a05..e7b2b59c 100644 --- a/manager-api/src/main/java/cn/lili/controller/promotion/PointsGoodsManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/promotion/PointsGoodsManagerController.java @@ -39,7 +39,7 @@ public class PointsGoodsManagerController { AuthUser currentUser = UserContext.getCurrentUser(); List collect = new ArrayList<>(); for (PointsGoodsVO i : pointsGoodsList) { - i.setStoreName("platform"); + i.setStoreName(i.getGoodsSku().getStoreName()); i.setStoreId(currentUser.getId()); collect.add(i); } From f82fef9f3d1c6002562318a2bf9c10e5c2450602 Mon Sep 17 00:00:00 2001 From: Chopper Date: Wed, 26 May 2021 09:28:52 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E6=8E=88=E6=9D=83=E8=BF=94=E5=9B=9E=20read?= =?UTF-8?q?me=20=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 -- .../java/cn/lili/controller/common/UploadController.java | 9 +++++++++ common-api/src/main/resources/application.yml | 1 + .../java/cn/lili/config/properties/SystemSetting.java | 6 ++++++ 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 7e483913..68796c5a 100644 --- a/README.md +++ b/README.md @@ -118,8 +118,6 @@ PS:单独部署的话，数据库文件访问这里：https://gitee.com/beijing_ #### 移动端 -管理端功能展示 - 移动端功能展示 diff --git a/common-api/src/main/java/cn/lili/controller/common/UploadController.java b/common-api/src/main/java/cn/lili/controller/common/UploadController.java index 499e1787..7f6d05cd 100644 --- a/common-api/src/main/java/cn/lili/controller/common/UploadController.java +++ b/common-api/src/main/java/cn/lili/controller/common/UploadController.java @@ -12,6 +12,7 @@ import cn.lili.common.utils.CommonUtil; import cn.lili.common.enums.ResultUtil; import cn.lili.common.utils.StringUtils; import cn.lili.common.vo.ResultMessage; +import cn.lili.config.properties.SystemSetting; import cn.lili.modules.file.entity.File; import cn.lili.modules.file.plugin.FileManagerPlugin; import cn.lili.modules.file.service.FileService; @@ -51,6 +52,9 @@ public class UploadController { @Autowired private Cache cache; + @Autowired + private SystemSetting systemSetting; + @ApiOperation(value = "文件上传") @PostMapping(value = "/file") public ResultMessage upload(MultipartFile file, @@ -102,4 +106,9 @@ public class UploadController { } + @ApiOperation(value = "返回licences") + @PostMapping(value = "/licences") + public ResultMessage licences() { + return ResultUtil.data(systemSetting.getLicences()); + } } diff --git a/common-api/src/main/resources/application.yml b/common-api/src/main/resources/application.yml index 50b9a813..307a502e 100644 --- a/common-api/src/main/resources/application.yml +++ b/common-api/src/main/resources/application.yml @@ -214,6 +214,7 @@ jasypt: lili: system: isDemoSite: true + licences: 'temporary' statistics: # 在线人数统计 X 小时。这里设置48，即统计过去48小时每小时在线人数 onlineMember: 48 diff --git a/framework/src/main/java/cn/lili/config/properties/SystemSetting.java b/framework/src/main/java/cn/lili/config/properties/SystemSetting.java index 0e658f47..955ff058 100644 --- a/framework/src/main/java/cn/lili/config/properties/SystemSetting.java +++ b/framework/src/main/java/cn/lili/config/properties/SystemSetting.java @@ -6,6 +6,7 @@ import org.springframework.context.annotation.Configuration; /** * 系统设置 + * * @author Chopper */ @Data @@ -18,4 +19,9 @@ public class SystemSetting { * 是否是演示站点 */ private Boolean isDemoSite = false; + + /** + * 授权信息 + */ + private String licences = ""; } From 5b5681d748c594d745e8ad8a064e14ecef1c8c0e Mon Sep 17 00:00:00 2001 From: lifenlong Date: Wed, 26 May 2021 17:57:51 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E6=94=AF=E6=8C=81=E7=9F=AD=E4=BF=A1?= =?UTF-8?q?=E9=AA=8C=E8=AF=81=E7=A0=81=E7=99=BB=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lili/controller/passport/MemberBuyerController.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/buyer-api/src/main/java/cn/lili/controller/passport/MemberBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/passport/MemberBuyerController.java index ecb824d0..d909135c 100644 --- a/buyer-api/src/main/java/cn/lili/controller/passport/MemberBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/passport/MemberBuyerController.java @@ -63,11 +63,11 @@ public class MemberBuyerController { public ResultMessage smsLogin(@NotNull(message = "手机号为空") @RequestParam String mobile, @NotNull(message = "验证码为空") @RequestParam String code, @RequestHeader String uuid) { -// if(smsUtil.verifyCode(mobile,VerificationEnums.LOGIN,uuid,code)){ + if(smsUtil.verifyCode(mobile,VerificationEnums.LOGIN,uuid,code)){ return ResultUtil.data(memberService.mobilePhoneLogin(mobile)); -// }else { -// throw new ServiceException("验证码错误"); -// } + }else { + throw new ServiceException("验证码错误"); + } } @ApiOperation(value = "注册用户") From fb93625c601d009fad07f295960aff06593a7943 Mon Sep 17 00:00:00 2001 From: Chopper Date: Thu, 27 May 2021 11:38:55 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=E5=AE=89=E8=A3=85=E6=96=87=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 68796c5a..7aec7aae 100644 --- a/README.md +++ b/README.md @@ -62,8 +62,32 @@ Lilishop 是一款Java开发，基于SpringBoot研发的B2B2C多用户商城， 温馨提示：由于服务较多，如果笔记本环境启动内存没有32g可能无法启动成功（macbookpro 2020 16g内存启动无法成功），台式机在16g内存、AMD 3700x 的ubuntu系统成功运行。 -##### 下载docker脚本 + + +##### docker环境安装（已安装的用户可跳过） +```shell +#安装依赖 +sudo yum install -y yum-utils device-mapper-persistent-data lvm2 +#设置源 +sudo yum-config-manager --add-repo http://mirrors.aliyun.com/docker-ce/linux/centos/docker-ce.repo +sudo yum makecache fast +#安装docker +sudo yum install docker-ce +#启动服务 +sudo systemctl start docker +#安装docker-compose +sudo curl -L https://github.com/docker/compose/releases/download/1.21.2/docker-compose-$(uname -s)-$(uname -m) -o /usr/local/bin/docker-compose +#授权 +sudo chmod +x /usr/local/bin/docker-compose +#检测版本号 +docker-compose -v +``` + + + +##### 下载docker-compose脚本 `git clone https://gitee.com/beijing_hongye_huicheng/docker.git ` + ##### 部署基础环境 `docker-compose up -d` From 5b162d0f8c1e4693c9960725b437373274420bf1 Mon Sep 17 00:00:00 2001 From: Chopper Date: Mon, 31 May 2021 11:47:44 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E5=A2=9E=E5=8A=A0star=E6=A0=87=E8=AE=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 7aec7aae..afd4c9c5 100644 --- a/README.md +++ b/README.md @@ -5,6 +5,8 @@ [![star](https://gitee.com/beijing_hongye_huicheng/lilishop/badge/star.svg?theme=dark)](https://gitee.com/beijing_hongye_huicheng/lilishop/stargazers) +![github](https://img.shields.io/github/stars/hongyehuicheng/lilishop.svg?style=social&logo=#181717) + ### 介绍 **官网**：https://pickmall.cn From 2d1140df40b7a711af73cd3bdc633aee67da3e30 Mon Sep 17 00:00:00 2001 From: Chopper Date: Tue, 1 Jun 2021 08:52:33 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E4=BC=9A=E5=91=98=E7=A7=AF=E5=88=86?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=80=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../member/serviceimpl/MemberPointsHistoryServiceImpl.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberPointsHistoryServiceImpl.java b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberPointsHistoryServiceImpl.java index af594ce8..4de0800a 100644 --- a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberPointsHistoryServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberPointsHistoryServiceImpl.java @@ -46,9 +46,14 @@ public class MemberPointsHistoryServiceImpl extends ServiceImpl MemberPointsHistoryList(PageVO page, String memberId, String memberName) { - LambdaQueryWrapper lambdaQueryWrapper=new LambdaQueryWrapper() + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper() .eq(memberId != null, MemberPointsHistory::getMemberId, memberId) .like(memberName != null, MemberPointsHistory::getMemberName, memberName); + //如果排序为空，则默认创建时间倒序 + if (StringUtils.isEmpty(page.getSort())) { + page.setSort("createTime"); + page.setOrder("desc"); + } return this.page(PageUtil.initPage(page), lambdaQueryWrapper); } } \ No newline at end of file From 79461c3768bbb811a1e5acca01de5a1d20bb0f10 Mon Sep 17 00:00:00 2001 From: Chopper Date: Tue, 1 Jun 2021 09:16:15 +0800 Subject: [PATCH 7/9] =?UTF-8?q?uv=E7=BB=9F=E8=AE=A1=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../statistics/serviceimpl/PlatformViewDataServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/PlatformViewDataServiceImpl.java b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/PlatformViewDataServiceImpl.java index 723faf2e..edf23563 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/PlatformViewDataServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/PlatformViewDataServiceImpl.java @@ -240,7 +240,7 @@ public class PlatformViewDataServiceImpl extends ServiceImpl Date: Tue, 1 Jun 2021 09:29:03 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E5=BA=97=E9=93=BAuv=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E5=88=A4=E5=AE=9A=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../statistics/serviceimpl/PlatformViewDataServiceImpl.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/PlatformViewDataServiceImpl.java b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/PlatformViewDataServiceImpl.java index edf23563..84adf2d1 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/PlatformViewDataServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/PlatformViewDataServiceImpl.java @@ -21,7 +21,6 @@ import cn.lili.modules.statistics.util.StatisticsSuffix; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import lombok.RequiredArgsConstructor; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -237,10 +236,10 @@ public class PlatformViewDataServiceImpl extends ServiceImpl Date: Tue, 1 Jun 2021 09:43:02 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E5=BA=97=E9=93=BA=E6=B5=81=E6=B0=B4?= =?UTF-8?q?=E4=BA=A4=E6=98=93=E8=B6=8B=E5=8A=BF=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../statistics/serviceimpl/OrderStatisticsDataServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/OrderStatisticsDataServiceImpl.java b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/OrderStatisticsDataServiceImpl.java index 217b01d1..a6fb285e 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/OrderStatisticsDataServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/OrderStatisticsDataServiceImpl.java @@ -210,7 +210,7 @@ public class OrderStatisticsDataServiceImpl extends ServiceImpl