From 40c38983b8061687932ca2ad4c4594455d529846 Mon Sep 17 00:00:00 2001 From: wayn <1669738430@qq.com> Date: Wed, 5 Apr 2023 15:58:46 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E5=95=86=E5=9F=8E):=20=E6=9B=B4=E6=96=B0r?= =?UTF-8?q?eadme=EF=BC=8C=E5=8D=87=E7=BA=A7=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- images/wx-mp-code.png | Bin 0 -> 31433 bytes pom.xml | 12 ++++++------ readme.md | 8 ++++++-- waynboot-admin-api/pom.xml | 2 +- .../api/controller/shop/ColumnController.java | 2 +- waynboot-common/pom.xml | 6 +++--- waynboot-mobile-api/pom.xml | 6 ++++++ .../api/service/impl/IHomeServiceImpl.java | 3 +-- .../src/main/resources/application.yml | 5 +++++ 9 files changed, 29 insertions(+), 15 deletions(-) create mode 100644 images/wx-mp-code.png diff --git a/images/wx-mp-code.png b/images/wx-mp-code.png new file mode 100644 index 0000000000000000000000000000000000000000..8a658f9dc84f27f32eb06f9ab0678a3e2b7a0dbd GIT binary patch literal 31433 zcmb@sbx<5p*FHG7OK^902(Ah4?ykYz-624L;0f;T!3TE<4uebZ!QEx&eZOyOx9V5> z-_}%5SKpaB-M8;O=XuUKPmHRv3>q>KG5`QTlarNH2LPac{^vl1hKyir6l6h8u-0Fd zz5)OZi72mTaFA;X3t4p~0Kkt900@Zy0G=U3Ax8j!CkFs{&h5oC|2!$`4`M^m72|S^rJyU1_<|nq3G^CwYJ&t);?>h;tUUVA9+kTQ5ACE}mQNvH1bnciv|KpI9X+k%z!)eam8k2Qt z=L;T-IF~My^|4nFe`jiNNM{Yh>_6rA`#Zm&BYa7f{@r>Fx-z zKA&oo=n=9s?#|4Mq=~rF&+3tT(Sx}p{H#o;r=6CYs9blqj}*Zyb&24c2;vuk65y z?&!>JjI3{7D}&9fpuzT&K&a>!M70`ClTd61&r*yo85eSr3^G956WhmQ=o?RUy3a(- zpZ8@);OUo5Be64(Ua&(<>mHB_RT__t9%;|G6=k_(3MB9>-8wyD9WRiK?0({4f

G+r76#oxdiJA``Nj@^ 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 literal 0 HcmV?d00001 diff --git a/pom.xml b/pom.xml index 0ec9716..670be50 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.springframework.boot spring-boot-starter-parent - 3.0.2 + 3.0.5 waynboot-common @@ -34,20 +34,20 @@ 8.0.30 7.14.0 3.5.3.1 - 1.2.15 + 1.2.16 2.11.0 4.4 1.5 3.12.0 - 2.0.23 + 2.0.25 1.6.2 - 4.2.2 + 4.3.0 7.12.1 2.0.1 3.0.0 2.3.1 - 5.8.12 - 3.2.0 + 5.8.15 + 3.2.1 diff --git a/readme.md b/readme.md index 01c4ff1..0432f4b 100644 --- a/readme.md +++ b/readme.md @@ -18,7 +18,11 @@ waynboot-mall是一套全部开源的微商城项目,包含一个运营后台 - [运营后台项目](https://github.com/wayn111/waynboot-admin) - [后台接口项目](https://github.com/wayn111/waynboot-mall) -如果有任何使用问题,欢迎提交Issue或加QQ群:waynboot-mall交流群告知,方便互相交流反馈~ 💘。最后,喜欢的话麻烦给我个star +> 如果有任何使用问题,欢迎提交Issue或加QQ群:waynboot-mall交流群告知,方便互相交流反馈~ 💘。最后,喜欢的话麻烦给我个star + +关注公众号:waynblog,回复"学习"进群交流。 + + --- @@ -360,7 +364,7 @@ h5商城api: - 注册一个账号 - 然后登陆 -演示地址:http://121.4.124.33/mall +演示地址:http://mall.wayn.xin/mall ## 演示图 diff --git a/waynboot-admin-api/pom.xml b/waynboot-admin-api/pom.xml index 577515c..7094cf1 100644 --- a/waynboot-admin-api/pom.xml +++ b/waynboot-admin-api/pom.xml @@ -95,7 +95,7 @@ com.hierynomus sshj - 0.34.0 + 0.35.0 diff --git a/waynboot-admin-api/src/main/java/com/wayn/admin/api/controller/shop/ColumnController.java b/waynboot-admin-api/src/main/java/com/wayn/admin/api/controller/shop/ColumnController.java index 95c5e0e..034d6e1 100644 --- a/waynboot-admin-api/src/main/java/com/wayn/admin/api/controller/shop/ColumnController.java +++ b/waynboot-admin-api/src/main/java/com/wayn/admin/api/controller/shop/ColumnController.java @@ -41,7 +41,7 @@ public class ColumnController extends BaseController { IPage columnIPage = iColumnService.listPage(page, column); List columnVOS = columnIPage.getRecords().stream().map(item -> { ColumnVO columnVO = new ColumnVO(); - BeanUtils.copyProperties(columnVO, item); + BeanUtils.copyProperties(item, columnVO); Integer count = iColumnGoodsRelationService.getGoodsNum(item.getId()); columnVO.setGoodsNum(count); return columnVO; diff --git a/waynboot-common/pom.xml b/waynboot-common/pom.xml index 8aa25f7..f7afd60 100644 --- a/waynboot-common/pom.xml +++ b/waynboot-common/pom.xml @@ -129,20 +129,20 @@ com.github.binarywang weixin-java-pay - 4.4.7.B + 4.4.9.B com.alipay.sdk alipay-sdk-java - 4.35.9.ALL + 4.35.79.ALL com.alibaba easyexcel - 3.1.4 + 3.2.1 diff --git a/waynboot-mobile-api/pom.xml b/waynboot-mobile-api/pom.xml index 54c45a6..2974fd2 100644 --- a/waynboot-mobile-api/pom.xml +++ b/waynboot-mobile-api/pom.xml @@ -54,6 +54,12 @@ hutool-all ${hutool.version} + + + io.github.wayn111 + mybatis-xmlreload-spring-boot-starter + 3.0.3.m1 + diff --git a/waynboot-mobile-api/src/main/java/com/wayn/mobile/api/service/impl/IHomeServiceImpl.java b/waynboot-mobile-api/src/main/java/com/wayn/mobile/api/service/impl/IHomeServiceImpl.java index fd3bffd..798d39d 100644 --- a/waynboot-mobile-api/src/main/java/com/wayn/mobile/api/service/impl/IHomeServiceImpl.java +++ b/waynboot-mobile-api/src/main/java/com/wayn/mobile/api/service/impl/IHomeServiceImpl.java @@ -46,7 +46,6 @@ public class IHomeServiceImpl implements IHomeService { @Override public R getHomeIndexDataCompletableFuture() { - log.info("getHomeIndexDataCompletableFuture begin"); R success = R.success(); Map shopHomeIndexHash = redisCache.getCacheMap(SHOP_HOME_INDEX_HASH); // 当缓存中存在数据,并且过期时间不为空而且小于等于过期时间则直接从缓存中取出数据 @@ -54,7 +53,7 @@ public class IHomeServiceImpl implements IHomeService { long time = (long) shopHomeIndexHash.get(SHOP_HOME_INDEX_HASH_EXPIRATION_FIELD); if ((new Date().getTime() - time) <= Constants.ONE_DAY) { shopHomeIndexHash.forEach(success::add); - log.info("getHomeIndexDataCompletableFuture end"); + log.info("getHomeIndexDataCompletableFuture:{}", success); return success; } } diff --git a/waynboot-mobile-api/src/main/resources/application.yml b/waynboot-mobile-api/src/main/resources/application.yml index d870bfa..f6d4531 100644 --- a/waynboot-mobile-api/src/main/resources/application.yml +++ b/waynboot-mobile-api/src/main/resources/application.yml @@ -50,6 +50,11 @@ mybatis-plus: # 配置mapper的扫描,找到所有的mapper.xml映射文件 mapperLocations: classpath*:mapper/**/*Mapper.xml +# xml 文件热加载 +mybatis-xml-reload: + enabled: ${XML_RELOAD:false} + mapper-locations: classpath*:mapper/**/*Mapper.xml + # wayn配置 wayn: name: wayn