From dbf2a4392408c8389ca87bc3688dcf205e3ffb04 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Fri, 17 May 2019 19:23:26 +0800 Subject: [PATCH] =?UTF-8?q?-=20=E5=90=8E=E7=AB=AF=EF=BC=9A=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=20README=20-=20=E5=90=8E=E7=AB=AF=EF=BC=9A=E9=87=8D?= =?UTF-8?q?=E6=9E=84=E9=83=A8=E5=88=86=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 13 +- .../common/framework/util/StringUtil.java | 4 + .../mall/spring/boot/package-info.java | 1 - .../boot/web/AdminMVCAutoConfiguration.java | 8 ++ docs/guides/功能列表/功能列表-H5 商城.md | 4 +- docs/guides/功能列表/功能列表-管理后台.md | 19 ++- mobile-web/src/config/request.js | 12 +- mobile-web/src/page/category/index.vue | 15 -- mobile-web/src/page/user/info/detail.vue | 8 +- .../admins/AdminOrderReturnController.java | 4 +- .../admins/AdminsOrderController.java | 9 +- .../controller/users/OrderController.java | 14 +- .../users/OrderLogisticsController.java | 3 +- .../users/OrderReturnController.java | 3 +- .../controller/users/UsersCartController.java | 6 +- .../iocoder/mall/order/api/OrderService.java | 2 +- .../mall/order/api/bo/OrderRecipientBO.java | 2 +- .../mall/order/api/dto/CalcOrderPriceDTO.java | 2 + .../iocoder/mall/order/api/package-info.java | 7 - .../config/ServiceExceptionConfiguration.java | 4 +- .../order/biz/constants/package-info.java | 7 - .../order/biz/dataobject/OrderReturnDO.java | 5 +- .../biz/service/OrderReturnServiceImpl.java | 2 +- .../order/biz/service/OrderServiceImpl.java | 33 ++--- .../main/resources/config/application.yaml | 1 - .../src/main/resources/mybatis-config.xml | 19 --- .../admins/AdminsPayRefundController.java | 8 +- .../AdminsPayTransactionController.java | 4 +- .../users/UsersPayTransactionController.java | 42 +++--- .../application/convert/PayRefundConvert.java | 2 +- .../vo/admins/AdminsPayRefundDetailVO.java | 4 +- .../mall/pay/api/PayRefundService.java | 8 +- .../mall/pay/api/PayTransactionService.java | 21 +-- .../pay/api/bo/PayTransactionSubmitBO.java | 24 ---- .../pay/api/bo/{ => refund}/PayRefundBO.java | 2 +- .../api/bo/{ => refund}/PayRefundPageBO.java | 2 +- .../bo/{ => refund}/PayRefundSubmitBO.java | 2 +- .../{ => transaction}/PayTransactionBO.java | 63 ++++----- .../PayTransactionPageBO.java | 2 +- .../transaction/PayTransactionSubmitBO.java | 21 +++ .../mall/pay/api/constant/PayChannelEnum.java | 13 +- .../pay/api/dto/PayTransactionSubmitDTO.java | 37 ----- .../dto/{ => refund}/PayRefundPageDTO.java | 2 +- .../dto/{ => refund}/PayRefundSubmitDTO.java | 2 +- .../PayTransactionCreateDTO.java | 49 +++---- .../dto/transaction/PayTransactionGetDTO.java | 28 ++++ .../PayTransactionPageDTO.java | 2 +- .../transaction/PayTransactionSubmitDTO.java | 35 +++++ .../pay/biz/component/DubboReferencePool.java | 20 +-- .../pay/biz/convert/PayRefundConvert.java | 4 +- .../biz/convert/PayTransactionConvert.java | 6 +- .../pay/biz/mq/PayRefundSuccessConsumer.java | 1 + .../pay/biz/service/PayAppServiceImpl.java | 11 +- .../pay/biz/service/PayNotifyServiceImpl.java | 1 + .../pay/biz/service/PayRefundServiceImpl.java | 16 +-- .../service/PayTransactionServiceImpl.java | 67 +++++---- .../biz/service/PayRefundServiceImplTest.java | 2 +- .../PayTransactionServiceImplTest.java | 4 - .../users/UsersProductCategoryController.java | 4 +- .../users/UsersProductSpuController.java | 3 - .../users/UsersBannerController.java | 2 - .../users/UsersCouponController.java | 2 - .../UsersProductRecommendController.java | 2 - .../main/resources/config/application.yaml | 7 +- .../src/main/resources/mybatis-config.xml | 19 --- sessionStore/root.data | Bin 0 -> 9710 bytes .../sdk/context/AdminSecurityContext.java | 10 ++ .../sdk/interceptor/AdminDemoInterceptor.java | 31 +++++ .../interceptor/AdminSecurityInterceptor.java | 5 +- .../iocoder/mall/admin/sdk/package-info.java | 4 +- .../iocoder/mall/admin/api/OAuth2Service.java | 17 ++- .../api/bo/admin/AdminAuthorizationBO.java | 6 +- .../bo/oauth2/OAuth2AuthenticationOldBO.java | 27 ---- .../admin/api/constant/AdminConstants.java | 10 +- .../api/constant/AdminErrorCodeEnum.java | 7 +- .../api/dto/oauth2/OAuth2RefreshTokenDTO.java | 28 ++++ .../oauth2/OAuth2RemoveTokenByUserDTO.java | 27 ++++ .../mall/admin/convert/OAuth2Convert.java | 12 -- .../admin/dao/OAuth2AccessTokenMapper.java | 11 +- .../admin/dao/OAuth2RefreshTokenMapper.java | 5 +- .../mall/admin/service/AdminServiceImpl.java | 18 ++- .../mall/admin/service/OAuth2ServiceImpl.java | 37 +++-- .../cn/iocoder/mall/admin/package-info.java | 5 - .../controller/users/PassportController.java | 22 ++- .../controller/users/UserController.java | 4 + .../application/convert/PassportConvert.java | 21 --- .../user/application/po/UserAddressAddPO.java | 8 +- .../mall/user/sdk/annotation/PermitAll.java | 14 -- .../user/sdk/annotation/RequiresLogin.java | 16 +++ .../interceptor/UserSecurityInterceptor.java | 6 +- .../iocoder/mall/user/api/OAuth2Service.java | 22 --- .../mall/user/api/UserAccessLogService.java | 10 -- .../mall/user/api/bo/OAuth2AccessTokenBO.java | 25 ---- .../user/api/bo/OAuth2AuthenticationBO.java | 17 --- .../user/api/dto/UserAccessLogAddDTO.java | 65 --------- .../mall/user/biz/convert/OAuth2Convert.java | 29 ---- .../biz/convert/UserAccessLogConvert.java | 17 --- .../user/biz/dao/OAuth2AccessTokenMapper.java | 18 --- .../biz/dao/OAuth2RefreshTokenMapper.java | 16 --- .../user/biz/dao/UserAccessLogMapper.java | 11 -- .../user/biz/service/OAuth2ServiceImpl.java | 129 ------------------ .../biz/service/UserAccessLogServiceImpl.java | 54 -------- .../user/biz/service/UserServiceImpl.java | 3 +- .../resources/config/application.properties | 3 - .../main/resources/config/application.yaml | 2 - .../mapper/OAuth2AccessTokenMapper.xml | 36 ----- .../mapper/OAuth2RefreshTokenMapper.xml | 27 ---- .../resources/mapper/UserAccessLogMapper.xml | 20 --- 108 files changed, 589 insertions(+), 1017 deletions(-) delete mode 100644 common/mall-spring-boot/src/main/java/cn/iocoder/mall/spring/boot/package-info.java delete mode 100644 order/order-service-api/src/main/java/cn/iocoder/mall/order/api/package-info.java delete mode 100644 order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/constants/package-info.java delete mode 100644 order/order-service-impl/src/main/resources/mybatis-config.xml delete mode 100644 pay/pay-service-api/src/main/java/cn/iocoder/mall/pay/api/bo/PayTransactionSubmitBO.java rename pay/pay-service-api/src/main/java/cn/iocoder/mall/pay/api/bo/{ => refund}/PayRefundBO.java (97%) rename pay/pay-service-api/src/main/java/cn/iocoder/mall/pay/api/bo/{ => refund}/PayRefundPageBO.java (89%) rename pay/pay-service-api/src/main/java/cn/iocoder/mall/pay/api/bo/{ => refund}/PayRefundSubmitBO.java (83%) rename pay/pay-service-api/src/main/java/cn/iocoder/mall/pay/api/bo/{ => transaction}/PayTransactionBO.java (54%) rename pay/pay-service-api/src/main/java/cn/iocoder/mall/pay/api/bo/{ => transaction}/PayTransactionPageBO.java (88%) create mode 100644 pay/pay-service-api/src/main/java/cn/iocoder/mall/pay/api/bo/transaction/PayTransactionSubmitBO.java delete mode 100644 pay/pay-service-api/src/main/java/cn/iocoder/mall/pay/api/dto/PayTransactionSubmitDTO.java rename pay/pay-service-api/src/main/java/cn/iocoder/mall/pay/api/dto/{ => refund}/PayRefundPageDTO.java (95%) rename pay/pay-service-api/src/main/java/cn/iocoder/mall/pay/api/dto/{ => refund}/PayRefundSubmitDTO.java (96%) rename pay/pay-service-api/src/main/java/cn/iocoder/mall/pay/api/dto/{ => transaction}/PayTransactionCreateDTO.java (56%) create mode 100644 pay/pay-service-api/src/main/java/cn/iocoder/mall/pay/api/dto/transaction/PayTransactionGetDTO.java rename pay/pay-service-api/src/main/java/cn/iocoder/mall/pay/api/dto/{ => transaction}/PayTransactionPageDTO.java (95%) create mode 100644 pay/pay-service-api/src/main/java/cn/iocoder/mall/pay/api/dto/transaction/PayTransactionSubmitDTO.java delete mode 100644 promotion/promotion-service-impl/src/main/resources/mybatis-config.xml create mode 100644 sessionStore/root.data create mode 100644 system/system-sdk/src/main/java/cn/iocoder/mall/admin/sdk/interceptor/AdminDemoInterceptor.java delete mode 100644 system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/oauth2/OAuth2AuthenticationOldBO.java create mode 100644 system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/oauth2/OAuth2RefreshTokenDTO.java create mode 100644 system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/oauth2/OAuth2RemoveTokenByUserDTO.java delete mode 100644 system/system-service-impl/src/test/java/cn/iocoder/mall/admin/package-info.java delete mode 100644 user/user-application/src/main/java/cn/iocoder/mall/user/application/convert/PassportConvert.java delete mode 100644 user/user-sdk/src/main/java/cn/iocoder/mall/user/sdk/annotation/PermitAll.java create mode 100644 user/user-sdk/src/main/java/cn/iocoder/mall/user/sdk/annotation/RequiresLogin.java delete mode 100644 user/user-service-api/src/main/java/cn/iocoder/mall/user/api/OAuth2Service.java delete mode 100644 user/user-service-api/src/main/java/cn/iocoder/mall/user/api/UserAccessLogService.java delete mode 100644 user/user-service-api/src/main/java/cn/iocoder/mall/user/api/bo/OAuth2AccessTokenBO.java delete mode 100644 user/user-service-api/src/main/java/cn/iocoder/mall/user/api/bo/OAuth2AuthenticationBO.java delete mode 100644 user/user-service-api/src/main/java/cn/iocoder/mall/user/api/dto/UserAccessLogAddDTO.java delete mode 100644 user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/convert/OAuth2Convert.java delete mode 100644 user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/convert/UserAccessLogConvert.java delete mode 100644 user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dao/OAuth2AccessTokenMapper.java delete mode 100644 user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dao/OAuth2RefreshTokenMapper.java delete mode 100644 user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dao/UserAccessLogMapper.java delete mode 100644 user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/service/OAuth2ServiceImpl.java delete mode 100644 user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/service/UserAccessLogServiceImpl.java delete mode 100644 user/user-service-impl/src/main/resources/mapper/OAuth2AccessTokenMapper.xml delete mode 100644 user/user-service-impl/src/main/resources/mapper/OAuth2RefreshTokenMapper.xml delete mode 100644 user/user-service-impl/src/main/resources/mapper/UserAccessLogMapper.xml diff --git a/README.md b/README.md index d6dff6e16..b6f38bcc0 100644 --- a/README.md +++ b/README.md @@ -30,19 +30,26 @@ # 演示 +> 艿艿：目前的开发者，都是后端出身。所以，一帮没有审美自觉的人，撸出来的前端界面，可能是东半球倒数第二难看。 +> +> 迫切希望，有前端能力不错的小伙伴，加入我们，一起来完善「一个商城」。 +> +> 啊啊啊！我好像做店铺装修功能。 + ## H5 商城 [体验传送门](http://h5.shop.iocoder.cn:18099) -TODO 此处应有一个演示的装逼 GIF 图。 +![手残艿艿的 GIF 图](https://cdn.sinaimg.cn.52ecy.cn/large/005BYqpgly1g34hgm6fyhg31hc0u0nph.jpg) ## 管理后台 [体验传送门](http://admin.shop.iocoder.cn:18099) -TODO 暂时不提供管理后台的账号密码，等后面提供。 +* 账号：yudaoyuanma +* 密码：yudaoyuanma -TODO 此处应有一个演示的装逼 GIF 图。 +![](http://ww1.sinaimg.cn/large/98a7a01cgy1g34j9b2ktqg21hc0u01lf.gif) ## 其它演示 diff --git a/common/common-framework/src/main/java/cn/iocoder/common/framework/util/StringUtil.java b/common/common-framework/src/main/java/cn/iocoder/common/framework/util/StringUtil.java index c947894dc..61ebff370 100644 --- a/common/common-framework/src/main/java/cn/iocoder/common/framework/util/StringUtil.java +++ b/common/common-framework/src/main/java/cn/iocoder/common/framework/util/StringUtil.java @@ -35,4 +35,8 @@ public class StringUtil { return org.apache.commons.lang3.StringUtils.substring(str, start); } + public static void main(String[] args) { + System.out.println(StringUtil.split("cn.iocoder.mall.order.api.OrderService#updatePaySuccess#1.0.0", "#").size()); + } + } diff --git a/common/mall-spring-boot/src/main/java/cn/iocoder/mall/spring/boot/package-info.java b/common/mall-spring-boot/src/main/java/cn/iocoder/mall/spring/boot/package-info.java deleted file mode 100644 index e8b0e4716..000000000 --- a/common/mall-spring-boot/src/main/java/cn/iocoder/mall/spring/boot/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package cn.iocoder.mall.spring.boot; diff --git a/common/mall-spring-boot/src/main/java/cn/iocoder/mall/spring/boot/web/AdminMVCAutoConfiguration.java b/common/mall-spring-boot/src/main/java/cn/iocoder/mall/spring/boot/web/AdminMVCAutoConfiguration.java index f2c947b57..b83ecbddf 100644 --- a/common/mall-spring-boot/src/main/java/cn/iocoder/mall/spring/boot/web/AdminMVCAutoConfiguration.java +++ b/common/mall-spring-boot/src/main/java/cn/iocoder/mall/spring/boot/web/AdminMVCAutoConfiguration.java @@ -2,6 +2,7 @@ package cn.iocoder.mall.spring.boot.web; import cn.iocoder.common.framework.constant.MallConstants; import cn.iocoder.common.framework.servlet.CorsFilter; +import cn.iocoder.mall.admin.sdk.interceptor.AdminDemoInterceptor; import cn.iocoder.mall.spring.boot.web.interceptor.AccessLogInterceptor; import cn.iocoder.mall.admin.sdk.interceptor.AdminSecurityInterceptor; import cn.iocoder.mall.spring.boot.web.handler.GlobalExceptionHandler; @@ -34,6 +35,12 @@ public class AdminMVCAutoConfiguration implements WebMvcConfigurer { return new AdminSecurityInterceptor(); } + @Bean + @ConditionalOnMissingBean(AdminDemoInterceptor.class) + public AdminDemoInterceptor adminDemoInterceptor() { + return new AdminDemoInterceptor(); + } + @Bean @ConditionalOnMissingBean(GlobalResponseBodyHandler.class) public GlobalResponseBodyHandler globalReturnValueHandler() { @@ -50,6 +57,7 @@ public class AdminMVCAutoConfiguration implements WebMvcConfigurer { public void addInterceptors(InterceptorRegistry registry) { registry.addInterceptor(adminAccessLogInterceptor()).addPathPatterns(MallConstants.ROOT_PATH_ADMIN + "/**"); registry.addInterceptor(adminSecurityInterceptor()).addPathPatterns(MallConstants.ROOT_PATH_ADMIN + "/**"); + registry.addInterceptor(adminDemoInterceptor()).addPathPatterns(MallConstants.ROOT_PATH_ADMIN + "/**"); } @Bean diff --git a/docs/guides/功能列表/功能列表-H5 商城.md b/docs/guides/功能列表/功能列表-H5 商城.md index 56f33d3ed..1cd19aa1d 100644 --- a/docs/guides/功能列表/功能列表-H5 商城.md +++ b/docs/guides/功能列表/功能列表-H5 商城.md @@ -29,4 +29,6 @@ - 用户相关 - [x] 登陆 - [x] 注册 - - [ ] 个人信息 + - [x] 个人信息 + - [ ] 手机改绑 + - [ ] 微信登陆 diff --git a/docs/guides/功能列表/功能列表-管理后台.md b/docs/guides/功能列表/功能列表-管理后台.md index be9b5190f..d8bb63a8d 100644 --- a/docs/guides/功能列表/功能列表-管理后台.md +++ b/docs/guides/功能列表/功能列表-管理后台.md @@ -10,17 +10,25 @@ - [ ] 支付单 20% 【待认领】 - [ ] 退款单 20% 【待认领】 - TODO 需要补充 +- [ ] 店铺装修【迫切需要靠谱前端一起做】 + - [ ] H5 装修 + - [ ] 小程序装修 + - [ ] 自定义页面 - [ ] 商品管理 - [x] 发布商品 - [x] 商品列表 - [x] 展示类目 - [ ] 品牌管理【开发中 @黑子】 + - [ ] 商品标签 - [ ] 订单管理 - - [ ] 销售单 开发中 - - [ ] 售后单 开发中 + - [x] 销售单 + - [x] 售后单 - [ ] 订单评价【开发中 @wang171776704】 - [ ] 会员管理 - [ ] 会员资料 20%【待认领】 + - [ ] 会员等级 + - [ ] 会员积分 + - [ ] 用户标签 - TODO 需要补充 - [ ] 营销管理 - [x] 首页广告 @@ -30,6 +38,13 @@ - [ ] 满减送 20% 【待认领】 - [ ] 限制折扣 20% 【待认领】 - [ ] 多人拼团【待认领】 + - [ ] 积分商城 + - [ ] 问卷调查 + - [ ] 幸运大转盘 +- [ ] 分销管理 + - [ ] 分销设置 + - [ ] 分销员管理 + - [ ] 提现管理 - [ ] 系统管理 - [x] 员工管理 - [x] 角色管理 diff --git a/mobile-web/src/config/request.js b/mobile-web/src/config/request.js index 90183546f..9d92692ec 100644 --- a/mobile-web/src/config/request.js +++ b/mobile-web/src/config/request.js @@ -229,11 +229,11 @@ service.interceptors.response.use( // TODO token 过期 // TODO 需要拿 refresh token 置换 - if (code === 1001001011 // 访问令牌不存在 - || code === 1001001013 // 访问令牌已失效 - || code === 1001001021 // 刷新令牌不存在 - || code === 1001001022 // 刷新令牌已过期 - || code === 1001001023) { // 刷新令牌已失效 + if (code === 1002001011 // 访问令牌不存在 + || code === 1002001013 // 访问令牌已失效 + || code === 1002001017 // 刷新令牌不存在 + || code === 1002001018 // 刷新令牌已过期 + || code === 1002001019) { // 刷新令牌已失效 Dialog.confirm({ title: '系统提示', message: res.message, @@ -249,7 +249,7 @@ service.interceptors.response.use( } } }); - } else if (code === 1001001012) { // 访问令牌已过期 + } else if (code === 1002001012) { // 访问令牌已过期 return refreshToken(response); } else { Dialog.alert({ diff --git a/mobile-web/src/page/category/index.vue b/mobile-web/src/page/category/index.vue index 2f7cd5dac..5baa98376 100644 --- a/mobile-web/src/page/category/index.vue +++ b/mobile-web/src/page/category/index.vue @@ -50,21 +50,6 @@