From 19fce53475355b6944158ef7d8d4103835d924a4 Mon Sep 17 00:00:00 2001 From: nengjie Date: Wed, 5 Jun 2019 17:46:56 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=89=93=E5=BC=80=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E7=9A=84swagger-api=E5=BC=80=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- user/user-application/src/main/resources/application.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/user/user-application/src/main/resources/application.yaml b/user/user-application/src/main/resources/application.yaml index 3745db650..07d939de8 100644 --- a/user/user-application/src/main/resources/application.yaml +++ b/user/user-application/src/main/resources/application.yaml @@ -17,7 +17,11 @@ server: context-path: /user-api/ swagger: - enable: false + enable: true # 暂时不去掉 + title: 用户子系统 + description: 用户子系统 + version: 1.0.0 + base-package: cn.iocoder.mall.user.application.controller management: endpoints: From 969476f44f7eb58d8204424bfe67e497b7dbd041 Mon Sep 17 00:00:00 2001 From: nengjie Date: Wed, 5 Jun 2019 17:59:00 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=89=93=E5=BC=80swagger-ui=E7=9A=84?= =?UTF-8?q?=E5=9C=B0=E5=9D=80=E8=AE=BF=E9=97=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pay/pay-application/src/main/resources/application.yaml | 6 +++++- .../src/main/resources/application.yaml | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/pay/pay-application/src/main/resources/application.yaml b/pay/pay-application/src/main/resources/application.yaml index 3e2704368..3b94cfc54 100644 --- a/pay/pay-application/src/main/resources/application.yaml +++ b/pay/pay-application/src/main/resources/application.yaml @@ -17,7 +17,11 @@ server: context-path: /pay-api/ swagger: - enable: false + enable: true + title: 支付子系统 + description: 支付子系统 + version: 1.0.0 + base-package: cn.iocoder.mall.pay.application.controller management: endpoints: diff --git a/promotion/promotion-application/src/main/resources/application.yaml b/promotion/promotion-application/src/main/resources/application.yaml index d388f4a8f..d02f99143 100644 --- a/promotion/promotion-application/src/main/resources/application.yaml +++ b/promotion/promotion-application/src/main/resources/application.yaml @@ -17,7 +17,11 @@ server: context-path: /promotion-api/ swagger: - enable: false + enable: true + title: 促销子系统 + description: 促销子系统 + version: 1.0.0 + base-package: cn.iocoder.mall.promotion.application.controller management: From a24f87f12cffb1b6be0fa58cac2df2d1801c8f8c Mon Sep 17 00:00:00 2001 From: YunaiV Date: Fri, 7 Jun 2019 21:51:29 +0800 Subject: [PATCH 3/3] =?UTF-8?q?-=20=E6=9B=B4=E6=96=B0=E6=96=87=E6=A1=A3=20?= =?UTF-8?q?-=20=E6=9B=B4=E6=96=B0=E4=BB=BB=E5=8A=A1=E5=88=97=E8=A1=A8?= =?UTF-8?q?=EF=BC=8C=E6=A0=87=E8=AE=B0=E8=B0=81=E5=9C=A8=E5=BC=80=E5=8F=91?= =?UTF-8?q?=E4=BB=80=E4=B9=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 10 ++++++---- .../cn/iocoder/common/framework/util/MallUtil.java | 1 + docs/guides/功能列表/功能列表-H5 商城.md | 4 ++-- docs/guides/功能列表/功能列表-管理后台.md | 4 ++-- docs/setup/quick-start.md | 4 +++- .../mall/promotion/biz/service/CouponServiceImpl.java | 3 +-- 6 files changed, 15 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 8cf063cdb..ea1100ac0 100644 --- a/README.md +++ b/README.md @@ -24,11 +24,13 @@ 近期准备开发如下功能: -1. 微信 H5 网页登陆 -2. 订单评价 -3. 商品品牌 -4. 短信接入 +1. 微信 H5 网页登陆 @To0R𓃰 +2. 订单评价 @wang171776704 +3. 商品品牌 @黑子 +4. 短信接入 @小范 5. 访问日志、错误日志接入 +6. 会员资料 @nengjie +7. 拼团购买 @大太阳 # 演示 diff --git a/common/common-framework/src/main/java/cn/iocoder/common/framework/util/MallUtil.java b/common/common-framework/src/main/java/cn/iocoder/common/framework/util/MallUtil.java index 99d97fa75..c33784e9f 100644 --- a/common/common-framework/src/main/java/cn/iocoder/common/framework/util/MallUtil.java +++ b/common/common-framework/src/main/java/cn/iocoder/common/framework/util/MallUtil.java @@ -47,6 +47,7 @@ public class MallUtil { if (StringUtil.hasText(traceId)) { return traceId; } + // TODO 芋艿 多次调用会问题 return UUID.randomUUID().toString(); } diff --git a/docs/guides/功能列表/功能列表-H5 商城.md b/docs/guides/功能列表/功能列表-H5 商城.md index 1cd19aa1d..0134b293d 100644 --- a/docs/guides/功能列表/功能列表-H5 商城.md +++ b/docs/guides/功能列表/功能列表-H5 商城.md @@ -16,7 +16,7 @@ - 订单相关 - [x] 下单(直接购买) - [x] 下单(购物车购买) - - [ ] 下单(拼团) + - [ ] 下单(拼团) @大太阳 - [x] 订单列表 - [x] 订单详情 - [x] 支付 @@ -31,4 +31,4 @@ - [x] 注册 - [x] 个人信息 - [ ] 手机改绑 - - [ ] 微信登陆 + - [ ] 微信登陆 @To0R𓃰 diff --git a/docs/guides/功能列表/功能列表-管理后台.md b/docs/guides/功能列表/功能列表-管理后台.md index f42d814ec..76d5ce1a9 100644 --- a/docs/guides/功能列表/功能列表-管理后台.md +++ b/docs/guides/功能列表/功能列表-管理后台.md @@ -55,5 +55,5 @@ - [X] 短信模板 - [ ] 短信发送日志【研发中 小范】 - [ ] 员工操作日志 - - [ ] 访问日志 - - [ ] 异常日志 + - [ ] 访问日志【待认领】 + - [ ] 异常日志【待认领】 diff --git a/docs/setup/quick-start.md b/docs/setup/quick-start.md index 932ce412a..13bc1be9c 100644 --- a/docs/setup/quick-start.md +++ b/docs/setup/quick-start.md @@ -52,7 +52,7 @@ spring: ① 安装 Zookeeper * Windows :参考 [《Windows 下 ZooKeeper 的配置和启动步骤 —— 单机模式》](https://www.jianshu.com/p/66857cbccbd3) -* Mac :参考 [《Mac 下安装与配置 MySQL》](https://www.jianshu.com/p/a8e4068a7a8a) +* Mac :参考 [《Zookeeper 安装及配置(Mac)》](https://www.jianshu.com/p/0ba61bf7149f) ② 修改项目中的 Zookeeper 配置 @@ -130,6 +130,8 @@ TODO 芋艿,需要完善 * Windows :参考 [《ElasticSearch 入门 第一篇:Windows 下安装ElasticSearch》](http://www.cnblogs.com/ljhdo/p/4887557.html) * Mac :参考 [《mac 安装 ElasticSearch 笔记》](https://www.jianshu.com/p/81b0b3a60c01) +因为需要中文分词,所以需要安装 [elasticsearch-analysis-ik](https://github.com/medcl/elasticsearch-analysis-ik) 插件。 + ② 修改项目中的 Elasticsearch 配置 在 IDEA 中,搜索`search-service-impl` 项目下的 `application.yaml` 文件,将 Elasticsearch 配置修改成连接你的。如下: diff --git a/promotion/promotion-service-impl/src/main/java/cn/iocoder/mall/promotion/biz/service/CouponServiceImpl.java b/promotion/promotion-service-impl/src/main/java/cn/iocoder/mall/promotion/biz/service/CouponServiceImpl.java index 9c4285782..2c30b132b 100644 --- a/promotion/promotion-service-impl/src/main/java/cn/iocoder/mall/promotion/biz/service/CouponServiceImpl.java +++ b/promotion/promotion-service-impl/src/main/java/cn/iocoder/mall/promotion/biz/service/CouponServiceImpl.java @@ -10,7 +10,6 @@ import cn.iocoder.mall.promotion.api.constant.*; import cn.iocoder.mall.promotion.api.dto.*; import cn.iocoder.mall.promotion.biz.convert.CouponCardConvert; import cn.iocoder.mall.promotion.biz.convert.CouponTemplateConvert; -import cn.iocoder.mall.promotion.biz.convert.CouponTemplateConvertImpl; import cn.iocoder.mall.promotion.biz.dao.CouponCardMapper; import cn.iocoder.mall.promotion.biz.dao.CouponTemplateMapper; import cn.iocoder.mall.promotion.biz.dataobject.CouponCardDO; @@ -36,7 +35,7 @@ public class CouponServiceImpl implements CouponService { @Override public CouponTemplateBO getCouponTemplate(Integer couponTemplateId) { CouponTemplateDO template = couponTemplateMapper.selectById(couponTemplateId); - return CouponTemplateConvertImpl.INSTANCE.convert(template); + return CouponTemplateConvert.INSTANCE.convert(template); } @Override