diff --git a/README.md b/README.md index 7e483913..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 @@ -62,8 +64,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` @@ -118,8 +144,6 @@ PS:单独部署的话，数据库文件访问这里：https://gitee.com/beijing_ #### 移动端 -管理端功能展示 - 移动端功能展示 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 = "注册用户") 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 4d8b1716..03912d78 100644 --- a/common-api/src/main/resources/application.yml +++ b/common-api/src/main/resources/application.yml @@ -211,6 +211,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 = ""; } 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 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 5445fab7..870970b6 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 @@ -206,7 +206,7 @@ public class OrderStatisticsDataServiceImpl extends ServiceImpl collect = new ArrayList<>(); for (PointsGoodsVO i : pointsGoodsList) { - i.setStoreName("platform"); + i.setStoreName(i.getGoodsSku().getStoreName()); i.setStoreId(currentUser.getId()); collect.add(i); }