From 2d8909529611abe34d10f38dddbcd1f05c773f71 Mon Sep 17 00:00:00 2001 From: hupeng Date: Thu, 12 Dec 2019 19:25:05 +0800 Subject: [PATCH] =?UTF-8?q?1.4.3=E7=89=88=E6=9C=AC=EF=BC=8C=E5=90=8E?= =?UTF-8?q?=E5=8F=B0=E5=9B=BE=E6=A0=87=E6=9B=B4=E6=96=B0=E3=80=81=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=94=A8=E6=88=B7=E8=B4=A6=E5=8D=95=E6=B5=81?= =?UTF-8?q?=E6=B0=B4,=E5=90=8E=E5=8F=B0=E6=A8=A1=E5=9D=97=E9=87=8D?= =?UTF-8?q?=E6=96=B0=E6=8B=86=E5=88=86,=E7=89=A9=E6=B5=81=E5=BF=AB?= =?UTF-8?q?=E9=80=92=E5=8D=95=E7=8B=AC=E7=AE=A1=E7=90=86,=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E6=9C=80=E6=96=B0sql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 6 +- pom.xml | 1 + sql/yxshop.sql | 747 +++++++----------- yshop-shop/pom.xml | 33 + .../activity/domain/YxStoreCombination.java | 0 .../activity/domain/YxStoreCoupon.java | 0 .../activity/domain/YxStoreCouponIssue.java | 0 .../domain/YxStoreCouponIssueUser.java | 0 .../activity/domain/YxStoreCouponUser.java | 0 .../modules/activity/domain/YxStorePink.java | 0 .../modules/activity/domain/YxStoreVisit.java | 0 .../activity/domain/YxUserExtract.java | 0 .../YxStoreCombinationRepository.java | 0 .../YxStoreCouponIssueRepository.java | 0 .../YxStoreCouponIssueUserRepository.java | 0 .../repository/YxStoreCouponRepository.java | 0 .../YxStoreCouponUserRepository.java | 0 .../repository/YxStorePinkRepository.java | 0 .../repository/YxStoreVisitRepository.java | 0 .../repository/YxUserExtractRepository.java | 0 .../rest/YxStoreCombinationController.java | 0 .../rest/YxStoreCouponController.java | 0 .../rest/YxStoreCouponIssueController.java | 0 .../YxStoreCouponIssueUserController.java | 0 .../rest/YxStoreCouponUserController.java | 0 .../activity/rest/YxStorePinkController.java | 0 .../activity/rest/YxStoreVisitController.java | 0 .../rest/YxUserExtractController.java | 0 .../service/YxStoreCombinationService.java | 0 .../service/YxStoreCouponIssueService.java | 0 .../YxStoreCouponIssueUserService.java | 0 .../service/YxStoreCouponService.java | 0 .../service/YxStoreCouponUserService.java | 0 .../activity/service/YxStorePinkService.java | 0 .../activity/service/YxStoreVisitService.java | 0 .../service/YxUserExtractService.java | 0 .../service/dto/YxStoreCombinationDTO.java | 0 .../dto/YxStoreCombinationQueryCriteria.java | 0 .../service/dto/YxStoreCouponDTO.java | 0 .../service/dto/YxStoreCouponIssueDTO.java | 0 .../dto/YxStoreCouponIssueQueryCriteria.java | 0 .../dto/YxStoreCouponIssueUserDTO.java | 0 .../YxStoreCouponIssueUserQueryCriteria.java | 0 .../dto/YxStoreCouponQueryCriteria.java | 0 .../service/dto/YxStoreCouponUserDTO.java | 0 .../dto/YxStoreCouponUserQueryCriteria.java | 0 .../activity/service/dto/YxStorePinkDTO.java | 0 .../service/dto/YxStorePinkQueryCriteria.java | 0 .../activity/service/dto/YxStoreVisitDTO.java | 0 .../dto/YxStoreVisitQueryCriteria.java | 0 .../service/dto/YxUserExtractDTO.java | 0 .../dto/YxUserExtractQueryCriteria.java | 0 .../impl/YxStoreCombinationServiceImpl.java | 0 .../impl/YxStoreCouponIssueServiceImpl.java | 0 .../YxStoreCouponIssueUserServiceImpl.java | 0 .../impl/YxStoreCouponServiceImpl.java | 0 .../impl/YxStoreCouponUserServiceImpl.java | 0 .../service/impl/YxStorePinkServiceImpl.java | 0 .../service/impl/YxStoreVisitServiceImpl.java | 0 .../impl/YxUserExtractServiceImpl.java | 0 .../mapper/YxStoreCombinationMapper.java | 0 .../mapper/YxStoreCouponIssueMapper.java | 0 .../mapper/YxStoreCouponIssueUserMapper.java | 0 .../service/mapper/YxStoreCouponMapper.java | 0 .../mapper/YxStoreCouponUserMapper.java | 0 .../service/mapper/YxStorePinkMapper.java | 0 .../service/mapper/YxStoreVisitMapper.java | 0 .../service/mapper/YxUserExtractMapper.java | 0 .../shop/domain/StoreOrderCartInfo.java | 0 .../modules/shop/domain/YxExpress.java | 48 ++ .../modules/shop/domain/YxStoreCategory.java | 0 .../modules/shop/domain/YxStoreOrder.java | 3 + .../shop/domain/YxStoreOrderStatus.java | 0 .../modules/shop/domain/YxStoreProduct.java | 0 .../shop/domain/YxStoreProductAttr.java | 0 .../shop/domain/YxStoreProductAttrResult.java | 0 .../shop/domain/YxStoreProductAttrValue.java | 0 .../shop/domain/YxStoreProductReply.java | 0 .../shop/domain/YxSystemGroupData.java | 0 .../shop/domain/YxSystemUserLevel.java | 0 .../modules/shop/domain/YxSystemUserTask.java | 0 .../yixiang/modules/shop/domain/YxUser.java | 0 .../modules/shop/domain/YxUserBill.java | 4 +- .../shop/repository/YxExpressRepository.java | 19 + .../repository/YxStoreCategoryRepository.java | 0 .../YxStoreOrderCartInfoRepository.java | 0 .../repository/YxStoreOrderRepository.java | 0 .../YxStoreOrderStatusRepository.java | 0 .../YxStoreProductAttrRepository.java | 0 .../YxStoreProductAttrResultRepository.java | 0 .../YxStoreProductAttrValueRepository.java | 0 .../YxStoreProductReplyRepository.java | 0 .../repository/YxStoreProductRepository.java | 0 .../YxSystemGroupDataRepository.java | 0 .../YxSystemUserLevelRepository.java | 0 .../YxSystemUserTaskRepository.java | 0 .../shop/repository/YxUserBillRepository.java | 29 + .../shop/repository/YxUserRepository.java | 0 .../shop/rest/YxExpressController.java | 66 ++ .../shop/rest/YxStoreCategoryController.java | 0 .../shop/rest/YxStoreOrderController.java | 15 +- .../shop/rest/YxStoreProductController.java | 0 .../rest/YxStoreProductReplyController.java | 0 .../rest/YxSystemGroupDataController.java | 0 .../rest/YxSystemUserLevelController.java | 0 .../shop/rest/YxSystemUserTaskController.java | 0 .../shop/rest/YxUserBillController.java | 26 +- .../modules/shop/rest/YxUserController.java | 0 .../shop/service/YxExpressService.java | 66 ++ .../shop/service/YxStoreCategoryService.java | 0 .../shop/service/YxStoreOrderService.java | 0 .../service/YxStoreOrderStatusService.java | 0 .../service/YxStoreProductReplyService.java | 0 .../shop/service/YxStoreProductService.java | 0 .../service/YxSystemGroupDataService.java | 0 .../service/YxSystemUserLevelService.java | 0 .../shop/service/YxSystemUserTaskService.java | 0 .../shop/service/YxUserBillService.java | 0 .../modules/shop/service/YxUserService.java | 0 .../shop/service/dto/ChartDataDTO.java | 0 .../modules/shop/service/dto/DetailDTO.java | 0 .../shop/service/dto/FromatDetailDTO.java | 0 .../shop/service/dto/OrderTimeDataDTO.java | 0 .../shop/service/dto/ProductFormatDTO.java | 0 .../service/dto/StoreOrderCartInfoDTO.java | 0 .../modules/shop/service/dto/UserBillDTO.java | 18 + .../shop/service/dto/UserMoneyDTO.java | 0 .../shop/service/dto/YxExpressDTO.java | 28 + .../service/dto/YxExpressQueryCriteria.java | 12 + .../shop/service/dto/YxStoreCategoryDTO.java | 0 .../dto/YxStoreCategoryQueryCriteria.java | 0 .../shop/service/dto/YxStoreOrderDTO.java | 0 .../dto/YxStoreOrderQueryCriteria.java | 0 .../service/dto/YxStoreOrderStatusDTO.java | 0 .../dto/YxStoreOrderStatusQueryCriteria.java | 0 .../shop/service/dto/YxStoreProductDTO.java | 0 .../dto/YxStoreProductQueryCriteria.java | 0 .../service/dto/YxStoreProductReplyDTO.java | 0 .../dto/YxStoreProductReplyQueryCriteria.java | 0 .../service/dto/YxSystemGroupDataDTO.java | 0 .../dto/YxSystemGroupDataQueryCriteria.java | 0 .../service/dto/YxSystemUserLevelDTO.java | 0 .../dto/YxSystemUserLevelQueryCriteria.java | 0 .../shop/service/dto/YxSystemUserTaskDTO.java | 0 .../dto/YxSystemUserTaskQueryCriteria.java | 0 .../shop/service/dto/YxUserBillDTO.java | 0 .../service/dto/YxUserBillQueryCriteria.java | 3 + .../modules/shop/service/dto/YxUserDTO.java | 0 .../shop/service/dto/YxUserQueryCriteria.java | 0 .../service/impl/YxExpressServiceImpl.java | 84 ++ .../impl/YxStoreCategoryServiceImpl.java | 0 .../service/impl/YxStoreOrderServiceImpl.java | 1 + .../impl/YxStoreOrderStatusServiceImpl.java | 0 .../impl/YxStoreProductReplyServiceImpl.java | 0 .../impl/YxStoreProductServiceImpl.java | 0 .../impl/YxSystemGroupDataServiceImpl.java | 0 .../impl/YxSystemUserLevelServiceImpl.java | 0 .../impl/YxSystemUserTaskServiceImpl.java | 0 .../service/impl/YxUserBillServiceImpl.java | 11 +- .../shop/service/impl/YxUserServiceImpl.java | 0 .../shop/service/mapper/YxExpressMapper.java | 16 + .../service/mapper/YxStoreCategoryMapper.java | 0 .../service/mapper/YxStoreOrderMapper.java | 0 .../mapper/YxStoreOrderStatusMapper.java | 0 .../service/mapper/YxStoreProductMapper.java | 0 .../mapper/YxStoreProductReplyMapper.java | 0 .../mapper/YxSystemGroupDataMapper.java | 0 .../mapper/YxSystemUserLevelMapper.java | 0 .../mapper/YxSystemUserTaskMapper.java | 0 .../shop/service/mapper/YxUserBillMapper.java | 0 .../shop/service/mapper/YxUserMapper.java | 0 .../modules/wechat/domain/YxSystemConfig.java | 0 .../repository/YxSystemConfigRepository.java | 0 .../wechat/rest/YxSystemConfigController.java | 0 .../wechat/service/YxSystemConfigService.java | 0 .../wechat/service/dto/YxSystemConfigDTO.java | 0 .../dto/YxSystemConfigQueryCriteria.java | 0 .../impl/YxSystemConfigServiceImpl.java | 0 .../service/mapper/YxSystemConfigMapper.java | 0 yshop-system/pom.xml | 2 +- .../shop/repository/YxUserBillRepository.java | 12 - .../modules/system/rest/DeptController.java | 8 +- .../modules/system/rest/MenuController.java | 2 +- .../modules/system/service/dto/DeptDTO.java | 6 +- .../main/resources/config/application-dev.yml | 1 + 185 files changed, 751 insertions(+), 516 deletions(-) create mode 100644 yshop-shop/pom.xml rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/activity/domain/YxStoreCombination.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/activity/domain/YxStoreCoupon.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/activity/domain/YxStoreCouponIssue.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/activity/domain/YxStoreCouponIssueUser.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/activity/domain/YxStoreCouponUser.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/activity/domain/YxStorePink.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/activity/domain/YxStoreVisit.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/activity/domain/YxUserExtract.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/activity/repository/YxStoreCombinationRepository.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/activity/repository/YxStoreCouponIssueRepository.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/activity/repository/YxStoreCouponIssueUserRepository.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/activity/repository/YxStoreCouponRepository.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/activity/repository/YxStoreCouponUserRepository.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/activity/repository/YxStorePinkRepository.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/activity/repository/YxStoreVisitRepository.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/activity/repository/YxUserExtractRepository.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/activity/rest/YxStoreCombinationController.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/activity/rest/YxStoreCouponController.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/activity/rest/YxStoreCouponIssueController.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/activity/rest/YxStoreCouponIssueUserController.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/activity/rest/YxStoreCouponUserController.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/activity/rest/YxStorePinkController.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/activity/rest/YxStoreVisitController.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/activity/rest/YxUserExtractController.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/activity/service/YxStoreCombinationService.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/activity/service/YxStoreCouponIssueService.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/activity/service/YxStoreCouponIssueUserService.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/activity/service/YxStoreCouponService.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/activity/service/YxStoreCouponUserService.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/activity/service/YxStorePinkService.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/activity/service/YxStoreVisitService.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/activity/service/YxUserExtractService.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCombinationDTO.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCombinationQueryCriteria.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCouponDTO.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCouponIssueDTO.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCouponIssueQueryCriteria.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCouponIssueUserDTO.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCouponIssueUserQueryCriteria.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCouponQueryCriteria.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCouponUserDTO.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCouponUserQueryCriteria.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/activity/service/dto/YxStorePinkDTO.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/activity/service/dto/YxStorePinkQueryCriteria.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreVisitDTO.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreVisitQueryCriteria.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/activity/service/dto/YxUserExtractDTO.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/activity/service/dto/YxUserExtractQueryCriteria.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCombinationServiceImpl.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCouponIssueServiceImpl.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCouponIssueUserServiceImpl.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCouponServiceImpl.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCouponUserServiceImpl.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/activity/service/impl/YxStorePinkServiceImpl.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreVisitServiceImpl.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/activity/service/impl/YxUserExtractServiceImpl.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/activity/service/mapper/YxStoreCombinationMapper.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/activity/service/mapper/YxStoreCouponIssueMapper.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/activity/service/mapper/YxStoreCouponIssueUserMapper.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/activity/service/mapper/YxStoreCouponMapper.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/activity/service/mapper/YxStoreCouponUserMapper.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/activity/service/mapper/YxStorePinkMapper.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/activity/service/mapper/YxStoreVisitMapper.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/activity/service/mapper/YxUserExtractMapper.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/shop/domain/StoreOrderCartInfo.java (100%) create mode 100644 yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxExpress.java rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/shop/domain/YxStoreCategory.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/shop/domain/YxStoreOrder.java (97%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/shop/domain/YxStoreOrderStatus.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/shop/domain/YxStoreProduct.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/shop/domain/YxStoreProductAttr.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/shop/domain/YxStoreProductAttrResult.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/shop/domain/YxStoreProductAttrValue.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/shop/domain/YxStoreProductReply.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/shop/domain/YxSystemGroupData.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/shop/domain/YxSystemUserLevel.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/shop/domain/YxSystemUserTask.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/shop/domain/YxUser.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/shop/domain/YxUserBill.java (98%) create mode 100644 yshop-shop/src/main/java/co/yixiang/modules/shop/repository/YxExpressRepository.java rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/shop/repository/YxStoreCategoryRepository.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/shop/repository/YxStoreOrderCartInfoRepository.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/shop/repository/YxStoreOrderRepository.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/shop/repository/YxStoreOrderStatusRepository.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/shop/repository/YxStoreProductAttrRepository.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/shop/repository/YxStoreProductAttrResultRepository.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/shop/repository/YxStoreProductAttrValueRepository.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/shop/repository/YxStoreProductReplyRepository.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/shop/repository/YxStoreProductRepository.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/shop/repository/YxSystemGroupDataRepository.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/shop/repository/YxSystemUserLevelRepository.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/shop/repository/YxSystemUserTaskRepository.java (100%) create mode 100644 yshop-shop/src/main/java/co/yixiang/modules/shop/repository/YxUserBillRepository.java rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/shop/repository/YxUserRepository.java (100%) create mode 100644 yshop-shop/src/main/java/co/yixiang/modules/shop/rest/YxExpressController.java rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/shop/rest/YxStoreCategoryController.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/shop/rest/YxStoreOrderController.java (93%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/shop/rest/YxStoreProductController.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/shop/rest/YxStoreProductReplyController.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/shop/rest/YxSystemGroupDataController.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/shop/rest/YxSystemUserLevelController.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/shop/rest/YxSystemUserTaskController.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/shop/rest/YxUserBillController.java (53%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/shop/rest/YxUserController.java (100%) create mode 100644 yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxExpressService.java rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/shop/service/YxStoreCategoryService.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/shop/service/YxStoreOrderService.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/shop/service/YxStoreOrderStatusService.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/shop/service/YxStoreProductReplyService.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/shop/service/YxStoreProductService.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/shop/service/YxSystemGroupDataService.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/shop/service/YxSystemUserLevelService.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/shop/service/YxSystemUserTaskService.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/shop/service/YxUserBillService.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/shop/service/YxUserService.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/shop/service/dto/ChartDataDTO.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/shop/service/dto/DetailDTO.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/shop/service/dto/FromatDetailDTO.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/shop/service/dto/OrderTimeDataDTO.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/shop/service/dto/ProductFormatDTO.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/shop/service/dto/StoreOrderCartInfoDTO.java (100%) create mode 100644 yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/UserBillDTO.java rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/shop/service/dto/UserMoneyDTO.java (100%) create mode 100644 yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxExpressDTO.java create mode 100644 yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxExpressQueryCriteria.java rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreCategoryDTO.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreCategoryQueryCriteria.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreOrderDTO.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreOrderQueryCriteria.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreOrderStatusDTO.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreOrderStatusQueryCriteria.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreProductDTO.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreProductQueryCriteria.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreProductReplyDTO.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreProductReplyQueryCriteria.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemGroupDataDTO.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemGroupDataQueryCriteria.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemUserLevelDTO.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemUserLevelQueryCriteria.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemUserTaskDTO.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemUserTaskQueryCriteria.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/shop/service/dto/YxUserBillDTO.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/shop/service/dto/YxUserBillQueryCriteria.java (72%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/shop/service/dto/YxUserDTO.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/shop/service/dto/YxUserQueryCriteria.java (100%) create mode 100644 yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxExpressServiceImpl.java rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreCategoryServiceImpl.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreOrderServiceImpl.java (99%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreOrderStatusServiceImpl.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductReplyServiceImpl.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductServiceImpl.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemGroupDataServiceImpl.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemUserLevelServiceImpl.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemUserTaskServiceImpl.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/shop/service/impl/YxUserBillServiceImpl.java (86%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/shop/service/impl/YxUserServiceImpl.java (100%) create mode 100644 yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxExpressMapper.java rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/shop/service/mapper/YxStoreCategoryMapper.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/shop/service/mapper/YxStoreOrderMapper.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/shop/service/mapper/YxStoreOrderStatusMapper.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/shop/service/mapper/YxStoreProductMapper.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/shop/service/mapper/YxStoreProductReplyMapper.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/shop/service/mapper/YxSystemGroupDataMapper.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/shop/service/mapper/YxSystemUserLevelMapper.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/shop/service/mapper/YxSystemUserTaskMapper.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/shop/service/mapper/YxUserBillMapper.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/shop/service/mapper/YxUserMapper.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/wechat/domain/YxSystemConfig.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/wechat/repository/YxSystemConfigRepository.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/wechat/rest/YxSystemConfigController.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/wechat/service/YxSystemConfigService.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/wechat/service/dto/YxSystemConfigDTO.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/wechat/service/dto/YxSystemConfigQueryCriteria.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/wechat/service/impl/YxSystemConfigServiceImpl.java (100%) rename {yshop-system => yshop-shop}/src/main/java/co/yixiang/modules/wechat/service/mapper/YxSystemConfigMapper.java (100%) delete mode 100644 yshop-system/src/main/java/co/yixiang/modules/shop/repository/YxUserBillRepository.java diff --git a/README.md b/README.md index aa5c7a49..726a254b 100644 --- a/README.md +++ b/README.md @@ -58,10 +58,11 @@ yshop基于当前流行技术组合的前后端分离商城系统： SpringBoot2 - yshop-api 公众号(H5)API模块 - yshop-mp 微信相关模块 - yshop-common 公共模块 -- yshop-system 商城系统模块 +- yshop-system 后台模块 - yshop-logging 日志模块 - yshop-tools 第三方工具模块 - yshop-generator 代码生成模块 +- yshop-shop 商城模块 #### 系统预览 @@ -84,7 +85,7 @@ yshop基于当前流行技术组合的前后端分离商城系统： SpringBoot2
- + @@ -144,6 +145,7 @@ yshop基于当前流行技术组合的前后端分离商城系统： SpringBoot2 - yshop1.4.2 发布更新如下： -1.商品新增多图评价 -2.订单新增快递查询 +-1.4.3版本，后台图标更新,后台模块重新拆分,物流快递单独管理,导出最新sql #### 反馈交流 diff --git a/pom.xml b/pom.xml index 3d9314e9..26133c83 100644 --- a/pom.xml +++ b/pom.xml @@ -17,6 +17,7 @@ yshop-generatoryshop-apiyshop-mp + yshop-shopYSHOP商城管理系统 diff --git a/sql/yxshop.sql b/sql/yxshop.sql index 5dcd26ed..02620489 100644 --- a/sql/yxshop.sql +++ b/sql/yxshop.sql @@ -11,7 +11,7 @@ Target Server Version : 50723 File Encoding : 65001 - Date: 09/12/2019 17:39:50 + Date: 12/12/2019 17:30:42 */ SET NAMES utf8mb4; @@ -57,7 +57,7 @@ CREATE TABLE `dept` ( -- ---------------------------- -- Records of dept -- ---------------------------- -INSERT INTO `dept` VALUES (1, 'eladmin', 0, '2019-03-25 09:14:05', b'1'); +INSERT INTO `dept` VALUES (1, 'yshop', 0, '2019-03-25 09:14:05', b'1'); INSERT INTO `dept` VALUES (2, '研发部', 7, '2019-03-25 09:15:32', b'1'); INSERT INTO `dept` VALUES (5, '运维部', 7, '2019-03-25 09:20:44', b'1'); INSERT INTO `dept` VALUES (6, '测试部', 8, '2019-03-25 09:52:18', b'1'); @@ -152,7 +152,7 @@ CREATE TABLE `gen_config` ( -- ---------------------------- -- Records of gen_config -- ---------------------------- -INSERT INTO `gen_config` VALUES (1, 'hupeng', b'0', 'yshop-system', 'co.yixiang.modules.shop', 'E:\\java\\yxshop-private\\yshop-qd\\src\\views\\shop\\userlevel', 'E:\\java\\yxshop-private\\yshop-qd\\src\\api', NULL); +INSERT INTO `gen_config` VALUES (1, 'hupeng', b'0', 'yshop-shop', 'co.yixiang.modules.shop', 'E:\\java\\yxshop-private\\yshop-qd\\src\\views\\shop\\express', 'E:\\java\\yxshop-private\\yshop-qd\\src\\api', NULL); -- ---------------------------- -- Table structure for job @@ -227,7 +227,7 @@ CREATE TABLE `log` ( `username` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, `address` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 17304 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact; +) ENGINE = InnoDB AUTO_INCREMENT = 17533 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact; -- ---------------------------- -- Records of log @@ -3267,6 +3267,235 @@ INSERT INTO `log` VALUES (17300, '2019-12-09 16:03:51', '查询字典详情', NU INSERT INTO `log` VALUES (17301, '2019-12-09 16:04:09', '新增字典详情', NULL, 'INFO', 'co.yixiang.modules.system.rest.DictDetailController.create()', '{ resources: DictDetail(id=21, label=圆通速递, value=YTO, sort=4, dict=Dict(id=8, name=null, remark=null, dictDetails=null)) }', '127.0.0.1', 62, 'admin', '内网IP'); INSERT INTO `log` VALUES (17302, '2019-12-09 16:04:09', '查询字典详情', NULL, 'INFO', 'co.yixiang.modules.system.rest.DictDetailController.getDictDetails()', '{ criteria: DictDetailQueryCriteria(label=null, dictName=express_companys) pageable: Page request [number: 0, size 10, sort: sort: ASC] }', '127.0.0.1', 15, 'admin', '内网IP'); INSERT INTO `log` VALUES (17303, '2019-12-09 16:06:00', '查询字典详情', NULL, 'INFO', 'co.yixiang.modules.system.rest.DictDetailController.getDictDetails()', '{ criteria: DictDetailQueryCriteria(label=null, dictName=express_companys) pageable: Page request [number: 0, size 2000, sort: sort: ASC] }', '127.0.0.1', 41, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17304, '2019-12-11 11:16:48', '用户登录', NULL, 'INFO', 'co.yixiang.modules.security.rest.AuthenticationController.login()', '{ authorizationUser: {username=admin, password= ******} }', '127.0.0.1', 602, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17305, '2019-12-11 11:34:20', '查询菜单', NULL, 'INFO', 'co.yixiang.modules.system.rest.MenuController.getMenus()', '{ criteria: MenuQueryCriteria(blurry=null) }', '127.0.0.1', 54, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17306, '2019-12-11 11:34:52', '修改菜单', NULL, 'INFO', 'co.yixiang.modules.system.rest.MenuController.update()', '{ resources: co.yixiang.modules.system.domain.Menu@47 }', '127.0.0.1', 77, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17307, '2019-12-11 11:34:53', '查询菜单', NULL, 'INFO', 'co.yixiang.modules.system.rest.MenuController.getMenus()', '{ criteria: MenuQueryCriteria(blurry=null) }', '127.0.0.1', 29, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17308, '2019-12-11 11:35:42', '修改菜单', NULL, 'INFO', 'co.yixiang.modules.system.rest.MenuController.update()', '{ resources: co.yixiang.modules.system.domain.Menu@4d }', '127.0.0.1', 65, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17309, '2019-12-11 11:35:42', '查询菜单', NULL, 'INFO', 'co.yixiang.modules.system.rest.MenuController.getMenus()', '{ criteria: MenuQueryCriteria(blurry=null) }', '127.0.0.1', 9, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17310, '2019-12-11 11:36:59', '查询菜单', NULL, 'INFO', 'co.yixiang.modules.system.rest.MenuController.getMenus()', '{ criteria: MenuQueryCriteria(blurry=null) }', '127.0.0.1', 3, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17311, '2019-12-11 11:37:32', '修改菜单', NULL, 'INFO', 'co.yixiang.modules.system.rest.MenuController.update()', '{ resources: co.yixiang.modules.system.domain.Menu@4f }', '127.0.0.1', 65, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17312, '2019-12-11 11:37:32', '查询菜单', NULL, 'INFO', 'co.yixiang.modules.system.rest.MenuController.getMenus()', '{ criteria: MenuQueryCriteria(blurry=null) }', '127.0.0.1', 7, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17313, '2019-12-11 11:37:49', '修改菜单', NULL, 'INFO', 'co.yixiang.modules.system.rest.MenuController.update()', '{ resources: co.yixiang.modules.system.domain.Menu@4f }', '127.0.0.1', 52, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17314, '2019-12-11 11:37:49', '查询菜单', NULL, 'INFO', 'co.yixiang.modules.system.rest.MenuController.getMenus()', '{ criteria: MenuQueryCriteria(blurry=null) }', '127.0.0.1', 19, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17315, '2019-12-11 11:38:51', '查询菜单', NULL, 'INFO', 'co.yixiang.modules.system.rest.MenuController.getMenus()', '{ criteria: MenuQueryCriteria(blurry=null) }', '127.0.0.1', 2, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17316, '2019-12-11 11:39:12', '修改菜单', NULL, 'INFO', 'co.yixiang.modules.system.rest.MenuController.update()', '{ resources: co.yixiang.modules.system.domain.Menu@56 }', '127.0.0.1', 46, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17317, '2019-12-11 11:39:13', '查询菜单', NULL, 'INFO', 'co.yixiang.modules.system.rest.MenuController.getMenus()', '{ criteria: MenuQueryCriteria(blurry=null) }', '127.0.0.1', 11, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17318, '2019-12-11 11:40:56', '查询菜单', NULL, 'INFO', 'co.yixiang.modules.system.rest.MenuController.getMenus()', '{ criteria: MenuQueryCriteria(blurry=null) }', '127.0.0.1', 1, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17319, '2019-12-11 11:41:23', '修改菜单', NULL, 'INFO', 'co.yixiang.modules.system.rest.MenuController.update()', '{ resources: co.yixiang.modules.system.domain.Menu@5e }', '127.0.0.1', 60, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17320, '2019-12-11 11:41:24', '查询菜单', NULL, 'INFO', 'co.yixiang.modules.system.rest.MenuController.getMenus()', '{ criteria: MenuQueryCriteria(blurry=null) }', '127.0.0.1', 11, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17321, '2019-12-11 11:42:27', '查询菜单', NULL, 'INFO', 'co.yixiang.modules.system.rest.MenuController.getMenus()', '{ criteria: MenuQueryCriteria(blurry=null) }', '127.0.0.1', 2, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17322, '2019-12-11 11:42:46', '修改菜单', NULL, 'INFO', 'co.yixiang.modules.system.rest.MenuController.update()', '{ resources: co.yixiang.modules.system.domain.Menu@64 }', '127.0.0.1', 45, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17323, '2019-12-11 11:42:46', '查询菜单', NULL, 'INFO', 'co.yixiang.modules.system.rest.MenuController.getMenus()', '{ criteria: MenuQueryCriteria(blurry=null) }', '127.0.0.1', 11, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17324, '2019-12-11 11:44:00', '查询菜单', NULL, 'INFO', 'co.yixiang.modules.system.rest.MenuController.getMenus()', '{ criteria: MenuQueryCriteria(blurry=null) }', '127.0.0.1', 1, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17325, '2019-12-11 11:45:05', '查询菜单', NULL, 'INFO', 'co.yixiang.modules.system.rest.MenuController.getMenus()', '{ criteria: MenuQueryCriteria(blurry=null) }', '127.0.0.1', 0, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17326, '2019-12-11 11:45:33', '修改菜单', NULL, 'INFO', 'co.yixiang.modules.system.rest.MenuController.update()', '{ resources: co.yixiang.modules.system.domain.Menu@4e }', '127.0.0.1', 59, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17327, '2019-12-11 11:45:34', '查询菜单', NULL, 'INFO', 'co.yixiang.modules.system.rest.MenuController.getMenus()', '{ criteria: MenuQueryCriteria(blurry=null) }', '127.0.0.1', 12, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17328, '2019-12-11 11:45:44', '修改菜单', NULL, 'INFO', 'co.yixiang.modules.system.rest.MenuController.update()', '{ resources: co.yixiang.modules.system.domain.Menu@6c }', '127.0.0.1', 63, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17329, '2019-12-11 11:45:44', '查询菜单', NULL, 'INFO', 'co.yixiang.modules.system.rest.MenuController.getMenus()', '{ criteria: MenuQueryCriteria(blurry=null) }', '127.0.0.1', 8, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17330, '2019-12-11 11:45:53', '修改菜单', NULL, 'INFO', 'co.yixiang.modules.system.rest.MenuController.update()', '{ resources: co.yixiang.modules.system.domain.Menu@6d }', '127.0.0.1', 58, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17331, '2019-12-11 11:45:53', '查询菜单', NULL, 'INFO', 'co.yixiang.modules.system.rest.MenuController.getMenus()', '{ criteria: MenuQueryCriteria(blurry=null) }', '127.0.0.1', 13, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17332, '2019-12-11 11:46:20', '修改菜单', NULL, 'INFO', 'co.yixiang.modules.system.rest.MenuController.update()', '{ resources: co.yixiang.modules.system.domain.Menu@50 }', '127.0.0.1', 53, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17333, '2019-12-11 11:46:20', '查询菜单', NULL, 'INFO', 'co.yixiang.modules.system.rest.MenuController.getMenus()', '{ criteria: MenuQueryCriteria(blurry=null) }', '127.0.0.1', 5, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17334, '2019-12-11 11:48:58', '查询菜单', NULL, 'INFO', 'co.yixiang.modules.system.rest.MenuController.getMenus()', '{ criteria: MenuQueryCriteria(blurry=null) }', '127.0.0.1', 2, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17335, '2019-12-11 11:49:28', '修改菜单', NULL, 'INFO', 'co.yixiang.modules.system.rest.MenuController.update()', '{ resources: co.yixiang.modules.system.domain.Menu@51 }', '127.0.0.1', 53, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17336, '2019-12-11 11:49:28', '查询菜单', NULL, 'INFO', 'co.yixiang.modules.system.rest.MenuController.getMenus()', '{ criteria: MenuQueryCriteria(blurry=null) }', '127.0.0.1', 5, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17337, '2019-12-11 11:49:37', '修改菜单', NULL, 'INFO', 'co.yixiang.modules.system.rest.MenuController.update()', '{ resources: co.yixiang.modules.system.domain.Menu@52 }', '127.0.0.1', 47, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17338, '2019-12-11 11:49:37', '查询菜单', NULL, 'INFO', 'co.yixiang.modules.system.rest.MenuController.getMenus()', '{ criteria: MenuQueryCriteria(blurry=null) }', '127.0.0.1', 13, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17339, '2019-12-11 11:49:49', '修改菜单', NULL, 'INFO', 'co.yixiang.modules.system.rest.MenuController.update()', '{ resources: co.yixiang.modules.system.domain.Menu@53 }', '127.0.0.1', 52, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17340, '2019-12-11 11:49:49', '查询菜单', NULL, 'INFO', 'co.yixiang.modules.system.rest.MenuController.getMenus()', '{ criteria: MenuQueryCriteria(blurry=null) }', '127.0.0.1', 11, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17341, '2019-12-11 11:50:01', '修改菜单', NULL, 'INFO', 'co.yixiang.modules.system.rest.MenuController.update()', '{ resources: co.yixiang.modules.system.domain.Menu@6a }', '127.0.0.1', 50, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17342, '2019-12-11 11:50:01', '查询菜单', NULL, 'INFO', 'co.yixiang.modules.system.rest.MenuController.getMenus()', '{ criteria: MenuQueryCriteria(blurry=null) }', '127.0.0.1', 8, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17343, '2019-12-11 11:50:09', '修改菜单', NULL, 'INFO', 'co.yixiang.modules.system.rest.MenuController.update()', '{ resources: co.yixiang.modules.system.domain.Menu@6b }', '127.0.0.1', 52, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17344, '2019-12-11 11:50:09', '查询菜单', NULL, 'INFO', 'co.yixiang.modules.system.rest.MenuController.getMenus()', '{ criteria: MenuQueryCriteria(blurry=null) }', '127.0.0.1', 10, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17345, '2019-12-11 11:51:18', '查询菜单', NULL, 'INFO', 'co.yixiang.modules.system.rest.MenuController.getMenus()', '{ criteria: MenuQueryCriteria(blurry=null) }', '127.0.0.1', 1, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17346, '2019-12-11 11:52:29', '查询菜单', NULL, 'INFO', 'co.yixiang.modules.system.rest.MenuController.getMenus()', '{ criteria: MenuQueryCriteria(blurry=null) }', '127.0.0.1', 1, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17347, '2019-12-11 11:53:37', '修改菜单', NULL, 'INFO', 'co.yixiang.modules.system.rest.MenuController.update()', '{ resources: co.yixiang.modules.system.domain.Menu@6b }', '127.0.0.1', 48, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17348, '2019-12-11 11:53:37', '查询菜单', NULL, 'INFO', 'co.yixiang.modules.system.rest.MenuController.getMenus()', '{ criteria: MenuQueryCriteria(blurry=null) }', '127.0.0.1', 4, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17349, '2019-12-11 11:55:30', '查询菜单', NULL, 'INFO', 'co.yixiang.modules.system.rest.MenuController.getMenus()', '{ criteria: MenuQueryCriteria(blurry=null) }', '127.0.0.1', 1, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17350, '2019-12-11 11:55:59', '修改菜单', NULL, 'INFO', 'co.yixiang.modules.system.rest.MenuController.update()', '{ resources: co.yixiang.modules.system.domain.Menu@55 }', '127.0.0.1', 54, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17351, '2019-12-11 11:55:59', '查询菜单', NULL, 'INFO', 'co.yixiang.modules.system.rest.MenuController.getMenus()', '{ criteria: MenuQueryCriteria(blurry=null) }', '127.0.0.1', 30, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17352, '2019-12-11 11:56:08', '修改菜单', NULL, 'INFO', 'co.yixiang.modules.system.rest.MenuController.update()', '{ resources: co.yixiang.modules.system.domain.Menu@5d }', '127.0.0.1', 56, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17353, '2019-12-11 11:56:08', '查询菜单', NULL, 'INFO', 'co.yixiang.modules.system.rest.MenuController.getMenus()', '{ criteria: MenuQueryCriteria(blurry=null) }', '127.0.0.1', 18, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17354, '2019-12-11 12:00:06', '查询菜单', NULL, 'INFO', 'co.yixiang.modules.system.rest.MenuController.getMenus()', '{ criteria: MenuQueryCriteria(blurry=null) }', '127.0.0.1', 2, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17355, '2019-12-11 12:00:26', '修改菜单', NULL, 'INFO', 'co.yixiang.modules.system.rest.MenuController.update()', '{ resources: co.yixiang.modules.system.domain.Menu@57 }', '127.0.0.1', 44, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17356, '2019-12-11 12:00:27', '查询菜单', NULL, 'INFO', 'co.yixiang.modules.system.rest.MenuController.getMenus()', '{ criteria: MenuQueryCriteria(blurry=null) }', '127.0.0.1', 4, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17357, '2019-12-11 12:01:41', '查询菜单', NULL, 'INFO', 'co.yixiang.modules.system.rest.MenuController.getMenus()', '{ criteria: MenuQueryCriteria(blurry=null) }', '127.0.0.1', 1, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17358, '2019-12-11 12:01:58', '修改菜单', NULL, 'INFO', 'co.yixiang.modules.system.rest.MenuController.update()', '{ resources: co.yixiang.modules.system.domain.Menu@58 }', '127.0.0.1', 58, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17359, '2019-12-11 12:01:59', '查询菜单', NULL, 'INFO', 'co.yixiang.modules.system.rest.MenuController.getMenus()', '{ criteria: MenuQueryCriteria(blurry=null) }', '127.0.0.1', 6, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17360, '2019-12-11 12:02:07', '修改菜单', NULL, 'INFO', 'co.yixiang.modules.system.rest.MenuController.update()', '{ resources: co.yixiang.modules.system.domain.Menu@5a }', '127.0.0.1', 91, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17361, '2019-12-11 12:02:07', '查询菜单', NULL, 'INFO', 'co.yixiang.modules.system.rest.MenuController.getMenus()', '{ criteria: MenuQueryCriteria(blurry=null) }', '127.0.0.1', 11, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17362, '2019-12-11 12:02:15', '修改菜单', NULL, 'INFO', 'co.yixiang.modules.system.rest.MenuController.update()', '{ resources: co.yixiang.modules.system.domain.Menu@5b }', '127.0.0.1', 66, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17363, '2019-12-11 12:02:16', '查询菜单', NULL, 'INFO', 'co.yixiang.modules.system.rest.MenuController.getMenus()', '{ criteria: MenuQueryCriteria(blurry=null) }', '127.0.0.1', 5, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17364, '2019-12-11 12:02:24', '修改菜单', NULL, 'INFO', 'co.yixiang.modules.system.rest.MenuController.update()', '{ resources: co.yixiang.modules.system.domain.Menu@5c }', '127.0.0.1', 66, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17365, '2019-12-11 12:02:25', '查询菜单', NULL, 'INFO', 'co.yixiang.modules.system.rest.MenuController.getMenus()', '{ criteria: MenuQueryCriteria(blurry=null) }', '127.0.0.1', 5, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17366, '2019-12-11 12:02:34', '修改菜单', NULL, 'INFO', 'co.yixiang.modules.system.rest.MenuController.update()', '{ resources: co.yixiang.modules.system.domain.Menu@63 }', '127.0.0.1', 58, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17367, '2019-12-11 12:02:34', '查询菜单', NULL, 'INFO', 'co.yixiang.modules.system.rest.MenuController.getMenus()', '{ criteria: MenuQueryCriteria(blurry=null) }', '127.0.0.1', 25, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17368, '2019-12-11 12:02:48', '修改菜单', NULL, 'INFO', 'co.yixiang.modules.system.rest.MenuController.update()', '{ resources: co.yixiang.modules.system.domain.Menu@6e }', '127.0.0.1', 63, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17369, '2019-12-11 12:02:48', '查询菜单', NULL, 'INFO', 'co.yixiang.modules.system.rest.MenuController.getMenus()', '{ criteria: MenuQueryCriteria(blurry=null) }', '127.0.0.1', 7, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17370, '2019-12-11 12:04:09', '查询菜单', NULL, 'INFO', 'co.yixiang.modules.system.rest.MenuController.getMenus()', '{ criteria: MenuQueryCriteria(blurry=null) }', '127.0.0.1', 1, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17371, '2019-12-11 12:04:32', '修改菜单', NULL, 'INFO', 'co.yixiang.modules.system.rest.MenuController.update()', '{ resources: co.yixiang.modules.system.domain.Menu@6e }', '127.0.0.1', 54, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17372, '2019-12-11 12:04:33', '查询菜单', NULL, 'INFO', 'co.yixiang.modules.system.rest.MenuController.getMenus()', '{ criteria: MenuQueryCriteria(blurry=null) }', '127.0.0.1', 9, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17373, '2019-12-11 12:05:07', '修改菜单', NULL, 'INFO', 'co.yixiang.modules.system.rest.MenuController.update()', '{ resources: co.yixiang.modules.system.domain.Menu@63 }', '127.0.0.1', 52, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17374, '2019-12-11 12:05:08', '查询菜单', NULL, 'INFO', 'co.yixiang.modules.system.rest.MenuController.getMenus()', '{ criteria: MenuQueryCriteria(blurry=null) }', '127.0.0.1', 8, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17375, '2019-12-11 12:08:24', '查询菜单', NULL, 'INFO', 'co.yixiang.modules.system.rest.MenuController.getMenus()', '{ criteria: MenuQueryCriteria(blurry=null) }', '127.0.0.1', 2, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17376, '2019-12-11 12:08:33', '查询菜单', NULL, 'INFO', 'co.yixiang.modules.system.rest.MenuController.getMenus()', '{ criteria: MenuQueryCriteria(blurry=null) }', '127.0.0.1', 1, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17377, '2019-12-11 12:08:55', '修改菜单', NULL, 'INFO', 'co.yixiang.modules.system.rest.MenuController.update()', '{ resources: co.yixiang.modules.system.domain.Menu@5f }', '127.0.0.1', 45, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17378, '2019-12-11 12:08:55', '查询菜单', NULL, 'INFO', 'co.yixiang.modules.system.rest.MenuController.getMenus()', '{ criteria: MenuQueryCriteria(blurry=null) }', '127.0.0.1', 4, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17379, '2019-12-11 12:09:02', '修改菜单', NULL, 'INFO', 'co.yixiang.modules.system.rest.MenuController.update()', '{ resources: co.yixiang.modules.system.domain.Menu@60 }', '127.0.0.1', 49, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17380, '2019-12-11 12:09:03', '查询菜单', NULL, 'INFO', 'co.yixiang.modules.system.rest.MenuController.getMenus()', '{ criteria: MenuQueryCriteria(blurry=null) }', '127.0.0.1', 11, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17381, '2019-12-11 12:10:13', '查询菜单', NULL, 'INFO', 'co.yixiang.modules.system.rest.MenuController.getMenus()', '{ criteria: MenuQueryCriteria(blurry=null) }', '127.0.0.1', 0, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17382, '2019-12-11 12:10:35', '修改菜单', NULL, 'INFO', 'co.yixiang.modules.system.rest.MenuController.update()', '{ resources: co.yixiang.modules.system.domain.Menu@68 }', '127.0.0.1', 46, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17383, '2019-12-11 12:10:35', '查询菜单', NULL, 'INFO', 'co.yixiang.modules.system.rest.MenuController.getMenus()', '{ criteria: MenuQueryCriteria(blurry=null) }', '127.0.0.1', 9, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17384, '2019-12-11 12:12:40', '查询菜单', NULL, 'INFO', 'co.yixiang.modules.system.rest.MenuController.getMenus()', '{ criteria: MenuQueryCriteria(blurry=null) }', '127.0.0.1', 0, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17385, '2019-12-11 12:13:01', '修改菜单', NULL, 'INFO', 'co.yixiang.modules.system.rest.MenuController.update()', '{ resources: co.yixiang.modules.system.domain.Menu@69 }', '127.0.0.1', 47, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17386, '2019-12-11 12:13:01', '查询菜单', NULL, 'INFO', 'co.yixiang.modules.system.rest.MenuController.getMenus()', '{ criteria: MenuQueryCriteria(blurry=null) }', '127.0.0.1', 6, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17387, '2019-12-11 12:14:12', '修改菜单', NULL, 'INFO', 'co.yixiang.modules.system.rest.MenuController.update()', '{ resources: co.yixiang.modules.system.domain.Menu@5f }', '127.0.0.1', 43, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17388, '2019-12-11 12:14:12', '查询菜单', NULL, 'INFO', 'co.yixiang.modules.system.rest.MenuController.getMenus()', '{ criteria: MenuQueryCriteria(blurry=null) }', '127.0.0.1', 17, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17389, '2019-12-11 12:14:34', '修改菜单', NULL, 'INFO', 'co.yixiang.modules.system.rest.MenuController.update()', '{ resources: co.yixiang.modules.system.domain.Menu@68 }', '127.0.0.1', 63, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17390, '2019-12-11 12:14:34', '查询菜单', NULL, 'INFO', 'co.yixiang.modules.system.rest.MenuController.getMenus()', '{ criteria: MenuQueryCriteria(blurry=null) }', '127.0.0.1', 9, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17391, '2019-12-11 12:15:32', '查询菜单', NULL, 'INFO', 'co.yixiang.modules.system.rest.MenuController.getMenus()', '{ criteria: MenuQueryCriteria(blurry=null) }', '127.0.0.1', 3, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17392, '2019-12-11 12:15:52', '修改菜单', NULL, 'INFO', 'co.yixiang.modules.system.rest.MenuController.update()', '{ resources: co.yixiang.modules.system.domain.Menu@5f }', '127.0.0.1', 46, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17393, '2019-12-11 12:15:52', '查询菜单', NULL, 'INFO', 'co.yixiang.modules.system.rest.MenuController.getMenus()', '{ criteria: MenuQueryCriteria(blurry=null) }', '127.0.0.1', 4, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17394, '2019-12-11 12:16:45', '查询菜单', NULL, 'INFO', 'co.yixiang.modules.system.rest.MenuController.getMenus()', '{ criteria: MenuQueryCriteria(blurry=null) }', '127.0.0.1', 1, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17395, '2019-12-11 12:17:03', '修改菜单', NULL, 'INFO', 'co.yixiang.modules.system.rest.MenuController.update()', '{ resources: co.yixiang.modules.system.domain.Menu@65 }', '127.0.0.1', 49, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17396, '2019-12-11 12:17:03', '查询菜单', NULL, 'INFO', 'co.yixiang.modules.system.rest.MenuController.getMenus()', '{ criteria: MenuQueryCriteria(blurry=null) }', '127.0.0.1', 3, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17397, '2019-12-11 12:17:27', '修改菜单', NULL, 'INFO', 'co.yixiang.modules.system.rest.MenuController.update()', '{ resources: co.yixiang.modules.system.domain.Menu@66 }', '127.0.0.1', 45, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17398, '2019-12-11 12:17:27', '查询菜单', NULL, 'INFO', 'co.yixiang.modules.system.rest.MenuController.getMenus()', '{ criteria: MenuQueryCriteria(blurry=null) }', '127.0.0.1', 7, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17399, '2019-12-11 12:17:35', '修改菜单', NULL, 'INFO', 'co.yixiang.modules.system.rest.MenuController.update()', '{ resources: co.yixiang.modules.system.domain.Menu@67 }', '127.0.0.1', 46, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17400, '2019-12-11 12:17:36', '查询菜单', NULL, 'INFO', 'co.yixiang.modules.system.rest.MenuController.getMenus()', '{ criteria: MenuQueryCriteria(blurry=null) }', '127.0.0.1', 6, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17401, '2019-12-11 12:20:57', '查询菜单', NULL, 'INFO', 'co.yixiang.modules.system.rest.MenuController.getMenus()', '{ criteria: MenuQueryCriteria(blurry=null) }', '127.0.0.1', 2, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17402, '2019-12-11 12:22:02', '查询菜单', NULL, 'INFO', 'co.yixiang.modules.system.rest.MenuController.getMenus()', '{ criteria: MenuQueryCriteria(blurry=null) }', '127.0.0.1', 2, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17403, '2019-12-11 12:32:24', '查询菜单', NULL, 'INFO', 'co.yixiang.modules.system.rest.MenuController.getMenus()', '{ criteria: MenuQueryCriteria(blurry=null) }', '127.0.0.1', 1, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17404, '2019-12-11 12:32:35', '查询菜单', NULL, 'INFO', 'co.yixiang.modules.system.rest.MenuController.getMenus()', '{ criteria: MenuQueryCriteria(blurry=null) }', '127.0.0.1', 1, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17405, '2019-12-11 14:19:44', '查询字典详情', NULL, 'INFO', 'co.yixiang.modules.system.rest.DictDetailController.getDictDetails()', '{ criteria: DictDetailQueryCriteria(label=null, dictName=dept_status) pageable: Page request [number: 0, size 2000, sort: sort: ASC] }', '127.0.0.1', 104, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17406, '2019-12-11 14:19:44', '查询部门', NULL, 'INFO', 'co.yixiang.modules.system.rest.DeptController.getDepts()', '{ criteria: DeptQueryCriteria(ids=[], name=null, enabled=null, pid=null) }', '127.0.0.1', 35, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17407, '2019-12-11 14:19:56', '查询部门', NULL, 'INFO', 'co.yixiang.modules.system.rest.DeptController.getDepts()', '{ criteria: DeptQueryCriteria(ids=[], name=null, enabled=true, pid=null) }', '127.0.0.1', 59, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17408, '2019-12-11 14:20:01', '修改部门', NULL, 'INFO', 'co.yixiang.modules.system.rest.DeptController.update()', '{ resources: Dept(id=1, name=yshop, enabled=true, pid=0, roles=null, createTime=2019-03-25 09:14:05.0) }', '127.0.0.1', 66, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17409, '2019-12-11 14:20:01', '查询部门', NULL, 'INFO', 'co.yixiang.modules.system.rest.DeptController.getDepts()', '{ criteria: DeptQueryCriteria(ids=[], name=null, enabled=null, pid=null) }', '127.0.0.1', 30, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17410, '2019-12-11 15:03:12', '查询字典详情', NULL, 'INFO', 'co.yixiang.modules.system.rest.DictDetailController.getDictDetails()', '{ criteria: DictDetailQueryCriteria(label=null, dictName=dept_status) pageable: Page request [number: 0, size 2000, sort: sort: ASC] }', '127.0.0.1', 43, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17411, '2019-12-11 16:23:19', '查询用户', NULL, 'INFO', 'co.yixiang.modules.shop.rest.YxUserController.getYxUsers()', '{ criteria: YxUserQueryCriteria(nickname=null, phone=null, isPromoter=null) pageable: Page request [number: 0, size 10, sort: uid: DESC] }', '127.0.0.1', 68, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17412, '2019-12-11 16:27:57', '查询字典详情', NULL, 'INFO', 'co.yixiang.modules.system.rest.DictDetailController.getDictDetails()', '{ criteria: DictDetailQueryCriteria(label=null, dictName=job_status) pageable: Page request [number: 0, size 2000, sort: sort: ASC] }', '127.0.0.1', 92, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17413, '2019-12-11 16:27:57', '查询岗位', NULL, 'INFO', 'co.yixiang.modules.system.rest.JobController.getJobs()', '{ criteria: JobQueryCriteria(name=null, enabled=null, deptId=null, deptIds=[]) pageable: Page request [number: 0, size 10, sort: sort: ASC] }', '127.0.0.1', 452, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17414, '2019-12-11 16:28:23', '查询岗位', NULL, 'INFO', 'co.yixiang.modules.system.rest.JobController.getJobs()', '{ criteria: JobQueryCriteria(name=yshop, enabled=null, deptId=null, deptIds=[]) pageable: Page request [number: 0, size 10, sort: sort: ASC] }', '127.0.0.1', 20, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17415, '2019-12-11 16:28:29', '查询字典详情', NULL, 'INFO', 'co.yixiang.modules.system.rest.DictDetailController.getDictDetails()', '{ criteria: DictDetailQueryCriteria(label=null, dictName=dept_status) pageable: Page request [number: 0, size 2000, sort: sort: ASC] }', '127.0.0.1', 2, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17416, '2019-12-11 16:28:36', '查询字典详情', NULL, 'INFO', 'co.yixiang.modules.system.rest.DictDetailController.getDictDetails()', '{ criteria: DictDetailQueryCriteria(label=null, dictName=user_status) pageable: Page request [number: 0, size 2000, sort: sort: ASC] }', '127.0.0.1', 9, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17417, '2019-12-11 16:28:36', '查询用户', NULL, 'INFO', 'co.yixiang.modules.system.rest.UserController.getUsers()', '{ criteria: UserQueryCriteria(id=null, deptIds=[], blurry=null, enabled=null, deptId=null) pageable: Page request [number: 0, size 10, sort: id: DESC] }', '127.0.0.1', 18, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17418, '2019-12-11 16:29:50', '查询', NULL, 'INFO', 'co.yixiang.modules.shop.rest.YxSystemUserLevelController.getYxSystemUserLevels()', '{ criteria: YxSystemUserLevelQueryCriteria() pageable: Page request [number: 0, size 10, sort: id: DESC] }', '127.0.0.1', 20, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17419, '2019-12-11 16:29:52', '查询用户', NULL, 'INFO', 'co.yixiang.modules.shop.rest.YxUserController.getYxUsers()', '{ criteria: YxUserQueryCriteria(nickname=null, phone=null, isPromoter=null) pageable: Page request [number: 0, size 10, sort: uid: DESC] }', '127.0.0.1', 6, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17420, '2019-12-11 16:29:54', '查询', NULL, 'INFO', 'co.yixiang.modules.shop.rest.YxSystemUserLevelController.getYxSystemUserLevels()', '{ criteria: YxSystemUserLevelQueryCriteria() pageable: Page request [number: 0, size 10, sort: id: DESC] }', '127.0.0.1', 3, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17421, '2019-12-11 16:30:00', '查询YxSystemUserTask', NULL, 'INFO', 'co.yixiang.modules.shop.rest.YxSystemUserTaskController.getYxSystemUserTasks()', '{ criteria: YxSystemUserTaskQueryCriteria() pageable: Page request [number: 0, size 10, sort: id: DESC] }', '127.0.0.1', 67, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17422, '2019-12-11 16:33:22', '查询YxSystemUserTask', NULL, 'INFO', 'co.yixiang.modules.shop.rest.YxSystemUserTaskController.getYxSystemUserTasks()', '{ criteria: YxSystemUserTaskQueryCriteria() pageable: Page request [number: 0, size 10, sort: id: DESC] }', '127.0.0.1', 38, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17423, '2019-12-11 16:41:25', '查询字典详情', NULL, 'INFO', 'co.yixiang.modules.system.rest.DictDetailController.getDictDetails()', '{ criteria: DictDetailQueryCriteria(label=null, dictName=job_status) pageable: Page request [number: 0, size 2000, sort: sort: ASC] }', '127.0.0.1', 73, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17424, '2019-12-11 16:41:26', '查询岗位', NULL, 'INFO', 'co.yixiang.modules.system.rest.JobController.getJobs()', '{ criteria: JobQueryCriteria(name=null, enabled=null, deptId=null, deptIds=[]) pageable: Page request [number: 0, size 10, sort: sort: ASC] }', '127.0.0.1', 371, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17425, '2019-12-11 16:41:34', '修改岗位', NULL, 'INFO', 'co.yixiang.modules.system.rest.JobController.update()', '{ resources: Job(id=2, name=董事长秘书, sort=2, enabled=true, dept=Dept(id=1, name=null, enabled=null, pid=null, roles=null, createTime=null), createTime=2019-03-29 14:01:30.0) }', '127.0.0.1', 26, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17426, '2019-12-11 16:41:34', '查询岗位', NULL, 'INFO', 'co.yixiang.modules.system.rest.JobController.getJobs()', '{ criteria: JobQueryCriteria(name=null, enabled=null, deptId=null, deptIds=[]) pageable: Page request [number: 0, size 10, sort: sort: ASC] }', '127.0.0.1', 24, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17427, '2019-12-11 16:53:40', '查询字典详情', NULL, 'INFO', 'co.yixiang.modules.system.rest.DictDetailController.getDictDetails()', '{ criteria: DictDetailQueryCriteria(label=null, dictName=user_status) pageable: Page request [number: 0, size 2000, sort: sort: ASC] }', '127.0.0.1', 116, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17428, '2019-12-11 16:53:40', '查询用户', NULL, 'INFO', 'co.yixiang.modules.system.rest.UserController.getUsers()', '{ criteria: UserQueryCriteria(id=null, deptIds=[], blurry=null, enabled=null, deptId=null) pageable: Page request [number: 0, size 10, sort: id: DESC] }', '127.0.0.1', 162, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17429, '2019-12-11 17:16:07', '用户登录', 'co.yixiang.exception.BadRequestException: 验证码错误\r\n at co.yixiang.modules.security.rest.AuthenticationController.login(AuthenticationController.java:70)\r\n at co.yixiang.modules.security.rest.AuthenticationController$$FastClassBySpringCGLIB$$7265dd5e.invoke()\r\n at org.springframework.cglib.proxy.MethodProxy.invoke(MethodProxy.java:218)\r\n at org.springframework.aop.framework.CglibAopProxy$CglibMethodInvocation.invokeJoinpoint(CglibAopProxy.java:746)\r\n at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:163)\r\n at org.springframework.aop.aspectj.MethodInvocationProceedingJoinPoint.proceed(MethodInvocationProceedingJoinPoint.java:88)\r\n at co.yixiang.aspect.LogAspect.logAround(LogAspect.java:50)\r\n at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)\r\n at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)\r\n at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)\r\n at java.lang.reflect.Method.invoke(Method.java:498)\r\n at org.springframework.aop.aspectj.AbstractAspectJAdvice.invokeAdviceMethodWithGivenArgs(AbstractAspectJAdvice.java:644)\r\n at org.springframework.aop.aspectj.AbstractAspectJAdvice.invokeAdviceMethod(AbstractAspectJAdvice.java:633)\r\n at org.springframework.aop.aspectj.AspectJAroundAdvice.invoke(AspectJAroundAdvice.java:70)\r\n at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:175)\r\n at org.springframework.aop.aspectj.AspectJAfterThrowingAdvice.invoke(AspectJAfterThrowingAdvice.java:62)\r\n at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:175)\r\n at org.springframework.aop.interceptor.ExposeInvocationInterceptor.invoke(ExposeInvocationInterceptor.java:93)\r\n at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:186)\r\n at org.springframework.aop.framework.CglibAopProxy$DynamicAdvisedInterceptor.intercept(CglibAopProxy.java:688)\r\n at co.yixiang.modules.security.rest.AuthenticationController$$EnhancerBySpringCGLIB$$b3fc12e9.login()\r\n at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)\r\n at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)\r\n at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)\r\n at java.lang.reflect.Method.invoke(Method.java:498)\r\n at org.springframework.web.method.support.InvocableHandlerMethod.doInvoke(InvocableHandlerMethod.java:215)\r\n at org.springframework.web.method.support.InvocableHandlerMethod.invokeForRequest(InvocableHandlerMethod.java:142)\r\n at org.springframework.web.servlet.mvc.method.annotation.ServletInvocableHandlerMethod.invokeAndHandle(ServletInvocableHandlerMethod.java:102)\r\n at org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter.invokeHandlerMethod(RequestMappingHandlerAdapter.java:895)\r\n at org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter.handleInternal(RequestMappingHandlerAdapter.java:800)\r\n at org.springframework.web.servlet.mvc.method.AbstractHandlerMethodAdapter.handle(AbstractHandlerMethodAdapter.java:87)\r\n at org.springframework.web.servlet.DispatcherServlet.doDispatch(DispatcherServlet.java:1038)\r\n at org.springframework.web.servlet.DispatcherServlet.doService(DispatcherServlet.java:942)\r\n at org.springframework.web.servlet.FrameworkServlet.processRequest(FrameworkServlet.java:998)\r\n at org.springframework.web.servlet.FrameworkServlet.doPost(FrameworkServlet.java:901)\r\n at javax.servlet.http.HttpServlet.service(HttpServlet.java:660)\r\n at org.springframework.web.servlet.FrameworkServlet.service(FrameworkServlet.java:875)\r\n at javax.servlet.http.HttpServlet.service(HttpServlet.java:741)\r\n at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:231)\r\n at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166)\r\n at org.apache.tomcat.websocket.server.WsFilter.doFilter(WsFilter.java:53)\r\n at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193)\r\n at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166)\r\n at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:101)\r\n at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193)\r\n at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166)\r\n at com.alibaba.druid.support.http.WebStatFilter.doFilter(WebStatFilter.java:123)\r\n at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193)\r\n at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166)\r\n at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:320)\r\n at org.springframework.security.web.access.intercept.FilterSecurityInterceptor.invoke(FilterSecurityInterceptor.java:127)\r\n at org.springframework.security.web.access.intercept.FilterSecurityInterceptor.doFilter(FilterSecurityInterceptor.java:91)\r\n at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334)\r\n at org.springframework.security.web.access.ExceptionTranslationFilter.doFilter(ExceptionTranslationFilter.java:119)\r\n at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334)\r\n at org.springframework.security.web.session.SessionManagementFilter.doFilter(SessionManagementFilter.java:137)\r\n at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334)\r\n at org.springframework.security.web.authentication.AnonymousAuthenticationFilter.doFilter(AnonymousAuthenticationFilter.java:111)\r\n at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334)\r\n at org.springframework.security.web.servletapi.SecurityContextHolderAwareRequestFilter.doFilter(SecurityContextHolderAwareRequestFilter.java:170)\r\n at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334)\r\n at org.springframework.security.web.savedrequest.RequestCacheAwareFilter.doFilter(RequestCacheAwareFilter.java:63)\r\n at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334)\r\n at co.yixiang.modules.security.security.JwtAuthorizationTokenFilter.doFilterInternal(JwtAuthorizationTokenFilter.java:67)\r\n at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:107)\r\n at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334)\r\n at org.springframework.security.web.authentication.logout.LogoutFilter.doFilter(LogoutFilter.java:116)\r\n at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334)\r\n at org.springframework.security.web.header.HeaderWriterFilter.doFilterInternal(HeaderWriterFilter.java:66)\r\n at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:107)\r\n at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334)\r\n at org.springframework.security.web.context.SecurityContextPersistenceFilter.doFilter(SecurityContextPersistenceFilter.java:105)\r\n at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334)\r\n at org.springframework.security.web.context.request.async.WebAsyncManagerIntegrationFilter.doFilterInternal(WebAsyncManagerIntegrationFilter.java:56)\r\n at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:107)\r\n at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334)\r\n at org.springframework.security.web.FilterChainProxy.doFilterInternal(FilterChainProxy.java:215)\r\n at org.springframework.security.web.FilterChainProxy.doFilter(FilterChainProxy.java:178)\r\n at org.springframework.web.filter.DelegatingFilterProxy.invokeDelegate(DelegatingFilterProxy.java:357)\r\n at org.springframework.web.filter.DelegatingFilterProxy.doFilter(DelegatingFilterProxy.java:270)\r\n at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193)\r\n at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166)\r\n at org.springframework.web.filter.CharacterEncodingFilter.doFilterInternal(CharacterEncodingFilter.java:200)\r\n at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:107)\r\n at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193)\r\n at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166)\r\n at org.apache.catalina.core.StandardWrapperValve.invoke(StandardWrapperValve.java:199)\r\n at org.apache.catalina.core.StandardContextValve.invoke(StandardContextValve.java:96)\r\n at org.apache.catalina.authenticator.AuthenticatorBase.invoke(AuthenticatorBase.java:490)\r\n at org.apache.catalina.core.StandardHostValve.invoke(StandardHostValve.java:139)\r\n at org.apache.catalina.valves.ErrorReportValve.invoke(ErrorReportValve.java:92)\r\n at org.apache.catalina.core.StandardEngineValve.invoke(StandardEngineValve.java:74)\r\n at org.apache.catalina.connector.CoyoteAdapter.service(CoyoteAdapter.java:343)\r\n at org.apache.coyote.http11.Http11Processor.service(Http11Processor.java:408)\r\n at org.apache.coyote.AbstractProcessorLight.process(AbstractProcessorLight.java:66)\r\n at org.apache.coyote.AbstractProtocol$ConnectionHandler.process(AbstractProtocol.java:770)\r\n at org.apache.tomcat.util.net.NioEndpoint$SocketProcessor.doRun(NioEndpoint.java:1415)\r\n at org.apache.tomcat.util.net.SocketProcessorBase.run(SocketProcessorBase.java:49)\r\n at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1149)\r\n at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:624)\r\n at org.apache.tomcat.util.threads.TaskThread$WrappingRunnable.run(TaskThread.java:61)\r\n at java.lang.Thread.run(Thread.java:748)\r\n', 'ERROR', 'co.yixiang.modules.security.rest.AuthenticationController.login()', '{ authorizationUser: {username=admin, password= ******} }', '127.0.0.1', 5, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17430, '2019-12-11 17:16:12', '用户登录', NULL, 'INFO', 'co.yixiang.modules.security.rest.AuthenticationController.login()', '{ authorizationUser: {username=admin, password= ******} }', '127.0.0.1', 174, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17431, '2019-12-11 17:16:13', '查询字典详情', NULL, 'INFO', 'co.yixiang.modules.system.rest.DictDetailController.getDictDetails()', '{ criteria: DictDetailQueryCriteria(label=null, dictName=user_status) pageable: Page request [number: 0, size 2000, sort: sort: ASC] }', '127.0.0.1', 55, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17432, '2019-12-11 17:16:13', '查询用户', NULL, 'INFO', 'co.yixiang.modules.system.rest.UserController.getUsers()', '{ criteria: UserQueryCriteria(id=null, deptIds=[], blurry=null, enabled=null, deptId=null) pageable: Page request [number: 0, size 10, sort: id: DESC] }', '127.0.0.1', 63, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17433, '2019-12-11 17:16:49', '查询菜单', NULL, 'INFO', 'co.yixiang.modules.system.rest.MenuController.getMenus()', '{ criteria: MenuQueryCriteria(blurry=null) }', '127.0.0.1', 10, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17434, '2019-12-11 17:18:11', '查询菜单', NULL, 'INFO', 'co.yixiang.modules.system.rest.MenuController.getMenus()', '{ criteria: MenuQueryCriteria(blurry=null) }', '127.0.0.1', 3, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17435, '2019-12-11 17:18:38', '新增菜单', 'co.yixiang.exception.BadRequestException: 演示环境禁止操作\r\n at co.yixiang.modules.system.rest.MenuController.create(MenuController.java:78)\r\n at co.yixiang.modules.system.rest.MenuController$$FastClassBySpringCGLIB$$df40f4f4.invoke()\r\n at org.springframework.cglib.proxy.MethodProxy.invoke(MethodProxy.java:218)\r\n at org.springframework.aop.framework.CglibAopProxy$CglibMethodInvocation.invokeJoinpoint(CglibAopProxy.java:746)\r\n at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:163)\r\n at org.springframework.aop.aspectj.MethodInvocationProceedingJoinPoint.proceed(MethodInvocationProceedingJoinPoint.java:88)\r\n at co.yixiang.aspect.LogAspect.logAround(LogAspect.java:50)\r\n at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)\r\n at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)\r\n at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)\r\n at java.lang.reflect.Method.invoke(Method.java:498)\r\n at org.springframework.aop.aspectj.AbstractAspectJAdvice.invokeAdviceMethodWithGivenArgs(AbstractAspectJAdvice.java:644)\r\n at org.springframework.aop.aspectj.AbstractAspectJAdvice.invokeAdviceMethod(AbstractAspectJAdvice.java:633)\r\n at org.springframework.aop.aspectj.AspectJAroundAdvice.invoke(AspectJAroundAdvice.java:70)\r\n at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:175)\r\n at org.springframework.aop.aspectj.AspectJAfterThrowingAdvice.invoke(AspectJAfterThrowingAdvice.java:62)\r\n at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:175)\r\n at org.springframework.security.access.intercept.aopalliance.MethodSecurityInterceptor.invoke(MethodSecurityInterceptor.java:69)\r\n at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:186)\r\n at org.springframework.aop.interceptor.ExposeInvocationInterceptor.invoke(ExposeInvocationInterceptor.java:93)\r\n at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:186)\r\n at org.springframework.aop.framework.CglibAopProxy$DynamicAdvisedInterceptor.intercept(CglibAopProxy.java:688)\r\n at co.yixiang.modules.system.rest.MenuController$$EnhancerBySpringCGLIB$$efbeecf6.create()\r\n at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)\r\n at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)\r\n at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)\r\n at java.lang.reflect.Method.invoke(Method.java:498)\r\n at org.springframework.web.method.support.InvocableHandlerMethod.doInvoke(InvocableHandlerMethod.java:215)\r\n at org.springframework.web.method.support.InvocableHandlerMethod.invokeForRequest(InvocableHandlerMethod.java:142)\r\n at org.springframework.web.servlet.mvc.method.annotation.ServletInvocableHandlerMethod.invokeAndHandle(ServletInvocableHandlerMethod.java:102)\r\n at org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter.invokeHandlerMethod(RequestMappingHandlerAdapter.java:895)\r\n at org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter.handleInternal(RequestMappingHandlerAdapter.java:800)\r\n at org.springframework.web.servlet.mvc.method.AbstractHandlerMethodAdapter.handle(AbstractHandlerMethodAdapter.java:87)\r\n at org.springframework.web.servlet.DispatcherServlet.doDispatch(DispatcherServlet.java:1038)\r\n at org.springframework.web.servlet.DispatcherServlet.doService(DispatcherServlet.java:942)\r\n at org.springframework.web.servlet.FrameworkServlet.processRequest(FrameworkServlet.java:998)\r\n at org.springframework.web.servlet.FrameworkServlet.doPost(FrameworkServlet.java:901)\r\n at javax.servlet.http.HttpServlet.service(HttpServlet.java:660)\r\n at org.springframework.web.servlet.FrameworkServlet.service(FrameworkServlet.java:875)\r\n at javax.servlet.http.HttpServlet.service(HttpServlet.java:741)\r\n at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:231)\r\n at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166)\r\n at org.apache.tomcat.websocket.server.WsFilter.doFilter(WsFilter.java:53)\r\n at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193)\r\n at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166)\r\n at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:101)\r\n at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193)\r\n at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166)\r\n at com.alibaba.druid.support.http.WebStatFilter.doFilter(WebStatFilter.java:123)\r\n at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193)\r\n at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166)\r\n at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:320)\r\n at org.springframework.security.web.access.intercept.FilterSecurityInterceptor.invoke(FilterSecurityInterceptor.java:127)\r\n at org.springframework.security.web.access.intercept.FilterSecurityInterceptor.doFilter(FilterSecurityInterceptor.java:91)\r\n at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334)\r\n at org.springframework.security.web.access.ExceptionTranslationFilter.doFilter(ExceptionTranslationFilter.java:119)\r\n at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334)\r\n at org.springframework.security.web.session.SessionManagementFilter.doFilter(SessionManagementFilter.java:137)\r\n at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334)\r\n at org.springframework.security.web.authentication.AnonymousAuthenticationFilter.doFilter(AnonymousAuthenticationFilter.java:111)\r\n at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334)\r\n at org.springframework.security.web.servletapi.SecurityContextHolderAwareRequestFilter.doFilter(SecurityContextHolderAwareRequestFilter.java:170)\r\n at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334)\r\n at org.springframework.security.web.savedrequest.RequestCacheAwareFilter.doFilter(RequestCacheAwareFilter.java:63)\r\n at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334)\r\n at co.yixiang.modules.security.security.JwtAuthorizationTokenFilter.doFilterInternal(JwtAuthorizationTokenFilter.java:67)\r\n at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:107)\r\n at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334)\r\n at org.springframework.security.web.authentication.logout.LogoutFilter.doFilter(LogoutFilter.java:116)\r\n at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334)\r\n at org.springframework.security.web.header.HeaderWriterFilter.doFilterInternal(HeaderWriterFilter.java:66)\r\n at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:107)\r\n at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334)\r\n at org.springframework.security.web.context.SecurityContextPersistenceFilter.doFilter(SecurityContextPersistenceFilter.java:105)\r\n at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334)\r\n at org.springframework.security.web.context.request.async.WebAsyncManagerIntegrationFilter.doFilterInternal(WebAsyncManagerIntegrationFilter.java:56)\r\n at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:107)\r\n at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334)\r\n at org.springframework.security.web.FilterChainProxy.doFilterInternal(FilterChainProxy.java:215)\r\n at org.springframework.security.web.FilterChainProxy.doFilter(FilterChainProxy.java:178)\r\n at org.springframework.web.filter.DelegatingFilterProxy.invokeDelegate(DelegatingFilterProxy.java:357)\r\n at org.springframework.web.filter.DelegatingFilterProxy.doFilter(DelegatingFilterProxy.java:270)\r\n at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193)\r\n at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166)\r\n at org.springframework.web.filter.CharacterEncodingFilter.doFilterInternal(CharacterEncodingFilter.java:200)\r\n at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:107)\r\n at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193)\r\n at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166)\r\n at org.apache.catalina.core.StandardWrapperValve.invoke(StandardWrapperValve.java:199)\r\n at org.apache.catalina.core.StandardContextValve.invoke(StandardContextValve.java:96)\r\n at org.apache.catalina.authenticator.AuthenticatorBase.invoke(AuthenticatorBase.java:490)\r\n at org.apache.catalina.core.StandardHostValve.invoke(StandardHostValve.java:139)\r\n at org.apache.catalina.valves.ErrorReportValve.invoke(ErrorReportValve.java:92)\r\n at org.apache.catalina.core.StandardEngineValve.invoke(StandardEngineValve.java:74)\r\n at org.apache.catalina.connector.CoyoteAdapter.service(CoyoteAdapter.java:343)\r\n at org.apache.coyote.http11.Http11Processor.service(Http11Processor.java:408)\r\n at org.apache.coyote.AbstractProcessorLight.process(AbstractProcessorLight.java:66)\r\n at org.apache.coyote.AbstractProtocol$ConnectionHandler.process(AbstractProtocol.java:770)\r\n at org.apache.tomcat.util.net.NioEndpoint$SocketProcessor.doRun(NioEndpoint.java:1415)\r\n at org.apache.tomcat.util.net.SocketProcessorBase.run(SocketProcessorBase.java:49)\r\n at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1149)\r\n at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:624)\r\n at org.apache.tomcat.util.threads.TaskThread$WrappingRunnable.run(TaskThread.java:61)\r\n at java.lang.Thread.run(Thread.java:748)\r\n', 'ERROR', 'co.yixiang.modules.system.rest.MenuController.create()', '{ resources: co.yixiang.modules.system.domain.Menu@1f }', '127.0.0.1', 0, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17436, '2019-12-11 17:28:38', '新增菜单', NULL, 'INFO', 'co.yixiang.modules.system.rest.MenuController.create()', '{ resources: co.yixiang.modules.system.domain.Menu@6f }', '127.0.0.1', 189, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17437, '2019-12-11 17:28:38', '查询菜单', NULL, 'INFO', 'co.yixiang.modules.system.rest.MenuController.getMenus()', '{ criteria: MenuQueryCriteria(blurry=null) }', '127.0.0.1', 121, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17438, '2019-12-11 17:28:55', '查询角色', NULL, 'INFO', 'co.yixiang.modules.system.rest.RoleController.getRoles()', '{ criteria: RoleQueryCriteria(blurry=null) pageable: Page request [number: 0, size 10, sort: level: ASC] }', '127.0.0.1', 27, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17439, '2019-12-11 17:29:01', '修改角色菜单', NULL, 'INFO', 'co.yixiang.modules.system.rest.RoleController.updateMenu()', '{ resources: Role{id=1, name=\'null\', remark=\'null\', createDateTime=null} }', '127.0.0.1', 277, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17440, '2019-12-11 17:29:06', '查询菜单', NULL, 'INFO', 'co.yixiang.modules.system.rest.MenuController.getMenus()', '{ criteria: MenuQueryCriteria(blurry=null) }', '127.0.0.1', 3, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17441, '2019-12-11 17:29:34', '查询YxUserBill', 'org.springframework.dao.InvalidDataAccessResourceUsageException: could not extract ResultSet; SQL [n/a]; nested exception is org.hibernate.exception.SQLGrammarException: could not extract ResultSet\r\n at org.springframework.orm.jpa.vendor.HibernateJpaDialect.convertHibernateAccessException(HibernateJpaDialect.java:279)\r\n at org.springframework.orm.jpa.vendor.HibernateJpaDialect.translateExceptionIfPossible(HibernateJpaDialect.java:253)\r\n at org.springframework.orm.jpa.AbstractEntityManagerFactoryBean.translateExceptionIfPossible(AbstractEntityManagerFactoryBean.java:527)\r\n at org.springframework.dao.support.ChainedPersistenceExceptionTranslator.translateExceptionIfPossible(ChainedPersistenceExceptionTranslator.java:61)\r\n at org.springframework.dao.support.DataAccessUtils.translateIfNecessary(DataAccessUtils.java:242)\r\n at org.springframework.dao.support.PersistenceExceptionTranslationInterceptor.invoke(PersistenceExceptionTranslationInterceptor.java:153)\r\n at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:186)\r\n at org.springframework.data.jpa.repository.support.CrudMethodMetadataPostProcessor$CrudMethodMetadataPopulatingMethodInterceptor.invoke(CrudMethodMetadataPostProcessor.java:135)\r\n at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:186)\r\n at org.springframework.aop.interceptor.ExposeInvocationInterceptor.invoke(ExposeInvocationInterceptor.java:93)\r\n at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:186)\r\n at org.springframework.data.repository.core.support.SurroundingTransactionDetectorMethodInterceptor.invoke(SurroundingTransactionDetectorMethodInterceptor.java:61)\r\n at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:186)\r\n at org.springframework.aop.framework.JdkDynamicAopProxy.invoke(JdkDynamicAopProxy.java:212)\r\n at com.sun.proxy.$Proxy159.findAllByPageable(Unknown Source)\r\n at co.yixiang.modules.shop.service.impl.YxUserBillServiceImpl.queryAll(YxUserBillServiceImpl.java:42)\r\n at co.yixiang.modules.shop.service.impl.YxUserBillServiceImpl$$FastClassBySpringCGLIB$$1f04d7c9.invoke()\r\n at org.springframework.cglib.proxy.MethodProxy.invoke(MethodProxy.java:218)\r\n at org.springframework.aop.framework.CglibAopProxy$CglibMethodInvocation.invokeJoinpoint(CglibAopProxy.java:746)\r\n at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:163)\r\n at org.springframework.transaction.interceptor.TransactionAspectSupport.invokeWithinTransaction(TransactionAspectSupport.java:294)\r\n at org.springframework.transaction.interceptor.TransactionInterceptor.invoke(TransactionInterceptor.java:98)\r\n at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:186)\r\n at org.springframework.aop.framework.CglibAopProxy$DynamicAdvisedInterceptor.intercept(CglibAopProxy.java:688)\r\n at co.yixiang.modules.shop.service.impl.YxUserBillServiceImpl$$EnhancerBySpringCGLIB$$280a3154.queryAll()\r\n at co.yixiang.modules.shop.rest.YxUserBillController.getYxUserBills(YxUserBillController.java:33)\r\n at co.yixiang.modules.shop.rest.YxUserBillController$$FastClassBySpringCGLIB$$8a2e628d.invoke()\r\n at org.springframework.cglib.proxy.MethodProxy.invoke(MethodProxy.java:218)\r\n at org.springframework.aop.framework.CglibAopProxy$CglibMethodInvocation.invokeJoinpoint(CglibAopProxy.java:746)\r\n at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:163)\r\n at org.springframework.aop.aspectj.MethodInvocationProceedingJoinPoint.proceed(MethodInvocationProceedingJoinPoint.java:88)\r\n at co.yixiang.aspect.LogAspect.logAround(LogAspect.java:50)\r\n at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)\r\n at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)\r\n at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)\r\n at java.lang.reflect.Method.invoke(Method.java:498)\r\n at org.springframework.aop.aspectj.AbstractAspectJAdvice.invokeAdviceMethodWithGivenArgs(AbstractAspectJAdvice.java:644)\r\n at org.springframework.aop.aspectj.AbstractAspectJAdvice.invokeAdviceMethod(AbstractAspectJAdvice.java:633)\r\n at org.springframework.aop.aspectj.AspectJAroundAdvice.invoke(AspectJAroundAdvice.java:70)\r\n at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:175)\r\n at org.springframework.aop.aspectj.AspectJAfterThrowingAdvice.invoke(AspectJAfterThrowingAdvice.java:62)\r\n at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:175)\r\n at org.springframework.security.access.intercept.aopalliance.MethodSecurityInterceptor.invoke(MethodSecurityInterceptor.java:69)\r\n at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:186)\r\n at org.springframework.aop.interceptor.ExposeInvocationInterceptor.invoke(ExposeInvocationInterceptor.java:93)\r\n at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:186)\r\n at org.springframework.aop.framework.CglibAopProxy$DynamicAdvisedInterceptor.intercept(CglibAopProxy.java:688)\r\n at co.yixiang.modules.shop.rest.YxUserBillController$$EnhancerBySpringCGLIB$$6d3a073f.getYxUserBills()\r\n at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)\r\n at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)\r\n at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)\r\n at java.lang.reflect.Method.invoke(Method.java:498)\r\n at org.springframework.web.method.support.InvocableHandlerMethod.doInvoke(InvocableHandlerMethod.java:215)\r\n at org.springframework.web.method.support.InvocableHandlerMethod.invokeForRequest(InvocableHandlerMethod.java:142)\r\n at org.springframework.web.servlet.mvc.method.annotation.ServletInvocableHandlerMethod.invokeAndHandle(ServletInvocableHandlerMethod.java:102)\r\n at org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter.invokeHandlerMethod(RequestMappingHandlerAdapter.java:895)\r\n at org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter.handleInternal(RequestMappingHandlerAdapter.java:800)\r\n at org.springframework.web.servlet.mvc.method.AbstractHandlerMethodAdapter.handle(AbstractHandlerMethodAdapter.java:87)\r\n at org.springframework.web.servlet.DispatcherServlet.doDispatch(DispatcherServlet.java:1038)\r\n at org.springframework.web.servlet.DispatcherServlet.doService(DispatcherServlet.java:942)\r\n at org.springframework.web.servlet.FrameworkServlet.processRequest(FrameworkServlet.java:998)\r\n at org.springframework.web.servlet.FrameworkServlet.doGet(FrameworkServlet.java:890)\r\n at javax.servlet.http.HttpServlet.service(HttpServlet.java:634)\r\n at org.springframework.web.servlet.FrameworkServlet.service(FrameworkServlet.java:875)\r\n at javax.servlet.http.HttpServlet.service(HttpServlet.java:741)\r\n at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:231)\r\n at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166)\r\n at org.apache.tomcat.websocket.server.WsFilter.doFilter(WsFilter.java:53)\r\n at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193)\r\n at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166)\r\n at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:101)\r\n at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193)\r\n at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166)\r\n at com.alibaba.druid.support.http.WebStatFilter.doFilter(WebStatFilter.java:123)\r\n at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193)\r\n at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166)\r\n at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:320)\r\n at org.springframework.security.web.access.intercept.FilterSecurityInterceptor.invoke(FilterSecurityInterceptor.java:127)\r\n at org.springframework.security.web.access.intercept.FilterSecurityInterceptor.doFilter(FilterSecurityInterceptor.java:91)\r\n at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334)\r\n at org.springframework.security.web.access.ExceptionTranslationFilter.doFilter(ExceptionTranslationFilter.java:119)\r\n at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334)\r\n at org.springframework.security.web.session.SessionManagementFilter.doFilter(SessionManagementFilter.java:137)\r\n at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334)\r\n at org.springframework.security.web.authentication.AnonymousAuthenticationFilter.doFilter(AnonymousAuthenticationFilter.java:111)\r\n at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334)\r\n at org.springframework.security.web.servletapi.SecurityContextHolderAwareRequestFilter.doFilter(SecurityContextHolderAwareRequestFilter.java:170)\r\n at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334)\r\n at org.springframework.security.web.savedrequest.RequestCacheAwareFilter.doFilter(RequestCacheAwareFilter.java:63)\r\n at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334)\r\n at co.yixiang.modules.security.security.JwtAuthorizationTokenFilter.doFilterInternal(JwtAuthorizationTokenFilter.java:67)\r\n at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:107)\r\n at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334)\r\n at org.springframework.security.web.authentication.logout.LogoutFilter.doFilter(LogoutFilter.java:116)\r\n at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334)\r\n at org.springframework.security.web.header.HeaderWriterFilter.doFilterInternal(HeaderWriterFilter.java:66)\r\n at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:107)\r\n at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334)\r\n at org.springframework.security.web.context.SecurityContextPersistenceFilter.doFilter(SecurityContextPersistenceFilter.java:105)\r\n at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334)\r\n at org.springframework.security.web.context.request.async.WebAsyncManagerIntegrationFilter.doFilterInternal(WebAsyncManagerIntegrationFilter.java:56)\r\n at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:107)\r\n at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334)\r\n at org.springframework.security.web.FilterChainProxy.doFilterInternal(FilterChainProxy.java:215)\r\n at org.springframework.security.web.FilterChainProxy.doFilter(FilterChainProxy.java:178)\r\n at org.springframework.web.filter.DelegatingFilterProxy.invokeDelegate(DelegatingFilterProxy.java:357)\r\n at org.springframework.web.filter.DelegatingFilterProxy.doFilter(DelegatingFilterProxy.java:270)\r\n at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193)\r\n at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166)\r\n at org.springframework.web.filter.CharacterEncodingFilter.doFilterInternal(CharacterEncodingFilter.java:200)\r\n at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:107)\r\n at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193)\r\n at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166)\r\n at org.apache.catalina.core.StandardWrapperValve.invoke(StandardWrapperValve.java:199)\r\n at org.apache.catalina.core.StandardContextValve.invoke(StandardContextValve.java:96)\r\n at org.apache.catalina.authenticator.AuthenticatorBase.invoke(AuthenticatorBase.java:490)\r\n at org.apache.catalina.core.StandardHostValve.invoke(StandardHostValve.java:139)\r\n at org.apache.catalina.valves.ErrorReportValve.invoke(ErrorReportValve.java:92)\r\n at org.apache.catalina.core.StandardEngineValve.invoke(StandardEngineValve.java:74)\r\n at org.apache.catalina.connector.CoyoteAdapter.service(CoyoteAdapter.java:343)\r\n at org.apache.coyote.http11.Http11Processor.service(Http11Processor.java:408)\r\n at org.apache.coyote.AbstractProcessorLight.process(AbstractProcessorLight.java:66)\r\n at org.apache.coyote.AbstractProtocol$ConnectionHandler.process(AbstractProtocol.java:770)\r\n at org.apache.tomcat.util.net.NioEndpoint$SocketProcessor.doRun(NioEndpoint.java:1415)\r\n at org.apache.tomcat.util.net.SocketProcessorBase.run(SocketProcessorBase.java:49)\r\n at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1149)\r\n at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:624)\r\n at org.apache.tomcat.util.threads.TaskThread$WrappingRunnable.run(TaskThread.java:61)\r\n at java.lang.Thread.run(Thread.java:748)\r\nCaused by: org.hibernate.exception.SQLGrammarException: could not extract ResultSet\r\n at org.hibernate.exception.internal.SQLExceptionTypeDelegate.convert(SQLExceptionTypeDelegate.java:63)\r\n at org.hibernate.exception.internal.StandardSQLExceptionConverter.convert(StandardSQLExceptionConverter.java:42)\r\n at org.hibernate.engine.jdbc.spi.SqlExceptionHelper.convert(SqlExceptionHelper.java:113)\r\n at org.hibernate.engine.jdbc.spi.SqlExceptionHelper.convert(SqlExceptionHelper.java:99)\r\n at org.hibernate.engine.jdbc.internal.ResultSetReturnImpl.extract(ResultSetReturnImpl.java:69)\r\n at org.hibernate.loader.Loader.getResultSet(Loader.java:2167)\r\n at org.hibernate.loader.Loader.executeQueryStatement(Loader.java:1930)\r\n at org.hibernate.loader.Loader.executeQueryStatement(Loader.java:1892)\r\n at org.hibernate.loader.Loader.doQuery(Loader.java:937)\r\n at org.hibernate.loader.Loader.doQueryAndInitializeNonLazyCollections(Loader.java:340)\r\n at org.hibernate.loader.Loader.doList(Loader.java:2689)\r\n at org.hibernate.loader.Loader.doList(Loader.java:2672)\r\n at org.hibernate.loader.Loader.listIgnoreQueryCache(Loader.java:2506)\r\n at org.hibernate.loader.Loader.list(Loader.java:2501)\r\n at org.hibernate.loader.custom.CustomLoader.list(CustomLoader.java:338)\r\n at org.hibernate.internal.SessionImpl.listCustomQuery(SessionImpl.java:2223)\r\n at org.hibernate.internal.AbstractSharedSessionContract.list(AbstractSharedSessionContract.java:1053)\r\n at org.hibernate.query.internal.NativeQueryImpl.doList(NativeQueryImpl.java:170)\r\n at org.hibernate.query.internal.AbstractProducedQuery.list(AbstractProducedQuery.java:1505)\r\n at org.hibernate.query.Query.getResultList(Query.java:135)\r\n at org.springframework.data.jpa.repository.query.JpaQueryExecution$PagedExecution.doExecute(JpaQueryExecution.java:194)\r\n at org.springframework.data.jpa.repository.query.JpaQueryExecution.execute(JpaQueryExecution.java:91)\r\n at org.springframework.data.jpa.repository.query.AbstractJpaQuery.doExecute(AbstractJpaQuery.java:136)\r\n at org.springframework.data.jpa.repository.query.AbstractJpaQuery.execute(AbstractJpaQuery.java:125)\r\n at org.springframework.data.repository.core.support.RepositoryFactorySupport$QueryExecutorMethodInterceptor.doInvoke(RepositoryFactorySupport.java:605)\r\n at org.springframework.data.repository.core.support.RepositoryFactorySupport$QueryExecutorMethodInterceptor.lambda$invoke$3(RepositoryFactorySupport.java:595)\r\n at org.springframework.data.repository.core.support.RepositoryFactorySupport$QueryExecutorMethodInterceptor.invoke(RepositoryFactorySupport.java:595)\r\n at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:186)\r\n at org.springframework.data.projection.DefaultMethodInvokingMethodInterceptor.invoke(DefaultMethodInvokingMethodInterceptor.java:59)\r\n at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:186)\r\n at org.springframework.transaction.interceptor.TransactionAspectSupport.invokeWithinTransaction(TransactionAspectSupport.java:294)\r\n at org.springframework.transaction.interceptor.TransactionInterceptor.invoke(TransactionInterceptor.java:98)\r\n at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:186)\r\n at org.springframework.dao.support.PersistenceExceptionTranslationInterceptor.invoke(PersistenceExceptionTranslationInterceptor.java:139)\r\n ... 123 more\r\nCaused by: java.sql.SQLSyntaxErrorException: Unknown column \'ORDER.id\' in \'order clause\'\r\n at com.mysql.cj.jdbc.exceptions.SQLError.createSQLException(SQLError.java:120)\r\n at com.mysql.cj.jdbc.exceptions.SQLError.createSQLException(SQLError.java:97)\r\n at com.mysql.cj.jdbc.exceptions.SQLExceptionsMapping.translateException(SQLExceptionsMapping.java:122)\r\n at com.mysql.cj.jdbc.ClientPreparedStatement.executeInternal(ClientPreparedStatement.java:974)\r\n at com.mysql.cj.jdbc.ClientPreparedStatement.executeQuery(ClientPreparedStatement.java:1024)\r\n at net.sf.log4jdbc.sql.jdbcapi.PreparedStatementSpy.executeQuery(PreparedStatementSpy.java:780)\r\n at com.alibaba.druid.filter.FilterChainImpl.preparedStatement_executeQuery(FilterChainImpl.java:3188)\r\n at com.alibaba.druid.filter.FilterEventAdapter.preparedStatement_executeQuery(FilterEventAdapter.java:465)\r\n at com.alibaba.druid.filter.FilterChainImpl.preparedStatement_executeQuery(FilterChainImpl.java:3185)\r\n at com.alibaba.druid.proxy.jdbc.PreparedStatementProxyImpl.executeQuery(PreparedStatementProxyImpl.java:181)\r\n at com.alibaba.druid.pool.DruidPooledPreparedStatement.executeQuery(DruidPooledPreparedStatement.java:228)\r\n at org.hibernate.engine.jdbc.internal.ResultSetReturnImpl.extract(ResultSetReturnImpl.java:60)\r\n ... 152 more\r\n', 'ERROR', 'co.yixiang.modules.shop.rest.YxUserBillController.getYxUserBills()', '{ criteria: YxUserBillQueryCriteria() pageable: Page request [number: 0, size 10, sort: id: DESC] }', '127.0.0.1', 253, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17442, '2019-12-11 17:38:40', '查询YxUserBill', NULL, 'INFO', 'co.yixiang.modules.shop.rest.YxUserBillController.getYxUserBills()', '{ criteria: YxUserBillQueryCriteria() pageable: Page request [number: 0, size 10, sort: UNSORTED] }', '127.0.0.1', 240, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17443, '2019-12-11 17:38:52', '查询YxUserBill', NULL, 'INFO', 'co.yixiang.modules.shop.rest.YxUserBillController.getYxUserBills()', '{ criteria: YxUserBillQueryCriteria() pageable: Page request [number: 0, size 10, sort: UNSORTED] }', '127.0.0.1', 19, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17444, '2019-12-11 17:42:16', '查询YxUserBill', NULL, 'INFO', 'co.yixiang.modules.shop.rest.YxUserBillController.getYxUserBills()', '{ criteria: YxUserBillQueryCriteria() pageable: Page request [number: 0, size 10, sort: UNSORTED] }', '127.0.0.1', 81, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17445, '2019-12-11 17:44:34', '查询YxUserBill', NULL, 'INFO', 'co.yixiang.modules.shop.rest.YxUserBillController.getYxUserBills()', '{ criteria: YxUserBillQueryCriteria() pageable: Page request [number: 0, size 10, sort: UNSORTED] }', '127.0.0.1', 80, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17446, '2019-12-11 17:49:37', '查询YxUserBill', NULL, 'INFO', 'co.yixiang.modules.shop.rest.YxUserBillController.getYxUserBills()', '{ criteria: YxUserBillQueryCriteria() pageable: Page request [number: 0, size 10, sort: UNSORTED] }', '127.0.0.1', 142, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17447, '2019-12-11 17:49:51', '查询YxUserBill', NULL, 'INFO', 'co.yixiang.modules.shop.rest.YxUserBillController.getYxUserBills()', '{ criteria: YxUserBillQueryCriteria() pageable: Page request [number: 1, size 10, sort: UNSORTED] }', '127.0.0.1', 14, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17448, '2019-12-11 18:29:18', '查询YxUserBill', 'org.springframework.orm.jpa.JpaSystemException: Encountered a duplicated sql alias [uid] during auto-discovery of a native-sql query; nested exception is org.hibernate.loader.custom.NonUniqueDiscoveredSqlAliasException: Encountered a duplicated sql alias [uid] during auto-discovery of a native-sql query\r\n at org.springframework.orm.jpa.vendor.HibernateJpaDialect.convertHibernateAccessException(HibernateJpaDialect.java:351)\r\n at org.springframework.orm.jpa.vendor.HibernateJpaDialect.translateExceptionIfPossible(HibernateJpaDialect.java:253)\r\n at org.springframework.orm.jpa.AbstractEntityManagerFactoryBean.translateExceptionIfPossible(AbstractEntityManagerFactoryBean.java:527)\r\n at org.springframework.dao.support.ChainedPersistenceExceptionTranslator.translateExceptionIfPossible(ChainedPersistenceExceptionTranslator.java:61)\r\n at org.springframework.dao.support.DataAccessUtils.translateIfNecessary(DataAccessUtils.java:242)\r\n at org.springframework.dao.support.PersistenceExceptionTranslationInterceptor.invoke(PersistenceExceptionTranslationInterceptor.java:153)\r\n at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:186)\r\n at org.springframework.data.jpa.repository.support.CrudMethodMetadataPostProcessor$CrudMethodMetadataPopulatingMethodInterceptor.invoke(CrudMethodMetadataPostProcessor.java:135)\r\n at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:186)\r\n at org.springframework.aop.interceptor.ExposeInvocationInterceptor.invoke(ExposeInvocationInterceptor.java:93)\r\n at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:186)\r\n at org.springframework.data.repository.core.support.SurroundingTransactionDetectorMethodInterceptor.invoke(SurroundingTransactionDetectorMethodInterceptor.java:61)\r\n at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:186)\r\n at org.springframework.aop.framework.JdkDynamicAopProxy.invoke(JdkDynamicAopProxy.java:212)\r\n at com.sun.proxy.$Proxy159.findAllByPageable(Unknown Source)\r\n at co.yixiang.modules.shop.service.impl.YxUserBillServiceImpl.queryAll(YxUserBillServiceImpl.java:42)\r\n at co.yixiang.modules.shop.service.impl.YxUserBillServiceImpl$$FastClassBySpringCGLIB$$1f04d7c9.invoke()\r\n at org.springframework.cglib.proxy.MethodProxy.invoke(MethodProxy.java:218)\r\n at org.springframework.aop.framework.CglibAopProxy$CglibMethodInvocation.invokeJoinpoint(CglibAopProxy.java:746)\r\n at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:163)\r\n at org.springframework.transaction.interceptor.TransactionAspectSupport.invokeWithinTransaction(TransactionAspectSupport.java:294)\r\n at org.springframework.transaction.interceptor.TransactionInterceptor.invoke(TransactionInterceptor.java:98)\r\n at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:186)\r\n at org.springframework.aop.framework.CglibAopProxy$DynamicAdvisedInterceptor.intercept(CglibAopProxy.java:688)\r\n at co.yixiang.modules.shop.service.impl.YxUserBillServiceImpl$$EnhancerBySpringCGLIB$$b9a4ad34.queryAll()\r\n at co.yixiang.modules.shop.rest.YxUserBillController.getYxUserBills(YxUserBillController.java:33)\r\n at co.yixiang.modules.shop.rest.YxUserBillController$$FastClassBySpringCGLIB$$8a2e628d.invoke()\r\n at org.springframework.cglib.proxy.MethodProxy.invoke(MethodProxy.java:218)\r\n at org.springframework.aop.framework.CglibAopProxy$CglibMethodInvocation.invokeJoinpoint(CglibAopProxy.java:746)\r\n at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:163)\r\n at org.springframework.aop.aspectj.MethodInvocationProceedingJoinPoint.proceed(MethodInvocationProceedingJoinPoint.java:88)\r\n at co.yixiang.aspect.LogAspect.logAround(LogAspect.java:50)\r\n at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)\r\n at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)\r\n at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)\r\n at java.lang.reflect.Method.invoke(Method.java:498)\r\n at org.springframework.aop.aspectj.AbstractAspectJAdvice.invokeAdviceMethodWithGivenArgs(AbstractAspectJAdvice.java:644)\r\n at org.springframework.aop.aspectj.AbstractAspectJAdvice.invokeAdviceMethod(AbstractAspectJAdvice.java:633)\r\n at org.springframework.aop.aspectj.AspectJAroundAdvice.invoke(AspectJAroundAdvice.java:70)\r\n at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:175)\r\n at org.springframework.aop.aspectj.AspectJAfterThrowingAdvice.invoke(AspectJAfterThrowingAdvice.java:62)\r\n at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:175)\r\n at org.springframework.security.access.intercept.aopalliance.MethodSecurityInterceptor.invoke(MethodSecurityInterceptor.java:69)\r\n at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:186)\r\n at org.springframework.aop.interceptor.ExposeInvocationInterceptor.invoke(ExposeInvocationInterceptor.java:93)\r\n at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:186)\r\n at org.springframework.aop.framework.CglibAopProxy$DynamicAdvisedInterceptor.intercept(CglibAopProxy.java:688)\r\n at co.yixiang.modules.shop.rest.YxUserBillController$$EnhancerBySpringCGLIB$$8e91038f.getYxUserBills()\r\n at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)\r\n at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)\r\n at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)\r\n at java.lang.reflect.Method.invoke(Method.java:498)\r\n at org.springframework.web.method.support.InvocableHandlerMethod.doInvoke(InvocableHandlerMethod.java:215)\r\n at org.springframework.web.method.support.InvocableHandlerMethod.invokeForRequest(InvocableHandlerMethod.java:142)\r\n at org.springframework.web.servlet.mvc.method.annotation.ServletInvocableHandlerMethod.invokeAndHandle(ServletInvocableHandlerMethod.java:102)\r\n at org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter.invokeHandlerMethod(RequestMappingHandlerAdapter.java:895)\r\n at org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter.handleInternal(RequestMappingHandlerAdapter.java:800)\r\n at org.springframework.web.servlet.mvc.method.AbstractHandlerMethodAdapter.handle(AbstractHandlerMethodAdapter.java:87)\r\n at org.springframework.web.servlet.DispatcherServlet.doDispatch(DispatcherServlet.java:1038)\r\n at org.springframework.web.servlet.DispatcherServlet.doService(DispatcherServlet.java:942)\r\n at org.springframework.web.servlet.FrameworkServlet.processRequest(FrameworkServlet.java:998)\r\n at org.springframework.web.servlet.FrameworkServlet.doGet(FrameworkServlet.java:890)\r\n at javax.servlet.http.HttpServlet.service(HttpServlet.java:634)\r\n at org.springframework.web.servlet.FrameworkServlet.service(FrameworkServlet.java:875)\r\n at javax.servlet.http.HttpServlet.service(HttpServlet.java:741)\r\n at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:231)\r\n at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166)\r\n at org.apache.tomcat.websocket.server.WsFilter.doFilter(WsFilter.java:53)\r\n at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193)\r\n at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166)\r\n at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:101)\r\n at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193)\r\n at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166)\r\n at com.alibaba.druid.support.http.WebStatFilter.doFilter(WebStatFilter.java:123)\r\n at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193)\r\n at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166)\r\n at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:320)\r\n at org.springframework.security.web.access.intercept.FilterSecurityInterceptor.invoke(FilterSecurityInterceptor.java:127)\r\n at org.springframework.security.web.access.intercept.FilterSecurityInterceptor.doFilter(FilterSecurityInterceptor.java:91)\r\n at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334)\r\n at org.springframework.security.web.access.ExceptionTranslationFilter.doFilter(ExceptionTranslationFilter.java:119)\r\n at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334)\r\n at org.springframework.security.web.session.SessionManagementFilter.doFilter(SessionManagementFilter.java:137)\r\n at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334)\r\n at org.springframework.security.web.authentication.AnonymousAuthenticationFilter.doFilter(AnonymousAuthenticationFilter.java:111)\r\n at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334)\r\n at org.springframework.security.web.servletapi.SecurityContextHolderAwareRequestFilter.doFilter(SecurityContextHolderAwareRequestFilter.java:170)\r\n at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334)\r\n at org.springframework.security.web.savedrequest.RequestCacheAwareFilter.doFilter(RequestCacheAwareFilter.java:63)\r\n at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334)\r\n at co.yixiang.modules.security.security.JwtAuthorizationTokenFilter.doFilterInternal(JwtAuthorizationTokenFilter.java:67)\r\n at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:107)\r\n at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334)\r\n at org.springframework.security.web.authentication.logout.LogoutFilter.doFilter(LogoutFilter.java:116)\r\n at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334)\r\n at org.springframework.security.web.header.HeaderWriterFilter.doFilterInternal(HeaderWriterFilter.java:66)\r\n at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:107)\r\n at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334)\r\n at org.springframework.security.web.context.SecurityContextPersistenceFilter.doFilter(SecurityContextPersistenceFilter.java:105)\r\n at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334)\r\n at org.springframework.security.web.context.request.async.WebAsyncManagerIntegrationFilter.doFilterInternal(WebAsyncManagerIntegrationFilter.java:56)\r\n at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:107)\r\n at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334)\r\n at org.springframework.security.web.FilterChainProxy.doFilterInternal(FilterChainProxy.java:215)\r\n at org.springframework.security.web.FilterChainProxy.doFilter(FilterChainProxy.java:178)\r\n at org.springframework.web.filter.DelegatingFilterProxy.invokeDelegate(DelegatingFilterProxy.java:357)\r\n at org.springframework.web.filter.DelegatingFilterProxy.doFilter(DelegatingFilterProxy.java:270)\r\n at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193)\r\n at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166)\r\n at org.springframework.web.filter.CharacterEncodingFilter.doFilterInternal(CharacterEncodingFilter.java:200)\r\n at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:107)\r\n at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193)\r\n at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166)\r\n at org.apache.catalina.core.StandardWrapperValve.invoke(StandardWrapperValve.java:199)\r\n at org.apache.catalina.core.StandardContextValve.invoke(StandardContextValve.java:96)\r\n at org.apache.catalina.authenticator.AuthenticatorBase.invoke(AuthenticatorBase.java:490)\r\n at org.apache.catalina.core.StandardHostValve.invoke(StandardHostValve.java:139)\r\n at org.apache.catalina.valves.ErrorReportValve.invoke(ErrorReportValve.java:92)\r\n at org.apache.catalina.core.StandardEngineValve.invoke(StandardEngineValve.java:74)\r\n at org.apache.catalina.connector.CoyoteAdapter.service(CoyoteAdapter.java:343)\r\n at org.apache.coyote.http11.Http11Processor.service(Http11Processor.java:408)\r\n at org.apache.coyote.AbstractProcessorLight.process(AbstractProcessorLight.java:66)\r\n at org.apache.coyote.AbstractProtocol$ConnectionHandler.process(AbstractProtocol.java:770)\r\n at org.apache.tomcat.util.net.NioEndpoint$SocketProcessor.doRun(NioEndpoint.java:1415)\r\n at org.apache.tomcat.util.net.SocketProcessorBase.run(SocketProcessorBase.java:49)\r\n at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1149)\r\n at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:624)\r\n at org.apache.tomcat.util.threads.TaskThread$WrappingRunnable.run(TaskThread.java:61)\r\n at java.lang.Thread.run(Thread.java:748)\r\nCaused by: org.hibernate.loader.custom.NonUniqueDiscoveredSqlAliasException: Encountered a duplicated sql alias [uid] during auto-discovery of a native-sql query\r\n at org.hibernate.loader.custom.CustomLoader.validateAliases(CustomLoader.java:520)\r\n at org.hibernate.loader.custom.CustomLoader.autoDiscoverTypes(CustomLoader.java:497)\r\n at org.hibernate.loader.Loader.processResultSet(Loader.java:2213)\r\n at org.hibernate.loader.Loader.getResultSet(Loader.java:2169)\r\n at org.hibernate.loader.Loader.executeQueryStatement(Loader.java:1930)\r\n at org.hibernate.loader.Loader.executeQueryStatement(Loader.java:1892)\r\n at org.hibernate.loader.Loader.doQuery(Loader.java:937)\r\n at org.hibernate.loader.Loader.doQueryAndInitializeNonLazyCollections(Loader.java:340)\r\n at org.hibernate.loader.Loader.doList(Loader.java:2689)\r\n at org.hibernate.loader.Loader.doList(Loader.java:2672)\r\n at org.hibernate.loader.Loader.listIgnoreQueryCache(Loader.java:2506)\r\n at org.hibernate.loader.Loader.list(Loader.java:2501)\r\n at org.hibernate.loader.custom.CustomLoader.list(CustomLoader.java:338)\r\n at org.hibernate.internal.SessionImpl.listCustomQuery(SessionImpl.java:2223)\r\n at org.hibernate.internal.AbstractSharedSessionContract.list(AbstractSharedSessionContract.java:1053)\r\n at org.hibernate.query.internal.NativeQueryImpl.doList(NativeQueryImpl.java:170)\r\n at org.hibernate.query.internal.AbstractProducedQuery.list(AbstractProducedQuery.java:1505)\r\n at org.hibernate.query.Query.getResultList(Query.java:135)\r\n at org.springframework.data.jpa.repository.query.JpaQueryExecution$PagedExecution.doExecute(JpaQueryExecution.java:194)\r\n at org.springframework.data.jpa.repository.query.JpaQueryExecution.execute(JpaQueryExecution.java:91)\r\n at org.springframework.data.jpa.repository.query.AbstractJpaQuery.doExecute(AbstractJpaQuery.java:136)\r\n at org.springframework.data.jpa.repository.query.AbstractJpaQuery.execute(AbstractJpaQuery.java:125)\r\n at org.springframework.data.repository.core.support.RepositoryFactorySupport$QueryExecutorMethodInterceptor.doInvoke(RepositoryFactorySupport.java:605)\r\n at org.springframework.data.repository.core.support.RepositoryFactorySupport$QueryExecutorMethodInterceptor.lambda$invoke$3(RepositoryFactorySupport.java:595)\r\n at org.springframework.data.repository.core.support.RepositoryFactorySupport$QueryExecutorMethodInterceptor.invoke(RepositoryFactorySupport.java:595)\r\n at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:186)\r\n at org.springframework.data.projection.DefaultMethodInvokingMethodInterceptor.invoke(DefaultMethodInvokingMethodInterceptor.java:59)\r\n at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:186)\r\n at org.springframework.transaction.interceptor.TransactionAspectSupport.invokeWithinTransaction(TransactionAspectSupport.java:294)\r\n at org.springframework.transaction.interceptor.TransactionInterceptor.invoke(TransactionInterceptor.java:98)\r\n at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:186)\r\n at org.springframework.dao.support.PersistenceExceptionTranslationInterceptor.invoke(PersistenceExceptionTranslationInterceptor.java:139)\r\n ... 123 more\r\n', 'ERROR', 'co.yixiang.modules.shop.rest.YxUserBillController.getYxUserBills()', '{ criteria: YxUserBillQueryCriteria() pageable: Page request [number: 0, size 10, sort: UNSORTED] }', '127.0.0.1', 166, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17449, '2019-12-11 18:43:27', '查询YxUserBill', 'org.springframework.dao.InvalidDataAccessResourceUsageException: could not extract ResultSet; SQL [n/a]; nested exception is org.hibernate.exception.SQLGrammarException: could not extract ResultSet\r\n at org.springframework.orm.jpa.vendor.HibernateJpaDialect.convertHibernateAccessException(HibernateJpaDialect.java:279)\r\n at org.springframework.orm.jpa.vendor.HibernateJpaDialect.translateExceptionIfPossible(HibernateJpaDialect.java:253)\r\n at org.springframework.orm.jpa.AbstractEntityManagerFactoryBean.translateExceptionIfPossible(AbstractEntityManagerFactoryBean.java:527)\r\n at org.springframework.dao.support.ChainedPersistenceExceptionTranslator.translateExceptionIfPossible(ChainedPersistenceExceptionTranslator.java:61)\r\n at org.springframework.dao.support.DataAccessUtils.translateIfNecessary(DataAccessUtils.java:242)\r\n at org.springframework.dao.support.PersistenceExceptionTranslationInterceptor.invoke(PersistenceExceptionTranslationInterceptor.java:153)\r\n at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:186)\r\n at org.springframework.data.jpa.repository.support.CrudMethodMetadataPostProcessor$CrudMethodMetadataPopulatingMethodInterceptor.invoke(CrudMethodMetadataPostProcessor.java:135)\r\n at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:186)\r\n at org.springframework.aop.interceptor.ExposeInvocationInterceptor.invoke(ExposeInvocationInterceptor.java:93)\r\n at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:186)\r\n at org.springframework.data.repository.core.support.SurroundingTransactionDetectorMethodInterceptor.invoke(SurroundingTransactionDetectorMethodInterceptor.java:61)\r\n at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:186)\r\n at org.springframework.aop.framework.JdkDynamicAopProxy.invoke(JdkDynamicAopProxy.java:212)\r\n at com.sun.proxy.$Proxy159.findAllByPageable(Unknown Source)\r\n at co.yixiang.modules.shop.service.impl.YxUserBillServiceImpl.queryAll(YxUserBillServiceImpl.java:42)\r\n at co.yixiang.modules.shop.service.impl.YxUserBillServiceImpl$$FastClassBySpringCGLIB$$1f04d7c9.invoke()\r\n at org.springframework.cglib.proxy.MethodProxy.invoke(MethodProxy.java:218)\r\n at org.springframework.aop.framework.CglibAopProxy$CglibMethodInvocation.invokeJoinpoint(CglibAopProxy.java:746)\r\n at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:163)\r\n at org.springframework.transaction.interceptor.TransactionAspectSupport.invokeWithinTransaction(TransactionAspectSupport.java:294)\r\n at org.springframework.transaction.interceptor.TransactionInterceptor.invoke(TransactionInterceptor.java:98)\r\n at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:186)\r\n at org.springframework.aop.framework.CglibAopProxy$DynamicAdvisedInterceptor.intercept(CglibAopProxy.java:688)\r\n at co.yixiang.modules.shop.service.impl.YxUserBillServiceImpl$$EnhancerBySpringCGLIB$$ab20c521.queryAll()\r\n at co.yixiang.modules.shop.rest.YxUserBillController.getYxUserBills(YxUserBillController.java:33)\r\n at co.yixiang.modules.shop.rest.YxUserBillController$$FastClassBySpringCGLIB$$8a2e628d.invoke()\r\n at org.springframework.cglib.proxy.MethodProxy.invoke(MethodProxy.java:218)\r\n at org.springframework.aop.framework.CglibAopProxy$CglibMethodInvocation.invokeJoinpoint(CglibAopProxy.java:746)\r\n at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:163)\r\n at org.springframework.aop.aspectj.MethodInvocationProceedingJoinPoint.proceed(MethodInvocationProceedingJoinPoint.java:88)\r\n at co.yixiang.aspect.LogAspect.logAround(LogAspect.java:50)\r\n at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)\r\n at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)\r\n at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)\r\n at java.lang.reflect.Method.invoke(Method.java:498)\r\n at org.springframework.aop.aspectj.AbstractAspectJAdvice.invokeAdviceMethodWithGivenArgs(AbstractAspectJAdvice.java:644)\r\n at org.springframework.aop.aspectj.AbstractAspectJAdvice.invokeAdviceMethod(AbstractAspectJAdvice.java:633)\r\n at org.springframework.aop.aspectj.AspectJAroundAdvice.invoke(AspectJAroundAdvice.java:70)\r\n at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:175)\r\n at org.springframework.aop.aspectj.AspectJAfterThrowingAdvice.invoke(AspectJAfterThrowingAdvice.java:62)\r\n at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:175)\r\n at org.springframework.security.access.intercept.aopalliance.MethodSecurityInterceptor.invoke(MethodSecurityInterceptor.java:69)\r\n at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:186)\r\n at org.springframework.aop.interceptor.ExposeInvocationInterceptor.invoke(ExposeInvocationInterceptor.java:93)\r\n at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:186)\r\n at org.springframework.aop.framework.CglibAopProxy$DynamicAdvisedInterceptor.intercept(CglibAopProxy.java:688)\r\n at co.yixiang.modules.shop.rest.YxUserBillController$$EnhancerBySpringCGLIB$$20e02225.getYxUserBills()\r\n at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)\r\n at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)\r\n at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)\r\n at java.lang.reflect.Method.invoke(Method.java:498)\r\n at org.springframework.web.method.support.InvocableHandlerMethod.doInvoke(InvocableHandlerMethod.java:215)\r\n at org.springframework.web.method.support.InvocableHandlerMethod.invokeForRequest(InvocableHandlerMethod.java:142)\r\n at org.springframework.web.servlet.mvc.method.annotation.ServletInvocableHandlerMethod.invokeAndHandle(ServletInvocableHandlerMethod.java:102)\r\n at org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter.invokeHandlerMethod(RequestMappingHandlerAdapter.java:895)\r\n at org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter.handleInternal(RequestMappingHandlerAdapter.java:800)\r\n at org.springframework.web.servlet.mvc.method.AbstractHandlerMethodAdapter.handle(AbstractHandlerMethodAdapter.java:87)\r\n at org.springframework.web.servlet.DispatcherServlet.doDispatch(DispatcherServlet.java:1038)\r\n at org.springframework.web.servlet.DispatcherServlet.doService(DispatcherServlet.java:942)\r\n at org.springframework.web.servlet.FrameworkServlet.processRequest(FrameworkServlet.java:998)\r\n at org.springframework.web.servlet.FrameworkServlet.doGet(FrameworkServlet.java:890)\r\n at javax.servlet.http.HttpServlet.service(HttpServlet.java:634)\r\n at org.springframework.web.servlet.FrameworkServlet.service(FrameworkServlet.java:875)\r\n at javax.servlet.http.HttpServlet.service(HttpServlet.java:741)\r\n at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:231)\r\n at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166)\r\n at org.apache.tomcat.websocket.server.WsFilter.doFilter(WsFilter.java:53)\r\n at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193)\r\n at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166)\r\n at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:101)\r\n at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193)\r\n at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166)\r\n at com.alibaba.druid.support.http.WebStatFilter.doFilter(WebStatFilter.java:123)\r\n at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193)\r\n at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166)\r\n at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:320)\r\n at org.springframework.security.web.access.intercept.FilterSecurityInterceptor.invoke(FilterSecurityInterceptor.java:127)\r\n at org.springframework.security.web.access.intercept.FilterSecurityInterceptor.doFilter(FilterSecurityInterceptor.java:91)\r\n at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334)\r\n at org.springframework.security.web.access.ExceptionTranslationFilter.doFilter(ExceptionTranslationFilter.java:119)\r\n at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334)\r\n at org.springframework.security.web.session.SessionManagementFilter.doFilter(SessionManagementFilter.java:137)\r\n at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334)\r\n at org.springframework.security.web.authentication.AnonymousAuthenticationFilter.doFilter(AnonymousAuthenticationFilter.java:111)\r\n at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334)\r\n at org.springframework.security.web.servletapi.SecurityContextHolderAwareRequestFilter.doFilter(SecurityContextHolderAwareRequestFilter.java:170)\r\n at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334)\r\n at org.springframework.security.web.savedrequest.RequestCacheAwareFilter.doFilter(RequestCacheAwareFilter.java:63)\r\n at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334)\r\n at co.yixiang.modules.security.security.JwtAuthorizationTokenFilter.doFilterInternal(JwtAuthorizationTokenFilter.java:67)\r\n at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:107)\r\n at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334)\r\n at org.springframework.security.web.authentication.logout.LogoutFilter.doFilter(LogoutFilter.java:116)\r\n at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334)\r\n at org.springframework.security.web.header.HeaderWriterFilter.doFilterInternal(HeaderWriterFilter.java:66)\r\n at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:107)\r\n at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334)\r\n at org.springframework.security.web.context.SecurityContextPersistenceFilter.doFilter(SecurityContextPersistenceFilter.java:105)\r\n at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334)\r\n at org.springframework.security.web.context.request.async.WebAsyncManagerIntegrationFilter.doFilterInternal(WebAsyncManagerIntegrationFilter.java:56)\r\n at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:107)\r\n at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334)\r\n at org.springframework.security.web.FilterChainProxy.doFilterInternal(FilterChainProxy.java:215)\r\n at org.springframework.security.web.FilterChainProxy.doFilter(FilterChainProxy.java:178)\r\n at org.springframework.web.filter.DelegatingFilterProxy.invokeDelegate(DelegatingFilterProxy.java:357)\r\n at org.springframework.web.filter.DelegatingFilterProxy.doFilter(DelegatingFilterProxy.java:270)\r\n at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193)\r\n at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166)\r\n at org.springframework.web.filter.CharacterEncodingFilter.doFilterInternal(CharacterEncodingFilter.java:200)\r\n at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:107)\r\n at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193)\r\n at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166)\r\n at org.apache.catalina.core.StandardWrapperValve.invoke(StandardWrapperValve.java:199)\r\n at org.apache.catalina.core.StandardContextValve.invoke(StandardContextValve.java:96)\r\n at org.apache.catalina.authenticator.AuthenticatorBase.invoke(AuthenticatorBase.java:490)\r\n at org.apache.catalina.core.StandardHostValve.invoke(StandardHostValve.java:139)\r\n at org.apache.catalina.valves.ErrorReportValve.invoke(ErrorReportValve.java:92)\r\n at org.apache.catalina.core.StandardEngineValve.invoke(StandardEngineValve.java:74)\r\n at org.apache.catalina.connector.CoyoteAdapter.service(CoyoteAdapter.java:343)\r\n at org.apache.coyote.http11.Http11Processor.service(Http11Processor.java:408)\r\n at org.apache.coyote.AbstractProcessorLight.process(AbstractProcessorLight.java:66)\r\n at org.apache.coyote.AbstractProtocol$ConnectionHandler.process(AbstractProtocol.java:770)\r\n at org.apache.tomcat.util.net.NioEndpoint$SocketProcessor.doRun(NioEndpoint.java:1415)\r\n at org.apache.tomcat.util.net.SocketProcessorBase.run(SocketProcessorBase.java:49)\r\n at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1149)\r\n at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:624)\r\n at org.apache.tomcat.util.threads.TaskThread$WrappingRunnable.run(TaskThread.java:61)\r\n at java.lang.Thread.run(Thread.java:748)\r\nCaused by: org.hibernate.exception.SQLGrammarException: could not extract ResultSet\r\n at org.hibernate.exception.internal.SQLExceptionTypeDelegate.convert(SQLExceptionTypeDelegate.java:63)\r\n at org.hibernate.exception.internal.StandardSQLExceptionConverter.convert(StandardSQLExceptionConverter.java:42)\r\n at org.hibernate.engine.jdbc.spi.SqlExceptionHelper.convert(SqlExceptionHelper.java:113)\r\n at org.hibernate.engine.jdbc.spi.SqlExceptionHelper.convert(SqlExceptionHelper.java:99)\r\n at org.hibernate.engine.jdbc.internal.ResultSetReturnImpl.extract(ResultSetReturnImpl.java:69)\r\n at org.hibernate.loader.Loader.getResultSet(Loader.java:2167)\r\n at org.hibernate.loader.Loader.executeQueryStatement(Loader.java:1930)\r\n at org.hibernate.loader.Loader.executeQueryStatement(Loader.java:1892)\r\n at org.hibernate.loader.Loader.doQuery(Loader.java:937)\r\n at org.hibernate.loader.Loader.doQueryAndInitializeNonLazyCollections(Loader.java:340)\r\n at org.hibernate.loader.Loader.doList(Loader.java:2689)\r\n at org.hibernate.loader.Loader.doList(Loader.java:2672)\r\n at org.hibernate.loader.Loader.listIgnoreQueryCache(Loader.java:2506)\r\n at org.hibernate.loader.Loader.list(Loader.java:2501)\r\n at org.hibernate.loader.custom.CustomLoader.list(CustomLoader.java:338)\r\n at org.hibernate.internal.SessionImpl.listCustomQuery(SessionImpl.java:2223)\r\n at org.hibernate.internal.AbstractSharedSessionContract.list(AbstractSharedSessionContract.java:1053)\r\n at org.hibernate.query.internal.NativeQueryImpl.doList(NativeQueryImpl.java:170)\r\n at org.hibernate.query.internal.AbstractProducedQuery.list(AbstractProducedQuery.java:1505)\r\n at org.hibernate.query.Query.getResultList(Query.java:135)\r\n at org.springframework.data.jpa.repository.query.JpaQueryExecution$PagedExecution.count(JpaQueryExecution.java:201)\r\n at org.springframework.data.jpa.repository.query.JpaQueryExecution$PagedExecution.lambda$doExecute$0(JpaQueryExecution.java:195)\r\n at org.springframework.data.repository.support.PageableExecutionUtils.getPage(PageableExecutionUtils.java:62)\r\n at org.springframework.data.jpa.repository.query.JpaQueryExecution$PagedExecution.doExecute(JpaQueryExecution.java:194)\r\n at org.springframework.data.jpa.repository.query.JpaQueryExecution.execute(JpaQueryExecution.java:91)\r\n at org.springframework.data.jpa.repository.query.AbstractJpaQuery.doExecute(AbstractJpaQuery.java:136)\r\n at org.springframework.data.jpa.repository.query.AbstractJpaQuery.execute(AbstractJpaQuery.java:125)\r\n at org.springframework.data.repository.core.support.RepositoryFactorySupport$QueryExecutorMethodInterceptor.doInvoke(RepositoryFactorySupport.java:605)\r\n at org.springframework.data.repository.core.support.RepositoryFactorySupport$QueryExecutorMethodInterceptor.lambda$invoke$3(RepositoryFactorySupport.java:595)\r\n at org.springframework.data.repository.core.support.RepositoryFactorySupport$QueryExecutorMethodInterceptor.invoke(RepositoryFactorySupport.java:595)\r\n at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:186)\r\n at org.springframework.data.projection.DefaultMethodInvokingMethodInterceptor.invoke(DefaultMethodInvokingMethodInterceptor.java:59)\r\n at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:186)\r\n at org.springframework.transaction.interceptor.TransactionAspectSupport.invokeWithinTransaction(TransactionAspectSupport.java:294)\r\n at org.springframework.transaction.interceptor.TransactionInterceptor.invoke(TransactionInterceptor.java:98)\r\n at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:186)\r\n at org.springframework.dao.support.PersistenceExceptionTranslationInterceptor.invoke(PersistenceExceptionTranslationInterceptor.java:139)\r\n ... 123 more\r\nCaused by: java.sql.SQLSyntaxErrorException: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near \'if(\'\' !=\'\',b.category=\'\',1=1) and if(\'\' !=\'\',b.type=\'\',1=1) and if(\'\' !=\'\',u.ni\' at line 1\r\n at com.mysql.cj.jdbc.exceptions.SQLError.createSQLException(SQLError.java:120)\r\n at com.mysql.cj.jdbc.exceptions.SQLError.createSQLException(SQLError.java:97)\r\n at com.mysql.cj.jdbc.exceptions.SQLExceptionsMapping.translateException(SQLExceptionsMapping.java:122)\r\n at com.mysql.cj.jdbc.ClientPreparedStatement.executeInternal(ClientPreparedStatement.java:974)\r\n at com.mysql.cj.jdbc.ClientPreparedStatement.executeQuery(ClientPreparedStatement.java:1024)\r\n at net.sf.log4jdbc.sql.jdbcapi.PreparedStatementSpy.executeQuery(PreparedStatementSpy.java:780)\r\n at com.alibaba.druid.filter.FilterChainImpl.preparedStatement_executeQuery(FilterChainImpl.java:3188)\r\n at com.alibaba.druid.filter.FilterEventAdapter.preparedStatement_executeQuery(FilterEventAdapter.java:465)\r\n at com.alibaba.druid.filter.FilterChainImpl.preparedStatement_executeQuery(FilterChainImpl.java:3185)\r\n at com.alibaba.druid.proxy.jdbc.PreparedStatementProxyImpl.executeQuery(PreparedStatementProxyImpl.java:181)\r\n at com.alibaba.druid.pool.DruidPooledPreparedStatement.executeQuery(DruidPooledPreparedStatement.java:228)\r\n at org.hibernate.engine.jdbc.internal.ResultSetReturnImpl.extract(ResultSetReturnImpl.java:60)\r\n ... 155 more\r\n', 'ERROR', 'co.yixiang.modules.shop.rest.YxUserBillController.getYxUserBills()', '{ criteria: YxUserBillQueryCriteria() pageable: Page request [number: 0, size 10, sort: UNSORTED] }', '127.0.0.1', 205, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17450, '2019-12-11 18:47:29', '查询YxUserBill', NULL, 'INFO', 'co.yixiang.modules.shop.rest.YxUserBillController.getYxUserBills()', '{ criteria: YxUserBillQueryCriteria() pageable: Page request [number: 0, size 10, sort: UNSORTED] }', '127.0.0.1', 84, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17451, '2019-12-11 18:53:47', '查询YxUserBill', NULL, 'INFO', 'co.yixiang.modules.shop.rest.YxUserBillController.getYxUserBills()', '{ criteria: YxUserBillQueryCriteria() pageable: Page request [number: 0, size 10, sort: UNSORTED] }', '127.0.0.1', 77, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17452, '2019-12-11 18:57:15', '查询YxSystemConfig', NULL, 'INFO', 'co.yixiang.modules.wechat.rest.YxSystemConfigController.getYxSystemConfigs()', '{ criteria: YxSystemConfigQueryCriteria() pageable: Page request [number: 0, size 50, sort: UNSORTED] }', '127.0.0.1', 77, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17453, '2019-12-11 19:01:55', '查询YxSystemConfig', NULL, 'INFO', 'co.yixiang.modules.wechat.rest.YxSystemConfigController.getYxSystemConfigs()', '{ criteria: YxSystemConfigQueryCriteria() pageable: Page request [number: 0, size 50, sort: UNSORTED] }', '127.0.0.1', 13, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17454, '2019-12-11 19:02:04', '查询YxUserBill', NULL, 'INFO', 'co.yixiang.modules.shop.rest.YxUserBillController.getYxUserBills()', '{ criteria: YxUserBillQueryCriteria() pageable: Page request [number: 0, size 10, sort: UNSORTED] }', '127.0.0.1', 113, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17455, '2019-12-11 19:04:36', '查询YxUserBill', 'org.springframework.core.convert.ConverterNotFoundException: No converter found capable of converting from type [org.springframework.data.jpa.repository.query.AbstractJpaQuery$TupleConverter$TupleBackedMap] to type [co.yixiang.modules.shop.service.dto.UserBillDTO]\r\n at org.springframework.core.convert.support.GenericConversionService.handleConverterNotFound(GenericConversionService.java:321)\r\n at org.springframework.core.convert.support.GenericConversionService.convert(GenericConversionService.java:194)\r\n at org.springframework.core.convert.support.GenericConversionService.convert(GenericConversionService.java:174)\r\n at org.springframework.data.repository.query.ResultProcessor$ProjectingConverter.convert(ResultProcessor.java:293)\r\n at org.springframework.data.repository.query.ResultProcessor$ChainingConverter.lambda$and$0(ResultProcessor.java:213)\r\n at org.springframework.data.repository.query.ResultProcessor$ChainingConverter.convert(ResultProcessor.java:224)\r\n at java.util.stream.ReferencePipeline$3$1.accept(ReferencePipeline.java:193)\r\n at java.util.ArrayList$Itr.forEachRemaining(ArrayList.java:899)\r\n at java.util.Spliterators$IteratorSpliterator.forEachRemaining(Spliterators.java:1801)\r\n at java.util.stream.AbstractPipeline.copyInto(AbstractPipeline.java:481)\r\n at java.util.stream.AbstractPipeline.wrapAndCopyInto(AbstractPipeline.java:471)\r\n at java.util.stream.ReduceOps$ReduceOp.evaluateSequential(ReduceOps.java:708)\r\n at java.util.stream.AbstractPipeline.evaluate(AbstractPipeline.java:234)\r\n at java.util.stream.ReferencePipeline.collect(ReferencePipeline.java:499)\r\n at org.springframework.data.domain.Chunk.getConvertedContent(Chunk.java:167)\r\n at org.springframework.data.domain.PageImpl.map(PageImpl.java:106)\r\n at org.springframework.data.domain.PageImpl.map(PageImpl.java:30)\r\n at org.springframework.data.repository.query.ResultProcessor.processResult(ResultProcessor.java:143)\r\n at org.springframework.data.jpa.repository.query.AbstractJpaQuery.doExecute(AbstractJpaQuery.java:141)\r\n at org.springframework.data.jpa.repository.query.AbstractJpaQuery.execute(AbstractJpaQuery.java:125)\r\n at org.springframework.data.repository.core.support.RepositoryFactorySupport$QueryExecutorMethodInterceptor.doInvoke(RepositoryFactorySupport.java:605)\r\n at org.springframework.data.repository.core.support.RepositoryFactorySupport$QueryExecutorMethodInterceptor.lambda$invoke$3(RepositoryFactorySupport.java:595)\r\n at org.springframework.data.repository.core.support.RepositoryFactorySupport$QueryExecutorMethodInterceptor.invoke(RepositoryFactorySupport.java:595)\r\n at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:186)\r\n at org.springframework.data.projection.DefaultMethodInvokingMethodInterceptor.invoke(DefaultMethodInvokingMethodInterceptor.java:59)\r\n at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:186)\r\n at org.springframework.transaction.interceptor.TransactionAspectSupport.invokeWithinTransaction(TransactionAspectSupport.java:294)\r\n at org.springframework.transaction.interceptor.TransactionInterceptor.invoke(TransactionInterceptor.java:98)\r\n at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:186)\r\n at org.springframework.dao.support.PersistenceExceptionTranslationInterceptor.invoke(PersistenceExceptionTranslationInterceptor.java:139)\r\n at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:186)\r\n at org.springframework.data.jpa.repository.support.CrudMethodMetadataPostProcessor$CrudMethodMetadataPopulatingMethodInterceptor.invoke(CrudMethodMetadataPostProcessor.java:135)\r\n at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:186)\r\n at org.springframework.aop.interceptor.ExposeInvocationInterceptor.invoke(ExposeInvocationInterceptor.java:93)\r\n at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:186)\r\n at org.springframework.data.repository.core.support.SurroundingTransactionDetectorMethodInterceptor.invoke(SurroundingTransactionDetectorMethodInterceptor.java:61)\r\n at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:186)\r\n at org.springframework.aop.framework.JdkDynamicAopProxy.invoke(JdkDynamicAopProxy.java:212)\r\n at com.sun.proxy.$Proxy159.findAllByPageable(Unknown Source)\r\n at co.yixiang.modules.shop.service.impl.YxUserBillServiceImpl.queryAll(YxUserBillServiceImpl.java:45)\r\n at co.yixiang.modules.shop.service.impl.YxUserBillServiceImpl$$FastClassBySpringCGLIB$$1f04d7c9.invoke()\r\n at org.springframework.cglib.proxy.MethodProxy.invoke(MethodProxy.java:218)\r\n at org.springframework.aop.framework.CglibAopProxy$CglibMethodInvocation.invokeJoinpoint(CglibAopProxy.java:746)\r\n at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:163)\r\n at org.springframework.transaction.interceptor.TransactionAspectSupport.invokeWithinTransaction(TransactionAspectSupport.java:294)\r\n at org.springframework.transaction.interceptor.TransactionInterceptor.invoke(TransactionInterceptor.java:98)\r\n at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:186)\r\n at org.springframework.aop.framework.CglibAopProxy$DynamicAdvisedInterceptor.intercept(CglibAopProxy.java:688)\r\n at co.yixiang.modules.shop.service.impl.YxUserBillServiceImpl$$EnhancerBySpringCGLIB$$6aa9596.queryAll()\r\n at co.yixiang.modules.shop.rest.YxUserBillController.getYxUserBills(YxUserBillController.java:33)\r\n at co.yixiang.modules.shop.rest.YxUserBillController$$FastClassBySpringCGLIB$$8a2e628d.invoke()\r\n at org.springframework.cglib.proxy.MethodProxy.invoke(MethodProxy.java:218)\r\n at org.springframework.aop.framework.CglibAopProxy$CglibMethodInvocation.invokeJoinpoint(CglibAopProxy.java:746)\r\n at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:163)\r\n at org.springframework.aop.aspectj.MethodInvocationProceedingJoinPoint.proceed(MethodInvocationProceedingJoinPoint.java:88)\r\n at co.yixiang.aspect.LogAspect.logAround(LogAspect.java:50)\r\n at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)\r\n at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)\r\n at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)\r\n at java.lang.reflect.Method.invoke(Method.java:498)\r\n at org.springframework.aop.aspectj.AbstractAspectJAdvice.invokeAdviceMethodWithGivenArgs(AbstractAspectJAdvice.java:644)\r\n at org.springframework.aop.aspectj.AbstractAspectJAdvice.invokeAdviceMethod(AbstractAspectJAdvice.java:633)\r\n at org.springframework.aop.aspectj.AspectJAroundAdvice.invoke(AspectJAroundAdvice.java:70)\r\n at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:175)\r\n at org.springframework.aop.aspectj.AspectJAfterThrowingAdvice.invoke(AspectJAfterThrowingAdvice.java:62)\r\n at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:175)\r\n at org.springframework.security.access.intercept.aopalliance.MethodSecurityInterceptor.invoke(MethodSecurityInterceptor.java:69)\r\n at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:186)\r\n at org.springframework.aop.interceptor.ExposeInvocationInterceptor.invoke(ExposeInvocationInterceptor.java:93)\r\n at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:186)\r\n at org.springframework.aop.framework.CglibAopProxy$DynamicAdvisedInterceptor.intercept(CglibAopProxy.java:688)\r\n at co.yixiang.modules.shop.rest.YxUserBillController$$EnhancerBySpringCGLIB$$753016fb.getYxUserBills()\r\n at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)\r\n at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)\r\n at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)\r\n at java.lang.reflect.Method.invoke(Method.java:498)\r\n at org.springframework.web.method.support.InvocableHandlerMethod.doInvoke(InvocableHandlerMethod.java:215)\r\n at org.springframework.web.method.support.InvocableHandlerMethod.invokeForRequest(InvocableHandlerMethod.java:142)\r\n at org.springframework.web.servlet.mvc.method.annotation.ServletInvocableHandlerMethod.invokeAndHandle(ServletInvocableHandlerMethod.java:102)\r\n at org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter.invokeHandlerMethod(RequestMappingHandlerAdapter.java:895)\r\n at org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter.handleInternal(RequestMappingHandlerAdapter.java:800)\r\n at org.springframework.web.servlet.mvc.method.AbstractHandlerMethodAdapter.handle(AbstractHandlerMethodAdapter.java:87)\r\n at org.springframework.web.servlet.DispatcherServlet.doDispatch(DispatcherServlet.java:1038)\r\n at org.springframework.web.servlet.DispatcherServlet.doService(DispatcherServlet.java:942)\r\n at org.springframework.web.servlet.FrameworkServlet.processRequest(FrameworkServlet.java:998)\r\n at org.springframework.web.servlet.FrameworkServlet.doGet(FrameworkServlet.java:890)\r\n at javax.servlet.http.HttpServlet.service(HttpServlet.java:634)\r\n at org.springframework.web.servlet.FrameworkServlet.service(FrameworkServlet.java:875)\r\n at javax.servlet.http.HttpServlet.service(HttpServlet.java:741)\r\n at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:231)\r\n at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166)\r\n at org.apache.tomcat.websocket.server.WsFilter.doFilter(WsFilter.java:53)\r\n at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193)\r\n at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166)\r\n at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:101)\r\n at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193)\r\n at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166)\r\n at com.alibaba.druid.support.http.WebStatFilter.doFilter(WebStatFilter.java:123)\r\n at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193)\r\n at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166)\r\n at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:320)\r\n at org.springframework.security.web.access.intercept.FilterSecurityInterceptor.invoke(FilterSecurityInterceptor.java:127)\r\n at org.springframework.security.web.access.intercept.FilterSecurityInterceptor.doFilter(FilterSecurityInterceptor.java:91)\r\n at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334)\r\n at org.springframework.security.web.access.ExceptionTranslationFilter.doFilter(ExceptionTranslationFilter.java:119)\r\n at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334)\r\n at org.springframework.security.web.session.SessionManagementFilter.doFilter(SessionManagementFilter.java:137)\r\n at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334)\r\n at org.springframework.security.web.authentication.AnonymousAuthenticationFilter.doFilter(AnonymousAuthenticationFilter.java:111)\r\n at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334)\r\n at org.springframework.security.web.servletapi.SecurityContextHolderAwareRequestFilter.doFilter(SecurityContextHolderAwareRequestFilter.java:170)\r\n at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334)\r\n at org.springframework.security.web.savedrequest.RequestCacheAwareFilter.doFilter(RequestCacheAwareFilter.java:63)\r\n at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334)\r\n at co.yixiang.modules.security.security.JwtAuthorizationTokenFilter.doFilterInternal(JwtAuthorizationTokenFilter.java:67)\r\n at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:107)\r\n at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334)\r\n at org.springframework.security.web.authentication.logout.LogoutFilter.doFilter(LogoutFilter.java:116)\r\n at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334)\r\n at org.springframework.security.web.header.HeaderWriterFilter.doFilterInternal(HeaderWriterFilter.java:66)\r\n at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:107)\r\n at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334)\r\n at org.springframework.security.web.context.SecurityContextPersistenceFilter.doFilter(SecurityContextPersistenceFilter.java:105)\r\n at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334)\r\n at org.springframework.security.web.context.request.async.WebAsyncManagerIntegrationFilter.doFilterInternal(WebAsyncManagerIntegrationFilter.java:56)\r\n at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:107)\r\n at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334)\r\n at org.springframework.security.web.FilterChainProxy.doFilterInternal(FilterChainProxy.java:215)\r\n at org.springframework.security.web.FilterChainProxy.doFilter(FilterChainProxy.java:178)\r\n at org.springframework.web.filter.DelegatingFilterProxy.invokeDelegate(DelegatingFilterProxy.java:357)\r\n at org.springframework.web.filter.DelegatingFilterProxy.doFilter(DelegatingFilterProxy.java:270)\r\n at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193)\r\n at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166)\r\n at org.springframework.web.filter.CharacterEncodingFilter.doFilterInternal(CharacterEncodingFilter.java:200)\r\n at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:107)\r\n at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193)\r\n at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166)\r\n at org.apache.catalina.core.StandardWrapperValve.invoke(StandardWrapperValve.java:199)\r\n at org.apache.catalina.core.StandardContextValve.invoke(StandardContextValve.java:96)\r\n at org.apache.catalina.authenticator.AuthenticatorBase.invoke(AuthenticatorBase.java:490)\r\n at org.apache.catalina.core.StandardHostValve.invoke(StandardHostValve.java:139)\r\n at org.apache.catalina.valves.ErrorReportValve.invoke(ErrorReportValve.java:92)\r\n at org.apache.catalina.core.StandardEngineValve.invoke(StandardEngineValve.java:74)\r\n at org.apache.catalina.connector.CoyoteAdapter.service(CoyoteAdapter.java:343)\r\n at org.apache.coyote.http11.Http11Processor.service(Http11Processor.java:408)\r\n at org.apache.coyote.AbstractProcessorLight.process(AbstractProcessorLight.java:66)\r\n at org.apache.coyote.AbstractProtocol$ConnectionHandler.process(AbstractProtocol.java:770)\r\n at org.apache.tomcat.util.net.NioEndpoint$SocketProcessor.doRun(NioEndpoint.java:1415)\r\n at org.apache.tomcat.util.net.SocketProcessorBase.run(SocketProcessorBase.java:49)\r\n at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1149)\r\n at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:624)\r\n at org.apache.tomcat.util.threads.TaskThread$WrappingRunnable.run(TaskThread.java:61)\r\n at java.lang.Thread.run(Thread.java:748)\r\n', 'ERROR', 'co.yixiang.modules.shop.rest.YxUserBillController.getYxUserBills()', '{ criteria: YxUserBillQueryCriteria() pageable: Page request [number: 0, size 10, sort: UNSORTED] }', '127.0.0.1', 119, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17456, '2019-12-11 19:07:40', '查询YxUserBill', NULL, 'INFO', 'co.yixiang.modules.shop.rest.YxUserBillController.getYxUserBills()', '{ criteria: YxUserBillQueryCriteria() pageable: Page request [number: 0, size 10, sort: UNSORTED] }', '127.0.0.1', 69, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17457, '2019-12-11 19:09:11', '查询YxUserBill', NULL, 'INFO', 'co.yixiang.modules.shop.rest.YxUserBillController.getYxUserBills()', '{ criteria: YxUserBillQueryCriteria() pageable: Page request [number: 0, size 10, sort: UNSORTED] }', '127.0.0.1', 8, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17458, '2019-12-11 19:20:38', '查询YxUserBill', NULL, 'INFO', 'co.yixiang.modules.shop.rest.YxUserBillController.getYxUserBills()', '{ criteria: YxUserBillQueryCriteria() pageable: Page request [number: 0, size 10, sort: UNSORTED] }', '127.0.0.1', 6, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17459, '2019-12-11 19:23:05', '查询YxUserBill', NULL, 'INFO', 'co.yixiang.modules.shop.rest.YxUserBillController.getYxUserBills()', '{ criteria: YxUserBillQueryCriteria() pageable: Page request [number: 0, size 10, sort: UNSORTED] }', '127.0.0.1', 8, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17460, '2019-12-11 19:23:44', '查询YxUserBill', NULL, 'INFO', 'co.yixiang.modules.shop.rest.YxUserBillController.getYxUserBills()', '{ criteria: YxUserBillQueryCriteria() pageable: Page request [number: 0, size 10, sort: UNSORTED] }', '127.0.0.1', 109, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17461, '2019-12-11 19:25:10', '查询YxUserBill', NULL, 'INFO', 'co.yixiang.modules.shop.rest.YxUserBillController.getYxUserBills()', '{ criteria: YxUserBillQueryCriteria() pageable: Page request [number: 0, size 10, sort: UNSORTED] }', '127.0.0.1', 18, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17462, '2019-12-11 19:25:27', '查询YxUserBill', NULL, 'INFO', 'co.yixiang.modules.shop.rest.YxUserBillController.getYxUserBills()', '{ criteria: YxUserBillQueryCriteria() pageable: Page request [number: 0, size 10, sort: UNSORTED] }', '127.0.0.1', 8, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17463, '2019-12-11 19:26:43', '查询YxUserBill', NULL, 'INFO', 'co.yixiang.modules.shop.rest.YxUserBillController.getYxUserBills()', '{ criteria: YxUserBillQueryCriteria() pageable: Page request [number: 0, size 10, sort: UNSORTED] }', '127.0.0.1', 10, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17464, '2019-12-11 19:30:17', '查询YxUserBill', NULL, 'INFO', 'co.yixiang.modules.shop.rest.YxUserBillController.getYxUserBills()', '{ criteria: YxUserBillQueryCriteria() pageable: Page request [number: 0, size 10, sort: UNSORTED] }', '127.0.0.1', 8, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17465, '2019-12-11 19:30:44', '查询YxUserBill', NULL, 'INFO', 'co.yixiang.modules.shop.rest.YxUserBillController.getYxUserBills()', '{ criteria: YxUserBillQueryCriteria() pageable: Page request [number: 0, size 10, sort: UNSORTED] }', '127.0.0.1', 8, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17466, '2019-12-11 19:32:41', '查询YxUserBill', NULL, 'INFO', 'co.yixiang.modules.shop.rest.YxUserBillController.getYxUserBills()', '{ criteria: YxUserBillQueryCriteria() pageable: Page request [number: 0, size 10, sort: UNSORTED] }', '127.0.0.1', 6, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17467, '2019-12-11 19:33:13', '查询YxUserBill', NULL, 'INFO', 'co.yixiang.modules.shop.rest.YxUserBillController.getYxUserBills()', '{ criteria: YxUserBillQueryCriteria() pageable: Page request [number: 0, size 10, sort: UNSORTED] }', '127.0.0.1', 24, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17468, '2019-12-11 19:33:54', '查询YxUserBill', NULL, 'INFO', 'co.yixiang.modules.shop.rest.YxUserBillController.getYxUserBills()', '{ criteria: YxUserBillQueryCriteria() pageable: Page request [number: 0, size 10, sort: UNSORTED] }', '127.0.0.1', 9, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17469, '2019-12-11 19:43:27', '查询YxUserBill', NULL, 'INFO', 'co.yixiang.modules.shop.rest.YxUserBillController.getYxUserBills()', '{ criteria: YxUserBillQueryCriteria() pageable: Page request [number: 0, size 10, sort: UNSORTED] }', '127.0.0.1', 12, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17470, '2019-12-11 19:43:46', '查询YxUserBill', NULL, 'INFO', 'co.yixiang.modules.shop.rest.YxUserBillController.getYxUserBills()', '{ criteria: YxUserBillQueryCriteria() pageable: Page request [number: 0, size 10, sort: UNSORTED] }', '127.0.0.1', 5, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17471, '2019-12-11 19:44:26', '查询YxUserBill', NULL, 'INFO', 'co.yixiang.modules.shop.rest.YxUserBillController.getYxUserBills()', '{ criteria: YxUserBillQueryCriteria() pageable: Page request [number: 0, size 10, sort: UNSORTED] }', '127.0.0.1', 5, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17472, '2019-12-11 19:57:30', '查询YxUserBill', NULL, 'INFO', 'co.yixiang.modules.shop.rest.YxUserBillController.getYxUserBills()', '{ criteria: YxUserBillQueryCriteria() pageable: Page request [number: 0, size 10, sort: UNSORTED] }', '127.0.0.1', 4, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17473, '2019-12-11 19:57:35', '查询YxUserBill', NULL, 'INFO', 'co.yixiang.modules.shop.rest.YxUserBillController.getYxUserBills()', '{ criteria: YxUserBillQueryCriteria() pageable: Page request [number: 0, size 10, sort: UNSORTED] }', '127.0.0.1', 7, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17474, '2019-12-11 19:59:32', '查询YxUserBill', NULL, 'INFO', 'co.yixiang.modules.shop.rest.YxUserBillController.getYxUserBills()', '{ criteria: YxUserBillQueryCriteria() pageable: Page request [number: 0, size 10, sort: UNSORTED] }', '127.0.0.1', 7, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17475, '2019-12-11 20:00:17', '查询YxUserBill', NULL, 'INFO', 'co.yixiang.modules.shop.rest.YxUserBillController.getYxUserBills()', '{ criteria: YxUserBillQueryCriteria() pageable: Page request [number: 0, size 10, sort: UNSORTED] }', '127.0.0.1', 7, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17476, '2019-12-11 20:00:33', '查询YxUserBill', NULL, 'INFO', 'co.yixiang.modules.shop.rest.YxUserBillController.getYxUserBills()', '{ criteria: YxUserBillQueryCriteria() pageable: Page request [number: 0, size 10, sort: UNSORTED] }', '127.0.0.1', 8, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17477, '2019-12-11 20:00:58', '查询YxUserBill', NULL, 'INFO', 'co.yixiang.modules.shop.rest.YxUserBillController.getYxUserBills()', '{ criteria: YxUserBillQueryCriteria() pageable: Page request [number: 0, size 10, sort: UNSORTED] }', '127.0.0.1', 11, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17478, '2019-12-11 20:01:03', '查询YxUserBill', NULL, 'INFO', 'co.yixiang.modules.shop.rest.YxUserBillController.getYxUserBills()', '{ criteria: YxUserBillQueryCriteria() pageable: Page request [number: 0, size 10, sort: UNSORTED] }', '127.0.0.1', 7, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17479, '2019-12-11 20:03:10', '查询YxUserBill', NULL, 'INFO', 'co.yixiang.modules.shop.rest.YxUserBillController.getYxUserBills()', '{ criteria: YxUserBillQueryCriteria(nickname=333) pageable: Page request [number: 0, size 10, sort: UNSORTED] }', '127.0.0.1', 177, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17480, '2019-12-11 20:08:01', '查询YxUserBill', NULL, 'INFO', 'co.yixiang.modules.shop.rest.YxUserBillController.getYxUserBills()', '{ criteria: YxUserBillQueryCriteria(nickname=333, category=, type=) pageable: Page request [number: 0, size 10, sort: UNSORTED] }', '127.0.0.1', 46, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17481, '2019-12-11 20:08:04', '查询YxUserBill', NULL, 'INFO', 'co.yixiang.modules.shop.rest.YxUserBillController.getYxUserBills()', '{ criteria: YxUserBillQueryCriteria(nickname=, category=, type=) pageable: Page request [number: 0, size 10, sort: UNSORTED] }', '127.0.0.1', 23, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17482, '2019-12-11 20:08:08', '查询YxUserBill', NULL, 'INFO', 'co.yixiang.modules.shop.rest.YxUserBillController.getYxUserBills()', '{ criteria: YxUserBillQueryCriteria(nickname=, category=, type=brokerage) pageable: Page request [number: 0, size 10, sort: UNSORTED] }', '127.0.0.1', 3, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17483, '2019-12-11 20:08:12', '查询YxUserBill', NULL, 'INFO', 'co.yixiang.modules.shop.rest.YxUserBillController.getYxUserBills()', '{ criteria: YxUserBillQueryCriteria(nickname=, category=, type=) pageable: Page request [number: 0, size 10, sort: UNSORTED] }', '127.0.0.1', 11, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17484, '2019-12-11 20:08:15', '查询YxUserBill', NULL, 'INFO', 'co.yixiang.modules.shop.rest.YxUserBillController.getYxUserBills()', '{ criteria: YxUserBillQueryCriteria(nickname=, category=category, type=) pageable: Page request [number: 0, size 10, sort: UNSORTED] }', '127.0.0.1', 2, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17485, '2019-12-11 20:08:42', '查询YxUserBill', NULL, 'INFO', 'co.yixiang.modules.shop.rest.YxUserBillController.getYxUserBills()', '{ criteria: YxUserBillQueryCriteria(nickname=, category=, type=) pageable: Page request [number: 0, size 10, sort: UNSORTED] }', '127.0.0.1', 9, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17486, '2019-12-11 20:08:45', '查询YxUserBill', NULL, 'INFO', 'co.yixiang.modules.shop.rest.YxUserBillController.getYxUserBills()', '{ criteria: YxUserBillQueryCriteria(nickname=, category=now_money, type=) pageable: Page request [number: 0, size 10, sort: UNSORTED] }', '127.0.0.1', 4, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17487, '2019-12-11 20:08:50', '查询YxUserBill', NULL, 'INFO', 'co.yixiang.modules.shop.rest.YxUserBillController.getYxUserBills()', '{ criteria: YxUserBillQueryCriteria(nickname=, category=now_money, type=sign) pageable: Page request [number: 0, size 10, sort: UNSORTED] }', '127.0.0.1', 3, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17488, '2019-12-11 20:08:52', '查询YxUserBill', NULL, 'INFO', 'co.yixiang.modules.shop.rest.YxUserBillController.getYxUserBills()', '{ criteria: YxUserBillQueryCriteria(nickname=, category=integral, type=sign) pageable: Page request [number: 0, size 10, sort: UNSORTED] }', '127.0.0.1', 3, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17489, '2019-12-11 20:09:56', '查询YxUserBill', NULL, 'INFO', 'co.yixiang.modules.shop.rest.YxUserBillController.getYxUserBills()', '{ criteria: YxUserBillQueryCriteria(nickname=, category=, type=) pageable: Page request [number: 0, size 10, sort: UNSORTED] }', '127.0.0.1', 4, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17490, '2019-12-12 16:12:16', '用户登录', 'co.yixiang.exception.BadRequestException: 验证码已过期\r\n at co.yixiang.modules.security.rest.AuthenticationController.login(AuthenticationController.java:67)\r\n at co.yixiang.modules.security.rest.AuthenticationController$$FastClassBySpringCGLIB$$7265dd5e.invoke()\r\n at org.springframework.cglib.proxy.MethodProxy.invoke(MethodProxy.java:218)\r\n at org.springframework.aop.framework.CglibAopProxy$CglibMethodInvocation.invokeJoinpoint(CglibAopProxy.java:746)\r\n at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:163)\r\n at org.springframework.aop.aspectj.MethodInvocationProceedingJoinPoint.proceed(MethodInvocationProceedingJoinPoint.java:88)\r\n at co.yixiang.aspect.LogAspect.logAround(LogAspect.java:50)\r\n at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)\r\n at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)\r\n at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)\r\n at java.lang.reflect.Method.invoke(Method.java:498)\r\n at org.springframework.aop.aspectj.AbstractAspectJAdvice.invokeAdviceMethodWithGivenArgs(AbstractAspectJAdvice.java:644)\r\n at org.springframework.aop.aspectj.AbstractAspectJAdvice.invokeAdviceMethod(AbstractAspectJAdvice.java:633)\r\n at org.springframework.aop.aspectj.AspectJAroundAdvice.invoke(AspectJAroundAdvice.java:70)\r\n at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:175)\r\n at org.springframework.aop.aspectj.AspectJAfterThrowingAdvice.invoke(AspectJAfterThrowingAdvice.java:62)\r\n at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:175)\r\n at org.springframework.aop.interceptor.ExposeInvocationInterceptor.invoke(ExposeInvocationInterceptor.java:93)\r\n at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:186)\r\n at org.springframework.aop.framework.CglibAopProxy$DynamicAdvisedInterceptor.intercept(CglibAopProxy.java:688)\r\n at co.yixiang.modules.security.rest.AuthenticationController$$EnhancerBySpringCGLIB$$c276e2f1.login()\r\n at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)\r\n at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)\r\n at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)\r\n at java.lang.reflect.Method.invoke(Method.java:498)\r\n at org.springframework.web.method.support.InvocableHandlerMethod.doInvoke(InvocableHandlerMethod.java:215)\r\n at org.springframework.web.method.support.InvocableHandlerMethod.invokeForRequest(InvocableHandlerMethod.java:142)\r\n at org.springframework.web.servlet.mvc.method.annotation.ServletInvocableHandlerMethod.invokeAndHandle(ServletInvocableHandlerMethod.java:102)\r\n at org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter.invokeHandlerMethod(RequestMappingHandlerAdapter.java:895)\r\n at org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter.handleInternal(RequestMappingHandlerAdapter.java:800)\r\n at org.springframework.web.servlet.mvc.method.AbstractHandlerMethodAdapter.handle(AbstractHandlerMethodAdapter.java:87)\r\n at org.springframework.web.servlet.DispatcherServlet.doDispatch(DispatcherServlet.java:1038)\r\n at org.springframework.web.servlet.DispatcherServlet.doService(DispatcherServlet.java:942)\r\n at org.springframework.web.servlet.FrameworkServlet.processRequest(FrameworkServlet.java:998)\r\n at org.springframework.web.servlet.FrameworkServlet.doPost(FrameworkServlet.java:901)\r\n at javax.servlet.http.HttpServlet.service(HttpServlet.java:660)\r\n at org.springframework.web.servlet.FrameworkServlet.service(FrameworkServlet.java:875)\r\n at javax.servlet.http.HttpServlet.service(HttpServlet.java:741)\r\n at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:231)\r\n at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166)\r\n at org.apache.tomcat.websocket.server.WsFilter.doFilter(WsFilter.java:53)\r\n at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193)\r\n at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166)\r\n at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:101)\r\n at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193)\r\n at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166)\r\n at com.alibaba.druid.support.http.WebStatFilter.doFilter(WebStatFilter.java:123)\r\n at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193)\r\n at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166)\r\n at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:320)\r\n at org.springframework.security.web.access.intercept.FilterSecurityInterceptor.invoke(FilterSecurityInterceptor.java:127)\r\n at org.springframework.security.web.access.intercept.FilterSecurityInterceptor.doFilter(FilterSecurityInterceptor.java:91)\r\n at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334)\r\n at org.springframework.security.web.access.ExceptionTranslationFilter.doFilter(ExceptionTranslationFilter.java:119)\r\n at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334)\r\n at org.springframework.security.web.session.SessionManagementFilter.doFilter(SessionManagementFilter.java:137)\r\n at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334)\r\n at org.springframework.security.web.authentication.AnonymousAuthenticationFilter.doFilter(AnonymousAuthenticationFilter.java:111)\r\n at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334)\r\n at org.springframework.security.web.servletapi.SecurityContextHolderAwareRequestFilter.doFilter(SecurityContextHolderAwareRequestFilter.java:170)\r\n at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334)\r\n at org.springframework.security.web.savedrequest.RequestCacheAwareFilter.doFilter(RequestCacheAwareFilter.java:63)\r\n at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334)\r\n at co.yixiang.modules.security.security.JwtAuthorizationTokenFilter.doFilterInternal(JwtAuthorizationTokenFilter.java:67)\r\n at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:107)\r\n at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334)\r\n at org.springframework.security.web.authentication.logout.LogoutFilter.doFilter(LogoutFilter.java:116)\r\n at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334)\r\n at org.springframework.security.web.header.HeaderWriterFilter.doFilterInternal(HeaderWriterFilter.java:66)\r\n at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:107)\r\n at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334)\r\n at org.springframework.security.web.context.SecurityContextPersistenceFilter.doFilter(SecurityContextPersistenceFilter.java:105)\r\n at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334)\r\n at org.springframework.security.web.context.request.async.WebAsyncManagerIntegrationFilter.doFilterInternal(WebAsyncManagerIntegrationFilter.java:56)\r\n at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:107)\r\n at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334)\r\n at org.springframework.security.web.FilterChainProxy.doFilterInternal(FilterChainProxy.java:215)\r\n at org.springframework.security.web.FilterChainProxy.doFilter(FilterChainProxy.java:178)\r\n at org.springframework.web.filter.DelegatingFilterProxy.invokeDelegate(DelegatingFilterProxy.java:357)\r\n at org.springframework.web.filter.DelegatingFilterProxy.doFilter(DelegatingFilterProxy.java:270)\r\n at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193)\r\n at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166)\r\n at org.springframework.web.filter.CharacterEncodingFilter.doFilterInternal(CharacterEncodingFilter.java:200)\r\n at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:107)\r\n at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193)\r\n at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166)\r\n at org.apache.catalina.core.StandardWrapperValve.invoke(StandardWrapperValve.java:199)\r\n at org.apache.catalina.core.StandardContextValve.invoke(StandardContextValve.java:96)\r\n at org.apache.catalina.authenticator.AuthenticatorBase.invoke(AuthenticatorBase.java:490)\r\n at org.apache.catalina.core.StandardHostValve.invoke(StandardHostValve.java:139)\r\n at org.apache.catalina.valves.ErrorReportValve.invoke(ErrorReportValve.java:92)\r\n at org.apache.catalina.core.StandardEngineValve.invoke(StandardEngineValve.java:74)\r\n at org.apache.catalina.connector.CoyoteAdapter.service(CoyoteAdapter.java:343)\r\n at org.apache.coyote.http11.Http11Processor.service(Http11Processor.java:408)\r\n at org.apache.coyote.AbstractProcessorLight.process(AbstractProcessorLight.java:66)\r\n at org.apache.coyote.AbstractProtocol$ConnectionHandler.process(AbstractProtocol.java:770)\r\n at org.apache.tomcat.util.net.NioEndpoint$SocketProcessor.doRun(NioEndpoint.java:1415)\r\n at org.apache.tomcat.util.net.SocketProcessorBase.run(SocketProcessorBase.java:49)\r\n at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1149)\r\n at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:624)\r\n at org.apache.tomcat.util.threads.TaskThread$WrappingRunnable.run(TaskThread.java:61)\r\n at java.lang.Thread.run(Thread.java:748)\r\n', 'ERROR', 'co.yixiang.modules.security.rest.AuthenticationController.login()', '{ authorizationUser: {username=admin, password= ******} }', '127.0.0.1', 53, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17491, '2019-12-12 16:13:08', '用户登录', 'co.yixiang.exception.BadRequestException: 验证码错误\r\n at co.yixiang.modules.security.rest.AuthenticationController.login(AuthenticationController.java:70)\r\n at co.yixiang.modules.security.rest.AuthenticationController$$FastClassBySpringCGLIB$$7265dd5e.invoke()\r\n at org.springframework.cglib.proxy.MethodProxy.invoke(MethodProxy.java:218)\r\n at org.springframework.aop.framework.CglibAopProxy$CglibMethodInvocation.invokeJoinpoint(CglibAopProxy.java:746)\r\n at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:163)\r\n at org.springframework.aop.aspectj.MethodInvocationProceedingJoinPoint.proceed(MethodInvocationProceedingJoinPoint.java:88)\r\n at co.yixiang.aspect.LogAspect.logAround(LogAspect.java:50)\r\n at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)\r\n at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)\r\n at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)\r\n at java.lang.reflect.Method.invoke(Method.java:498)\r\n at org.springframework.aop.aspectj.AbstractAspectJAdvice.invokeAdviceMethodWithGivenArgs(AbstractAspectJAdvice.java:644)\r\n at org.springframework.aop.aspectj.AbstractAspectJAdvice.invokeAdviceMethod(AbstractAspectJAdvice.java:633)\r\n at org.springframework.aop.aspectj.AspectJAroundAdvice.invoke(AspectJAroundAdvice.java:70)\r\n at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:175)\r\n at org.springframework.aop.aspectj.AspectJAfterThrowingAdvice.invoke(AspectJAfterThrowingAdvice.java:62)\r\n at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:175)\r\n at org.springframework.aop.interceptor.ExposeInvocationInterceptor.invoke(ExposeInvocationInterceptor.java:93)\r\n at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:186)\r\n at org.springframework.aop.framework.CglibAopProxy$DynamicAdvisedInterceptor.intercept(CglibAopProxy.java:688)\r\n at co.yixiang.modules.security.rest.AuthenticationController$$EnhancerBySpringCGLIB$$c276e2f1.login()\r\n at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)\r\n at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)\r\n at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)\r\n at java.lang.reflect.Method.invoke(Method.java:498)\r\n at org.springframework.web.method.support.InvocableHandlerMethod.doInvoke(InvocableHandlerMethod.java:215)\r\n at org.springframework.web.method.support.InvocableHandlerMethod.invokeForRequest(InvocableHandlerMethod.java:142)\r\n at org.springframework.web.servlet.mvc.method.annotation.ServletInvocableHandlerMethod.invokeAndHandle(ServletInvocableHandlerMethod.java:102)\r\n at org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter.invokeHandlerMethod(RequestMappingHandlerAdapter.java:895)\r\n at org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter.handleInternal(RequestMappingHandlerAdapter.java:800)\r\n at org.springframework.web.servlet.mvc.method.AbstractHandlerMethodAdapter.handle(AbstractHandlerMethodAdapter.java:87)\r\n at org.springframework.web.servlet.DispatcherServlet.doDispatch(DispatcherServlet.java:1038)\r\n at org.springframework.web.servlet.DispatcherServlet.doService(DispatcherServlet.java:942)\r\n at org.springframework.web.servlet.FrameworkServlet.processRequest(FrameworkServlet.java:998)\r\n at org.springframework.web.servlet.FrameworkServlet.doPost(FrameworkServlet.java:901)\r\n at javax.servlet.http.HttpServlet.service(HttpServlet.java:660)\r\n at org.springframework.web.servlet.FrameworkServlet.service(FrameworkServlet.java:875)\r\n at javax.servlet.http.HttpServlet.service(HttpServlet.java:741)\r\n at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:231)\r\n at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166)\r\n at org.apache.tomcat.websocket.server.WsFilter.doFilter(WsFilter.java:53)\r\n at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193)\r\n at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166)\r\n at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:101)\r\n at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193)\r\n at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166)\r\n at com.alibaba.druid.support.http.WebStatFilter.doFilter(WebStatFilter.java:123)\r\n at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193)\r\n at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166)\r\n at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:320)\r\n at org.springframework.security.web.access.intercept.FilterSecurityInterceptor.invoke(FilterSecurityInterceptor.java:127)\r\n at org.springframework.security.web.access.intercept.FilterSecurityInterceptor.doFilter(FilterSecurityInterceptor.java:91)\r\n at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334)\r\n at org.springframework.security.web.access.ExceptionTranslationFilter.doFilter(ExceptionTranslationFilter.java:119)\r\n at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334)\r\n at org.springframework.security.web.session.SessionManagementFilter.doFilter(SessionManagementFilter.java:137)\r\n at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334)\r\n at org.springframework.security.web.authentication.AnonymousAuthenticationFilter.doFilter(AnonymousAuthenticationFilter.java:111)\r\n at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334)\r\n at org.springframework.security.web.servletapi.SecurityContextHolderAwareRequestFilter.doFilter(SecurityContextHolderAwareRequestFilter.java:170)\r\n at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334)\r\n at org.springframework.security.web.savedrequest.RequestCacheAwareFilter.doFilter(RequestCacheAwareFilter.java:63)\r\n at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334)\r\n at co.yixiang.modules.security.security.JwtAuthorizationTokenFilter.doFilterInternal(JwtAuthorizationTokenFilter.java:67)\r\n at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:107)\r\n at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334)\r\n at org.springframework.security.web.authentication.logout.LogoutFilter.doFilter(LogoutFilter.java:116)\r\n at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334)\r\n at org.springframework.security.web.header.HeaderWriterFilter.doFilterInternal(HeaderWriterFilter.java:66)\r\n at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:107)\r\n at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334)\r\n at org.springframework.security.web.context.SecurityContextPersistenceFilter.doFilter(SecurityContextPersistenceFilter.java:105)\r\n at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334)\r\n at org.springframework.security.web.context.request.async.WebAsyncManagerIntegrationFilter.doFilterInternal(WebAsyncManagerIntegrationFilter.java:56)\r\n at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:107)\r\n at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334)\r\n at org.springframework.security.web.FilterChainProxy.doFilterInternal(FilterChainProxy.java:215)\r\n at org.springframework.security.web.FilterChainProxy.doFilter(FilterChainProxy.java:178)\r\n at org.springframework.web.filter.DelegatingFilterProxy.invokeDelegate(DelegatingFilterProxy.java:357)\r\n at org.springframework.web.filter.DelegatingFilterProxy.doFilter(DelegatingFilterProxy.java:270)\r\n at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193)\r\n at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166)\r\n at org.springframework.web.filter.CharacterEncodingFilter.doFilterInternal(CharacterEncodingFilter.java:200)\r\n at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:107)\r\n at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193)\r\n at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166)\r\n at org.apache.catalina.core.StandardWrapperValve.invoke(StandardWrapperValve.java:199)\r\n at org.apache.catalina.core.StandardContextValve.invoke(StandardContextValve.java:96)\r\n at org.apache.catalina.authenticator.AuthenticatorBase.invoke(AuthenticatorBase.java:490)\r\n at org.apache.catalina.core.StandardHostValve.invoke(StandardHostValve.java:139)\r\n at org.apache.catalina.valves.ErrorReportValve.invoke(ErrorReportValve.java:92)\r\n at org.apache.catalina.core.StandardEngineValve.invoke(StandardEngineValve.java:74)\r\n at org.apache.catalina.connector.CoyoteAdapter.service(CoyoteAdapter.java:343)\r\n at org.apache.coyote.http11.Http11Processor.service(Http11Processor.java:408)\r\n at org.apache.coyote.AbstractProcessorLight.process(AbstractProcessorLight.java:66)\r\n at org.apache.coyote.AbstractProtocol$ConnectionHandler.process(AbstractProtocol.java:770)\r\n at org.apache.tomcat.util.net.NioEndpoint$SocketProcessor.doRun(NioEndpoint.java:1415)\r\n at org.apache.tomcat.util.net.SocketProcessorBase.run(SocketProcessorBase.java:49)\r\n at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1149)\r\n at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:624)\r\n at org.apache.tomcat.util.threads.TaskThread$WrappingRunnable.run(TaskThread.java:61)\r\n at java.lang.Thread.run(Thread.java:748)\r\n', 'ERROR', 'co.yixiang.modules.security.rest.AuthenticationController.login()', '{ authorizationUser: {username=admin, password= ******} }', '127.0.0.1', 9, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17492, '2019-12-12 16:13:15', '用户登录', NULL, 'INFO', 'co.yixiang.modules.security.rest.AuthenticationController.login()', '{ authorizationUser: {username=admin, password= ******} }', '127.0.0.1', 783, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17493, '2019-12-12 16:21:58', '查询字典详情', NULL, 'INFO', 'co.yixiang.modules.system.rest.DictDetailController.getDictDetails()', '{ criteria: DictDetailQueryCriteria(label=null, dictName=express_companys) pageable: Page request [number: 0, size 2000, sort: sort: ASC] }', '127.0.0.1', 680, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17494, '2019-12-12 16:22:02', '查询', NULL, 'INFO', 'co.yixiang.modules.shop.rest.YxStoreProductReplyController.getYxStoreProductReplys()', '{ criteria: YxStoreProductReplyQueryCriteria(isDel=0) pageable: Page request [number: 0, size 10, sort: id: DESC] }', '127.0.0.1', 135, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17495, '2019-12-12 16:22:05', '查询数据配置', NULL, 'INFO', 'co.yixiang.modules.shop.rest.YxSystemGroupDataController.getYxSystemGroupDatas()', '{ criteria: YxSystemGroupDataQueryCriteria(groupName=routine_home_banner) pageable: Page request [number: 0, size 10, sort: id: DESC] }', '127.0.0.1', 15, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17496, '2019-12-12 16:22:19', '查询数据配置', NULL, 'INFO', 'co.yixiang.modules.shop.rest.YxSystemGroupDataController.getYxSystemGroupDatas()', '{ criteria: YxSystemGroupDataQueryCriteria(groupName=routine_home_menus) pageable: Page request [number: 0, size 10, sort: id: DESC] }', '127.0.0.1', 8, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17497, '2019-12-12 16:22:24', '查询数据配置', NULL, 'INFO', 'co.yixiang.modules.shop.rest.YxSystemGroupDataController.getYxSystemGroupDatas()', '{ criteria: YxSystemGroupDataQueryCriteria(groupName=routine_my_menus) pageable: Page request [number: 0, size 10, sort: id: DESC] }', '127.0.0.1', 5, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17498, '2019-12-12 16:30:45', '查询菜单', NULL, 'INFO', 'co.yixiang.modules.system.rest.MenuController.getMenus()', '{ criteria: MenuQueryCriteria(blurry=null) }', '127.0.0.1', 16, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17499, '2019-12-12 16:31:34', '查询菜单', NULL, 'INFO', 'co.yixiang.modules.system.rest.MenuController.getMenus()', '{ criteria: MenuQueryCriteria(blurry=null) }', '127.0.0.1', 2, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17500, '2019-12-12 16:32:55', '新增菜单', 'co.yixiang.exception.BadRequestException: 演示环境禁止操作\r\n at co.yixiang.modules.system.rest.MenuController.create(MenuController.java:78)\r\n at co.yixiang.modules.system.rest.MenuController$$FastClassBySpringCGLIB$$df40f4f4.invoke()\r\n at org.springframework.cglib.proxy.MethodProxy.invoke(MethodProxy.java:218)\r\n at org.springframework.aop.framework.CglibAopProxy$CglibMethodInvocation.invokeJoinpoint(CglibAopProxy.java:746)\r\n at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:163)\r\n at org.springframework.aop.aspectj.MethodInvocationProceedingJoinPoint.proceed(MethodInvocationProceedingJoinPoint.java:88)\r\n at co.yixiang.aspect.LogAspect.logAround(LogAspect.java:50)\r\n at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)\r\n at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)\r\n at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)\r\n at java.lang.reflect.Method.invoke(Method.java:498)\r\n at org.springframework.aop.aspectj.AbstractAspectJAdvice.invokeAdviceMethodWithGivenArgs(AbstractAspectJAdvice.java:644)\r\n at org.springframework.aop.aspectj.AbstractAspectJAdvice.invokeAdviceMethod(AbstractAspectJAdvice.java:633)\r\n at org.springframework.aop.aspectj.AspectJAroundAdvice.invoke(AspectJAroundAdvice.java:70)\r\n at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:175)\r\n at org.springframework.aop.aspectj.AspectJAfterThrowingAdvice.invoke(AspectJAfterThrowingAdvice.java:62)\r\n at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:175)\r\n at org.springframework.security.access.intercept.aopalliance.MethodSecurityInterceptor.invoke(MethodSecurityInterceptor.java:69)\r\n at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:186)\r\n at org.springframework.aop.interceptor.ExposeInvocationInterceptor.invoke(ExposeInvocationInterceptor.java:93)\r\n at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:186)\r\n at org.springframework.aop.framework.CglibAopProxy$DynamicAdvisedInterceptor.intercept(CglibAopProxy.java:688)\r\n at co.yixiang.modules.system.rest.MenuController$$EnhancerBySpringCGLIB$$bca3161e.create()\r\n at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)\r\n at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)\r\n at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)\r\n at java.lang.reflect.Method.invoke(Method.java:498)\r\n at org.springframework.web.method.support.InvocableHandlerMethod.doInvoke(InvocableHandlerMethod.java:215)\r\n at org.springframework.web.method.support.InvocableHandlerMethod.invokeForRequest(InvocableHandlerMethod.java:142)\r\n at org.springframework.web.servlet.mvc.method.annotation.ServletInvocableHandlerMethod.invokeAndHandle(ServletInvocableHandlerMethod.java:102)\r\n at org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter.invokeHandlerMethod(RequestMappingHandlerAdapter.java:895)\r\n at org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter.handleInternal(RequestMappingHandlerAdapter.java:800)\r\n at org.springframework.web.servlet.mvc.method.AbstractHandlerMethodAdapter.handle(AbstractHandlerMethodAdapter.java:87)\r\n at org.springframework.web.servlet.DispatcherServlet.doDispatch(DispatcherServlet.java:1038)\r\n at org.springframework.web.servlet.DispatcherServlet.doService(DispatcherServlet.java:942)\r\n at org.springframework.web.servlet.FrameworkServlet.processRequest(FrameworkServlet.java:998)\r\n at org.springframework.web.servlet.FrameworkServlet.doPost(FrameworkServlet.java:901)\r\n at javax.servlet.http.HttpServlet.service(HttpServlet.java:660)\r\n at org.springframework.web.servlet.FrameworkServlet.service(FrameworkServlet.java:875)\r\n at javax.servlet.http.HttpServlet.service(HttpServlet.java:741)\r\n at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:231)\r\n at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166)\r\n at org.apache.tomcat.websocket.server.WsFilter.doFilter(WsFilter.java:53)\r\n at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193)\r\n at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166)\r\n at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:101)\r\n at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193)\r\n at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166)\r\n at com.alibaba.druid.support.http.WebStatFilter.doFilter(WebStatFilter.java:123)\r\n at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193)\r\n at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166)\r\n at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:320)\r\n at org.springframework.security.web.access.intercept.FilterSecurityInterceptor.invoke(FilterSecurityInterceptor.java:127)\r\n at org.springframework.security.web.access.intercept.FilterSecurityInterceptor.doFilter(FilterSecurityInterceptor.java:91)\r\n at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334)\r\n at org.springframework.security.web.access.ExceptionTranslationFilter.doFilter(ExceptionTranslationFilter.java:119)\r\n at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334)\r\n at org.springframework.security.web.session.SessionManagementFilter.doFilter(SessionManagementFilter.java:137)\r\n at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334)\r\n at org.springframework.security.web.authentication.AnonymousAuthenticationFilter.doFilter(AnonymousAuthenticationFilter.java:111)\r\n at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334)\r\n at org.springframework.security.web.servletapi.SecurityContextHolderAwareRequestFilter.doFilter(SecurityContextHolderAwareRequestFilter.java:170)\r\n at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334)\r\n at org.springframework.security.web.savedrequest.RequestCacheAwareFilter.doFilter(RequestCacheAwareFilter.java:63)\r\n at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334)\r\n at co.yixiang.modules.security.security.JwtAuthorizationTokenFilter.doFilterInternal(JwtAuthorizationTokenFilter.java:67)\r\n at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:107)\r\n at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334)\r\n at org.springframework.security.web.authentication.logout.LogoutFilter.doFilter(LogoutFilter.java:116)\r\n at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334)\r\n at org.springframework.security.web.header.HeaderWriterFilter.doFilterInternal(HeaderWriterFilter.java:66)\r\n at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:107)\r\n at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334)\r\n at org.springframework.security.web.context.SecurityContextPersistenceFilter.doFilter(SecurityContextPersistenceFilter.java:105)\r\n at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334)\r\n at org.springframework.security.web.context.request.async.WebAsyncManagerIntegrationFilter.doFilterInternal(WebAsyncManagerIntegrationFilter.java:56)\r\n at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:107)\r\n at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334)\r\n at org.springframework.security.web.FilterChainProxy.doFilterInternal(FilterChainProxy.java:215)\r\n at org.springframework.security.web.FilterChainProxy.doFilter(FilterChainProxy.java:178)\r\n at org.springframework.web.filter.DelegatingFilterProxy.invokeDelegate(DelegatingFilterProxy.java:357)\r\n at org.springframework.web.filter.DelegatingFilterProxy.doFilter(DelegatingFilterProxy.java:270)\r\n at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193)\r\n at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166)\r\n at org.springframework.web.filter.CharacterEncodingFilter.doFilterInternal(CharacterEncodingFilter.java:200)\r\n at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:107)\r\n at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193)\r\n at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166)\r\n at org.apache.catalina.core.StandardWrapperValve.invoke(StandardWrapperValve.java:199)\r\n at org.apache.catalina.core.StandardContextValve.invoke(StandardContextValve.java:96)\r\n at org.apache.catalina.authenticator.AuthenticatorBase.invoke(AuthenticatorBase.java:490)\r\n at org.apache.catalina.core.StandardHostValve.invoke(StandardHostValve.java:139)\r\n at org.apache.catalina.valves.ErrorReportValve.invoke(ErrorReportValve.java:92)\r\n at org.apache.catalina.core.StandardEngineValve.invoke(StandardEngineValve.java:74)\r\n at org.apache.catalina.connector.CoyoteAdapter.service(CoyoteAdapter.java:343)\r\n at org.apache.coyote.http11.Http11Processor.service(Http11Processor.java:408)\r\n at org.apache.coyote.AbstractProcessorLight.process(AbstractProcessorLight.java:66)\r\n at org.apache.coyote.AbstractProtocol$ConnectionHandler.process(AbstractProtocol.java:770)\r\n at org.apache.tomcat.util.net.NioEndpoint$SocketProcessor.doRun(NioEndpoint.java:1415)\r\n at org.apache.tomcat.util.net.SocketProcessorBase.run(SocketProcessorBase.java:49)\r\n at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1149)\r\n at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:624)\r\n at org.apache.tomcat.util.threads.TaskThread$WrappingRunnable.run(TaskThread.java:61)\r\n at java.lang.Thread.run(Thread.java:748)\r\n', 'ERROR', 'co.yixiang.modules.system.rest.MenuController.create()', '{ resources: co.yixiang.modules.system.domain.Menu@1f }', '127.0.0.1', 0, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17501, '2019-12-12 16:36:00', '新增菜单', NULL, 'INFO', 'co.yixiang.modules.system.rest.MenuController.create()', '{ resources: co.yixiang.modules.system.domain.Menu@70 }', '127.0.0.1', 160, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17502, '2019-12-12 16:36:00', '查询菜单', NULL, 'INFO', 'co.yixiang.modules.system.rest.MenuController.getMenus()', '{ criteria: MenuQueryCriteria(blurry=null) }', '127.0.0.1', 82, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17503, '2019-12-12 16:36:52', '查询角色', NULL, 'INFO', 'co.yixiang.modules.system.rest.RoleController.getRoles()', '{ criteria: RoleQueryCriteria(blurry=null) pageable: Page request [number: 0, size 10, sort: level: ASC] }', '127.0.0.1', 113, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17504, '2019-12-12 16:36:58', '修改角色菜单', NULL, 'INFO', 'co.yixiang.modules.system.rest.RoleController.updateMenu()', '{ resources: Role{id=1, name=\'null\', remark=\'null\', createDateTime=null} }', '127.0.0.1', 123, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17505, '2019-12-12 16:37:06', '查询菜单', NULL, 'INFO', 'co.yixiang.modules.system.rest.MenuController.getMenus()', '{ criteria: MenuQueryCriteria(blurry=null) }', '127.0.0.1', 4, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17506, '2019-12-12 16:37:10', '查询YxExpress', NULL, 'INFO', 'co.yixiang.modules.shop.rest.YxExpressController.getYxExpresss()', '{ criteria: YxExpressQueryCriteria() pageable: Page request [number: 0, size 10, sort: id: DESC] }', '127.0.0.1', 14, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17507, '2019-12-12 16:38:02', '查询YxExpress', NULL, 'INFO', 'co.yixiang.modules.shop.rest.YxExpressController.getYxExpresss()', '{ criteria: YxExpressQueryCriteria() pageable: Page request [number: 0, size 10, sort: id: DESC] }', '127.0.0.1', 6, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17508, '2019-12-12 16:49:21', '查询YxExpress', NULL, 'INFO', 'co.yixiang.modules.shop.rest.YxExpressController.getYxExpresss()', '{ criteria: YxExpressQueryCriteria() pageable: Page request [number: 0, size 10, sort: id: DESC] }', '127.0.0.1', 21, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17509, '2019-12-12 17:05:12', '查询YxExpress', NULL, 'INFO', 'co.yixiang.modules.shop.rest.YxExpressController.getYxExpresss()', '{ criteria: YxExpressQueryCriteria() pageable: Page request [number: 0, size 10, sort: id: DESC] }', '127.0.0.1', 8, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17510, '2019-12-12 17:06:51', '查询字典详情', NULL, 'INFO', 'co.yixiang.modules.system.rest.DictDetailController.getDictDetails()', '{ criteria: DictDetailQueryCriteria(label=null, dictName=express_companys) pageable: Page request [number: 0, size 2000, sort: sort: ASC] }', '127.0.0.1', 36, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17511, '2019-12-12 17:07:16', '查询字典详情', NULL, 'INFO', 'co.yixiang.modules.system.rest.DictDetailController.getDictDetails()', '{ criteria: DictDetailQueryCriteria(label=null, dictName=express_companys) pageable: Page request [number: 0, size 2000, sort: sort: ASC] }', '127.0.0.1', 6, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17512, '2019-12-12 17:12:14', '查询YxExpress', NULL, 'INFO', 'co.yixiang.modules.shop.rest.YxExpressController.getYxExpresss()', '{ criteria: YxExpressQueryCriteria() pageable: Page request [number: 0, size 20, sort: UNSORTED] }', '127.0.0.1', 6, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17513, '2019-12-12 17:12:18', '查询YxExpress', NULL, 'INFO', 'co.yixiang.modules.shop.rest.YxExpressController.getYxExpresss()', '{ criteria: YxExpressQueryCriteria() pageable: Page request [number: 0, size 20, sort: UNSORTED] }', '127.0.0.1', 7, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17514, '2019-12-12 17:13:37', '查询YxExpress', NULL, 'INFO', 'co.yixiang.modules.shop.rest.YxExpressController.getYxExpresss()', '{ criteria: YxExpressQueryCriteria() pageable: Page request [number: 0, size 20, sort: UNSORTED] }', '127.0.0.1', 9, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17515, '2019-12-12 17:23:35', '查询', NULL, 'INFO', 'co.yixiang.modules.shop.rest.YxStoreProductReplyController.getYxStoreProductReplys()', '{ criteria: YxStoreProductReplyQueryCriteria(isDel=0) pageable: Page request [number: 0, size 10, sort: id: DESC] }', '127.0.0.1', 45, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17516, '2019-12-12 17:23:38', '查询用户', NULL, 'INFO', 'co.yixiang.modules.shop.rest.YxUserController.getYxUsers()', '{ criteria: YxUserQueryCriteria(nickname=null, phone=null, isPromoter=null) pageable: Page request [number: 0, size 10, sort: uid: DESC] }', '127.0.0.1', 14, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17517, '2019-12-12 17:23:43', '查询商品', NULL, 'INFO', 'co.yixiang.modules.shop.rest.YxStoreProductController.getYxStoreProducts()', '{ criteria: YxStoreProductQueryCriteria(storeName=null, isDel=null, isShow=0) pageable: Page request [number: 0, size 10, sort: id: DESC] }', '127.0.0.1', 15, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17518, '2019-12-12 17:23:43', '查询商品', NULL, 'INFO', 'co.yixiang.modules.shop.rest.YxStoreProductController.getYxStoreProducts()', '{ criteria: YxStoreProductQueryCriteria(storeName=null, isDel=1, isShow=null) pageable: Page request [number: 0, size 10, sort: id: DESC] }', '127.0.0.1', 18, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17519, '2019-12-12 17:23:43', '查询商品', NULL, 'INFO', 'co.yixiang.modules.shop.rest.YxStoreProductController.getYxStoreProducts()', '{ criteria: YxStoreProductQueryCriteria(storeName=null, isDel=0, isShow=1) pageable: Page request [number: 0, size 10, sort: id: DESC] }', '127.0.0.1', 127, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17520, '2019-12-12 17:23:46', '查询商品分类', NULL, 'INFO', 'co.yixiang.modules.shop.rest.YxStoreCategoryController.getYxStoreCategorys()', '{ criteria: YxStoreCategoryQueryCriteria(cateName=null) pageable: Page request [number: 0, size 20, sort: UNSORTED] }', '127.0.0.1', 13, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17521, '2019-12-12 17:23:51', '修改商品', NULL, 'INFO', 'co.yixiang.modules.shop.rest.YxStoreProductController.update()', '{ resources: YxStoreProduct(id=20, merId=0, image=https://image.dayouqiantu.cn/5ca04fa9c08ef.jpg, sliderImage=https://image.dayouqiantu.cn/5ca05103ad634.jpg,https://image.dayouqiantu.cn/5ca04fa9c08ef.jpg, storeName=70gA4彩色打印复印, storeInfo=70gA4彩色打印复印, keyword=彩色打印复印, barCode=, cateId=24, price=0.5, vipPrice=0.5, otPrice=1, postage=0, unitName=张, sort=0, sales=1, stock=100, isShow=1, isHot=1, isBenefit=1, isBest=1, isNew=1, description=

7文件请传QQ2412733099，

718504558或2412733099@qq.com邮箱，

手机/微信：13733990583

量大请联系店主，一定让您满意而归

   实体店面经营 保质保量

A4黑白2毛/张，量大1毛/张，

A3黑白双面5毛/张，量大3毛/张，

更大量请联系店主报价，

每消费1元可积1分，1分抵现金1毛，

付款时直接抵扣

（如此优惠的基础上还可积分，积分抵现金）



, addTime=1573108370, isPostage=1, isDel=0, merUse=0, giveIntegral=0, cost=0.5, isSeckill=0, isBargain=0, isGood=1, ficti=0, browse=0, codePath=, soureLink=) }', '127.0.0.1', 9, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17522, '2019-12-12 17:23:51', '查询商品', NULL, 'INFO', 'co.yixiang.modules.shop.rest.YxStoreProductController.getYxStoreProducts()', '{ criteria: YxStoreProductQueryCriteria(storeName=null, isDel=0, isShow=1) pageable: Page request [number: 0, size 10, sort: id: DESC] }', '127.0.0.1', 15, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17523, '2019-12-12 17:29:25', '查询商品', NULL, 'INFO', 'co.yixiang.modules.shop.rest.YxStoreProductController.getYxStoreProducts()', '{ criteria: YxStoreProductQueryCriteria(storeName=null, isDel=null, isShow=0) pageable: Page request [number: 0, size 10, sort: id: DESC] }', '127.0.0.1', 127, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17524, '2019-12-12 17:29:25', '查询商品', NULL, 'INFO', 'co.yixiang.modules.shop.rest.YxStoreProductController.getYxStoreProducts()', '{ criteria: YxStoreProductQueryCriteria(storeName=null, isDel=0, isShow=1) pageable: Page request [number: 0, size 10, sort: id: DESC] }', '127.0.0.1', 237, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17525, '2019-12-12 17:29:25', '查询商品', NULL, 'INFO', 'co.yixiang.modules.shop.rest.YxStoreProductController.getYxStoreProducts()', '{ criteria: YxStoreProductQueryCriteria(storeName=null, isDel=1, isShow=null) pageable: Page request [number: 0, size 10, sort: id: DESC] }', '127.0.0.1', 127, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17526, '2019-12-12 17:29:25', '查询角色', NULL, 'INFO', 'co.yixiang.modules.system.rest.RoleController.getRoles()', '{ criteria: RoleQueryCriteria(blurry=null) pageable: Page request [number: 0, size 10, sort: level: ASC] }', '127.0.0.1', 314, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17527, '2019-12-12 17:29:30', '查询菜单', NULL, 'INFO', 'co.yixiang.modules.system.rest.MenuController.getMenus()', '{ criteria: MenuQueryCriteria(blurry=null) }', '127.0.0.1', 6, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17528, '2019-12-12 17:29:53', '修改菜单', NULL, 'INFO', 'co.yixiang.modules.system.rest.MenuController.update()', '{ resources: co.yixiang.modules.system.domain.Menu@4f }', '127.0.0.1', 173, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17529, '2019-12-12 17:29:54', '查询菜单', NULL, 'INFO', 'co.yixiang.modules.system.rest.MenuController.getMenus()', '{ criteria: MenuQueryCriteria(blurry=null) }', '127.0.0.1', 15, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17530, '2019-12-12 17:30:05', '修改菜单', NULL, 'INFO', 'co.yixiang.modules.system.rest.MenuController.update()', '{ resources: co.yixiang.modules.system.domain.Menu@70 }', '127.0.0.1', 55, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17531, '2019-12-12 17:30:05', '查询菜单', NULL, 'INFO', 'co.yixiang.modules.system.rest.MenuController.getMenus()', '{ criteria: MenuQueryCriteria(blurry=null) }', '127.0.0.1', 18, 'admin', '内网IP'); +INSERT INTO `log` VALUES (17532, '2019-12-12 17:30:08', '查询角色', NULL, 'INFO', 'co.yixiang.modules.system.rest.RoleController.getRoles()', '{ criteria: RoleQueryCriteria(blurry=null) pageable: Page request [number: 0, size 10, sort: level: ASC] }', '127.0.0.1', 4, 'admin', '内网IP'); -- ---------------------------- -- Table structure for menu @@ -3287,7 +3516,7 @@ CREATE TABLE `menu` ( `component_name` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '-', PRIMARY KEY (`id`) USING BTREE, INDEX `FKqcf9gem97gqa5qjm4d3elcqt5`(`pid`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 80 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact; +) ENGINE = InnoDB AUTO_INCREMENT = 82 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact; -- ---------------------------- -- Records of menu @@ -3312,42 +3541,44 @@ INSERT INTO `menu` VALUES (35, '2019-03-25 09:46:00', b'0', '部门管理', 'sys INSERT INTO `menu` VALUES (36, '2019-03-29 10:57:35', b'0', '系统工具', '', 0, 101, 'sys-tools', 'sys-tools', b'0', b'0', NULL); INSERT INTO `menu` VALUES (37, '2019-03-29 13:51:18', b'0', '岗位管理', 'system/job/index', 1, 7, 'Steve-Jobs', 'job', b'0', b'0', 'Job'); INSERT INTO `menu` VALUES (39, '2019-04-10 11:49:04', b'0', '字典管理', 'system/dict/index', 1, 8, 'dictionary', 'dict', b'0', b'0', 'Dict'); -INSERT INTO `menu` VALUES (40, '2019-10-03 17:40:19', b'0', '商品管理', '', 0, 1, 'zujian', 'shop', b'0', b'0', ''); +INSERT INTO `menu` VALUES (40, '2019-10-03 17:40:19', b'0', '商品管理', '', 0, 1, 'shop', 'shop', b'0', b'0', ''); INSERT INTO `menu` VALUES (41, '2019-10-03 17:42:35', b'0', '商品分类', 'shop/cate/index', 40, 11, 'icon', 'cate', b'0', b'0', 'Cate'); INSERT INTO `menu` VALUES (45, '2019-10-04 15:34:35', b'0', '管理商品', 'shop/goods/tab', 40, 12, 'develop', 'goods', b'0', b'0', 'Goods'); -INSERT INTO `menu` VALUES (46, '2019-10-06 16:18:05', b'0', '会员管理', '', 0, 2, 'zujian', 'member', b'0', b'0', ''); -INSERT INTO `menu` VALUES (47, '2019-10-06 16:20:17', b'0', '会员', 'shop/user/index', 46, 21, 'log', 'member', b'0', b'0', 'Member'); -INSERT INTO `menu` VALUES (48, '2019-10-06 18:28:54', b'0', '公众号', '', 0, 3, 'zujian', 'wechat', b'0', b'0', ''); -INSERT INTO `menu` VALUES (49, '2019-10-06 18:31:06', b'0', '微信菜单', 'wechat/menu/index', 48, 31, 'log', 'wemenu', b'0', b'0', 'WeMenu'); -INSERT INTO `menu` VALUES (50, '2019-10-07 17:33:45', b'0', '图文管理', 'wechat/article/index', 48, 32, 'log', 'wearticle', b'0', b'0', 'WeArticle'); -INSERT INTO `menu` VALUES (51, '2019-10-10 09:58:31', b'0', '自动回复', 'wechat/reply/index', 48, 33, 'log', 'wereply', b'0', b'0', 'Wereply'); -INSERT INTO `menu` VALUES (52, '2019-10-10 15:52:24', b'0', '公众号配置', 'wechat/config/index', 48, 34, 'log', 'weconfig', b'0', b'0', 'WeConfig'); +INSERT INTO `menu` VALUES (46, '2019-10-06 16:18:05', b'0', '会员管理', '', 0, 2, 'peoples', 'member', b'0', b'0', ''); +INSERT INTO `menu` VALUES (47, '2019-10-06 16:20:17', b'0', '会员', 'shop/user/index', 46, 21, 'peoples', 'member', b'0', b'0', 'Member'); +INSERT INTO `menu` VALUES (48, '2019-10-06 18:28:54', b'0', '微信管理', '', 0, 3, 'weixin', 'wechat', b'0', b'0', ''); +INSERT INTO `menu` VALUES (49, '2019-10-06 18:31:06', b'0', '微信菜单', 'wechat/menu/index', 48, 31, 'menu', 'wemenu', b'0', b'0', 'WeMenu'); +INSERT INTO `menu` VALUES (50, '2019-10-07 17:33:45', b'0', '图文管理', 'wechat/article/index', 48, 32, 'article', 'wearticle', b'0', b'0', 'WeArticle'); +INSERT INTO `menu` VALUES (51, '2019-10-10 09:58:31', b'0', '自动回复', 'wechat/reply/index', 48, 33, 'reply', 'wereply', b'0', b'0', 'Wereply'); +INSERT INTO `menu` VALUES (52, '2019-10-10 15:52:24', b'0', '公众号配置', 'wechat/config/index', 48, 34, 'configure', 'weconfig', b'0', b'0', 'WeConfig'); INSERT INTO `menu` VALUES (53, '2019-10-14 14:35:18', b'0', '订单管理', '', 0, 4, 'lock', 'order', b'0', b'0', ''); -INSERT INTO `menu` VALUES (54, '2019-10-14 14:36:28', b'0', '订单', 'shop/order/index', 53, 41, 'log', 'order', b'0', b'0', 'Order'); -INSERT INTO `menu` VALUES (55, '2019-10-18 15:21:26', b'0', '数据配置', '', 0, 5, 'icon', 'set', b'0', b'0', ''); -INSERT INTO `menu` VALUES (56, '2019-10-18 15:24:30', b'0', '首页幻灯片', 'shop/set/index', 55, 51, 'log', 'homeBanner', b'0', b'0', 'HomeBanner'); -INSERT INTO `menu` VALUES (57, '2019-10-18 17:23:35', b'0', '首页导航按钮', 'shop/set/menu', 55, 52, 'log', 'homeMenus', b'0', b'0', 'HomeMenus'); -INSERT INTO `menu` VALUES (59, '2019-10-21 16:41:30', b'0', '首页滚动新闻', 'shop/set/roll', 55, 54, 'log', 'roll', b'0', b'0', 'Roll'); -INSERT INTO `menu` VALUES (60, '2019-10-26 18:21:54', b'0', '热门搜索', 'shop/set/hot', 55, 55, 'log', 'hot', b'0', b'0', 'Hot'); -INSERT INTO `menu` VALUES (61, '2019-10-26 18:42:18', b'0', '个人中心菜单', 'shop/set/usermenu', 55, 56, 'log', 'userMenu', b'0', b'0', 'UserMenu'); -INSERT INTO `menu` VALUES (62, '2019-11-03 14:39:09', b'0', '评论管理', 'shop/reply/index', 53, 42, 'log', 'reply', b'0', b'0', 'Reply'); -INSERT INTO `menu` VALUES (63, '2019-11-09 14:17:42', b'0', '营销管理', '', 0, 6, 'log', 'activity', b'0', b'0', ''); -INSERT INTO `menu` VALUES (64, '2019-11-09 14:18:58', b'0', '优惠券制作', 'activity/coupon/index', 63, 61, 'log', 'coupon', b'0', b'0', 'Coupon'); -INSERT INTO `menu` VALUES (65, '2019-11-09 14:20:35', b'0', '已发布优惠券', 'activity/couponissue/index', 63, 62, 'log', 'couponissue', b'0', b'0', 'Couponissue'); +INSERT INTO `menu` VALUES (54, '2019-10-14 14:36:28', b'0', '订单', 'shop/order/index', 53, 41, 'order', 'order', b'0', b'0', 'Order'); +INSERT INTO `menu` VALUES (55, '2019-10-18 15:21:26', b'0', '数据配置', '', 0, 5, 'configure', 'set', b'0', b'0', ''); +INSERT INTO `menu` VALUES (56, '2019-10-18 15:24:30', b'0', '首页幻灯片', 'shop/set/index', 55, 51, 'banner', 'homeBanner', b'0', b'0', 'HomeBanner'); +INSERT INTO `menu` VALUES (57, '2019-10-18 17:23:35', b'0', '首页导航按钮', 'shop/set/menu', 55, 52, 'button', 'homeMenus', b'0', b'0', 'HomeMenus'); +INSERT INTO `menu` VALUES (59, '2019-10-21 16:41:30', b'0', '首页滚动新闻', 'shop/set/roll', 55, 54, 'news', 'roll', b'0', b'0', 'Roll'); +INSERT INTO `menu` VALUES (60, '2019-10-26 18:21:54', b'0', '热门搜索', 'shop/set/hot', 55, 55, 'search', 'hot', b'0', b'0', 'Hot'); +INSERT INTO `menu` VALUES (61, '2019-10-26 18:42:18', b'0', '个人中心菜单', 'shop/set/usermenu', 55, 56, 'menu', 'userMenu', b'0', b'0', 'UserMenu'); +INSERT INTO `menu` VALUES (62, '2019-11-03 14:39:09', b'0', '评论管理', 'shop/reply/index', 53, 42, 'comment', 'reply', b'0', b'0', 'Reply'); +INSERT INTO `menu` VALUES (63, '2019-11-09 14:17:42', b'0', '营销管理', '', 0, 6, 'yingxiao', 'activity', b'0', b'0', ''); +INSERT INTO `menu` VALUES (64, '2019-11-09 14:18:58', b'0', '优惠券制作', 'activity/coupon/index', 63, 61, 'coupon', 'coupon', b'0', b'0', 'Coupon'); +INSERT INTO `menu` VALUES (65, '2019-11-09 14:20:35', b'0', '已发布优惠券', 'activity/couponissue/index', 63, 62, 'coupon2', 'couponissue', b'0', b'0', 'Couponissue'); INSERT INTO `menu` VALUES (66, '2019-11-09 14:21:35', b'0', '优惠券领取记录', 'activity/storecouponuser/index', 63, 63, 'log', 'couponuser', b'0', b'0', 'Couponuser'); INSERT INTO `menu` VALUES (67, '2019-11-09 14:22:17', b'0', '优惠券配置', 'activity/coupon/set', 63, 64, 'log', 'couponset', b'0', b'1', 'Couponset'); -INSERT INTO `menu` VALUES (68, '2019-11-10 18:45:55', b'0', '积分配置', 'wechat/config/point', 55, 57, 'log', 'pointConfig', b'0', b'0', 'PointConfig'); -INSERT INTO `menu` VALUES (69, '2019-11-11 10:42:16', b'0', '分销管理', '', 0, 7, 'log', 'promoter', b'0', b'0', ''); -INSERT INTO `menu` VALUES (70, '2019-11-11 10:48:37', b'0', '分销配置', 'wechat/config/promoter', 69, 71, 'log', 'promoterconfig', b'0', b'0', 'Promoterconfig'); -INSERT INTO `menu` VALUES (71, '2019-11-13 18:32:00', b'0', '分销员', 'shop/user/aindex', 69, 72, 'log', 'agent', b'0', b'0', 'Agent'); -INSERT INTO `menu` VALUES (72, '2019-11-14 10:49:39', b'0', '提现管理', 'activity/extract/index', 69, 73, 'log', 'extract', b'0', b'0', 'Extract'); -INSERT INTO `menu` VALUES (73, '2019-11-18 14:23:04', b'0', '拼团产品', 'activity/combination/index', 63, 64, 'log', 'combination', b'0', b'0', 'Combination'); -INSERT INTO `menu` VALUES (74, '2019-11-21 19:35:58', b'0', '拼团列表', 'activity/combinlist/index', 63, 65, 'log', 'pink', b'0', b'0', 'Pink'); -INSERT INTO `menu` VALUES (75, '2019-11-28 17:06:22', b'0', '微信支付配置', 'wechat/config/pay', 48, 35, 'log', 'wxpayconfig', b'0', b'0', 'Wxpayconfig'); -INSERT INTO `menu` VALUES (76, '2019-11-29 15:13:46', b'0', '小程序配置', 'wechat/config/wxapp', 48, 36, 'log', 'wxapp', b'0', b'0', 'Wxapp'); -INSERT INTO `menu` VALUES (77, '2019-12-04 16:35:41', b'0', '会员等级', 'shop/userlevel/index', 46, 22, 'log', 'userlevel', b'0', b'0', 'Userlevel'); -INSERT INTO `menu` VALUES (78, '2019-12-04 17:26:19', b'0', '等级任务', 'shop/usertask/index', 46, 23, 'log', 'usertask', b'0', b'0', 'Usertask'); -INSERT INTO `menu` VALUES (79, '2019-12-05 14:12:16', b'0', '签到天数配置', 'shop/set/sign', 55, 57, 'log', 'signday', b'0', b'0', 'Signday'); +INSERT INTO `menu` VALUES (68, '2019-11-10 18:45:55', b'0', '积分配置', 'wechat/config/point', 55, 57, 'configure', 'pointConfig', b'0', b'0', 'PointConfig'); +INSERT INTO `menu` VALUES (69, '2019-11-11 10:42:16', b'0', '分销管理', '', 0, 7, 'fenxiao', 'promoter', b'0', b'0', ''); +INSERT INTO `menu` VALUES (70, '2019-11-11 10:48:37', b'0', '分销配置', 'wechat/config/promoter', 69, 71, 'configure', 'promoterconfig', b'0', b'0', 'Promoterconfig'); +INSERT INTO `menu` VALUES (71, '2019-11-13 18:32:00', b'0', '分销员', 'shop/user/aindex', 69, 72, 'user', 'agent', b'0', b'0', 'Agent'); +INSERT INTO `menu` VALUES (72, '2019-11-14 10:49:39', b'0', '提现管理', 'activity/extract/index', 69, 73, 'tixian', 'extract', b'0', b'0', 'Extract'); +INSERT INTO `menu` VALUES (73, '2019-11-18 14:23:04', b'0', '拼团产品', 'activity/combination/index', 63, 64, 'peoples', 'combination', b'0', b'0', 'Combination'); +INSERT INTO `menu` VALUES (74, '2019-11-21 19:35:58', b'0', '拼团列表', 'activity/combinlist/index', 63, 65, 'list', 'pink', b'0', b'0', 'Pink'); +INSERT INTO `menu` VALUES (75, '2019-11-28 17:06:22', b'0', '微信支付配置', 'wechat/config/pay', 48, 35, 'wxpay', 'wxpayconfig', b'0', b'0', 'Wxpayconfig'); +INSERT INTO `menu` VALUES (76, '2019-11-29 15:13:46', b'0', '小程序配置', 'wechat/config/wxapp', 48, 36, 'configure', 'wxapp', b'0', b'0', 'Wxapp'); +INSERT INTO `menu` VALUES (77, '2019-12-04 16:35:41', b'0', '会员等级', 'shop/userlevel/index', 46, 22, 'dengji', 'userlevel', b'0', b'0', 'Userlevel'); +INSERT INTO `menu` VALUES (78, '2019-12-04 17:26:19', b'0', '等级任务', 'shop/usertask/index', 46, 23, 'task manege', 'usertask', b'0', b'0', 'Usertask'); +INSERT INTO `menu` VALUES (79, '2019-12-05 14:12:16', b'0', '签到天数配置', 'shop/set/sign', 55, 57, 'sign2', 'signday', b'0', b'0', 'Signday'); +INSERT INTO `menu` VALUES (80, '2019-12-11 17:28:38', b'0', '用户账单', 'shop/user/bill', 46, 24, 'list', 'bill', b'0', b'0', 'Bill'); +INSERT INTO `menu` VALUES (81, '2019-12-12 16:36:00', b'0', '物流快递', 'shop/express/index', 53, 43, 'express', 'express', b'0', b'0', 'Express'); -- ---------------------------- -- Table structure for permission @@ -3676,6 +3907,8 @@ INSERT INTO `roles_menus` VALUES (76, 1); INSERT INTO `roles_menus` VALUES (77, 1); INSERT INTO `roles_menus` VALUES (78, 1); INSERT INTO `roles_menus` VALUES (79, 1); +INSERT INTO `roles_menus` VALUES (80, 1); +INSERT INTO `roles_menus` VALUES (81, 1); INSERT INTO `roles_menus` VALUES (1, 2); INSERT INTO `roles_menus` VALUES (2, 2); INSERT INTO `roles_menus` VALUES (3, 2); @@ -3827,7 +4060,7 @@ CREATE TABLE `visits` ( `week_day` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, PRIMARY KEY (`id`) USING BTREE, UNIQUE INDEX `UK_11aksgq87euk9bcyeesfs4vtp`(`date`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 159 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact; +) ENGINE = InnoDB AUTO_INCREMENT = 162 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact; -- ---------------------------- -- Records of visits @@ -3895,6 +4128,9 @@ INSERT INTO `visits` VALUES (155, '2019-12-06 20:07:01', '2019-12-06', 1, 1, 'Fr INSERT INTO `visits` VALUES (156, '2019-12-07 09:45:53', '2019-12-07', 1, 1, 'Sat'); INSERT INTO `visits` VALUES (157, '2019-12-08 09:31:19', '2019-12-08', 1, 4, 'Sun'); INSERT INTO `visits` VALUES (158, '2019-12-09 09:37:28', '2019-12-09', 1, 3, 'Mon'); +INSERT INTO `visits` VALUES (159, '2019-12-10 19:39:46', '2019-12-10', 1, 1, 'Tue'); +INSERT INTO `visits` VALUES (160, '2019-12-11 11:11:35', '2019-12-11', 1, 52, 'Wed'); +INSERT INTO `visits` VALUES (161, '2019-12-12 13:33:10', '2019-12-12', 1, 2, 'Thu'); -- ---------------------------- -- Table structure for yx_article @@ -3987,431 +4223,15 @@ CREATE TABLE `yx_express` ( PRIMARY KEY (`id`) USING BTREE, UNIQUE INDEX `code`(`code`) USING BTREE, INDEX `is_show`(`is_show`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 426 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '快递公司表' ROW_FORMAT = Dynamic; +) ENGINE = InnoDB AUTO_INCREMENT = 430 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '快递公司表' ROW_FORMAT = Dynamic; -- ---------------------------- -- Records of yx_express -- ---------------------------- -INSERT INTO `yx_express` VALUES (1, 'LIMINWL', '利民物流', 1, 0); -INSERT INTO `yx_express` VALUES (2, 'XINTIAN', '鑫天顺物流', 1, 0); -INSERT INTO `yx_express` VALUES (3, 'henglu', '恒路物流', 1, 0); -INSERT INTO `yx_express` VALUES (4, 'klwl', '康力物流', 1, 0); -INSERT INTO `yx_express` VALUES (5, 'meiguo', '美国快递', 1, 0); -INSERT INTO `yx_express` VALUES (6, 'a2u', 'A2U速递', 1, 0); -INSERT INTO `yx_express` VALUES (7, 'benteng', '奔腾物流', 1, 0); -INSERT INTO `yx_express` VALUES (8, 'ahdf', '德方物流', 1, 0); -INSERT INTO `yx_express` VALUES (9, 'timedg', '万家通', 1, 0); -INSERT INTO `yx_express` VALUES (10, 'ztong', '智通物流', 1, 0); -INSERT INTO `yx_express` VALUES (11, 'xindan', '新蛋物流', 1, 0); -INSERT INTO `yx_express` VALUES (12, 'bgpyghx', '挂号信', 1, 0); -INSERT INTO `yx_express` VALUES (13, 'XFHONG', '鑫飞鸿物流快递', 1, 0); -INSERT INTO `yx_express` VALUES (14, 'ALP', '阿里物流', 1, 0); -INSERT INTO `yx_express` VALUES (15, 'BFWL', '滨发物流', 1, 0); -INSERT INTO `yx_express` VALUES (16, 'SJWL', '宋军物流', 1, 0); -INSERT INTO `yx_express` VALUES (17, 'SHUNFAWL', '顺发物流', 1, 0); -INSERT INTO `yx_express` VALUES (18, 'TIANHEWL', '天河物流', 1, 0); -INSERT INTO `yx_express` VALUES (19, 'YBWL', '邮联物流', 1, 0); -INSERT INTO `yx_express` VALUES (20, 'SWHY', '盛旺货运', 1, 0); -INSERT INTO `yx_express` VALUES (21, 'TSWL', '汤氏物流', 1, 0); -INSERT INTO `yx_express` VALUES (22, 'YUANYUANWL', '圆圆物流', 1, 0); -INSERT INTO `yx_express` VALUES (23, 'BALIANGWL', '八梁物流', 1, 0); -INSERT INTO `yx_express` VALUES (24, 'ZGWL', '振刚物流', 1, 0); -INSERT INTO `yx_express` VALUES (25, 'JIAYU', '佳宇物流', 1, 0); -INSERT INTO `yx_express` VALUES (26, 'SHHX', '昊昕物流', 1, 0); -INSERT INTO `yx_express` VALUES (27, 'ande', '安得物流', 1, 0); -INSERT INTO `yx_express` VALUES (28, 'ppbyb', '贝邮宝', 1, 0); -INSERT INTO `yx_express` VALUES (29, 'dida', '递达快递', 1, 0); -INSERT INTO `yx_express` VALUES (30, 'jppost', '日本邮政', 1, 0); -INSERT INTO `yx_express` VALUES (31, 'intmail', '中国邮政', 96, 0); -INSERT INTO `yx_express` VALUES (32, 'HENGCHENGWL', '恒诚物流', 1, 0); -INSERT INTO `yx_express` VALUES (33, 'HENGFENGWL', '恒丰物流', 1, 0); -INSERT INTO `yx_express` VALUES (34, 'gdems', '广东ems快递', 1, 0); -INSERT INTO `yx_express` VALUES (35, 'xlyt', '祥龙运通', 1, 0); -INSERT INTO `yx_express` VALUES (36, 'gjbg', '国际包裹', 1, 0); -INSERT INTO `yx_express` VALUES (37, 'uex', 'UEX', 1, 0); -INSERT INTO `yx_express` VALUES (38, 'singpost', '新加坡邮政', 1, 0); -INSERT INTO `yx_express` VALUES (39, 'guangdongyouzhengwuliu', '广东邮政', 1, 0); -INSERT INTO `yx_express` VALUES (40, 'bht', 'BHT', 1, 0); -INSERT INTO `yx_express` VALUES (41, 'cces', 'CCES快递', 1, 0); -INSERT INTO `yx_express` VALUES (42, 'cloudexpress', 'CE易欧通国际速递', 1, 0); -INSERT INTO `yx_express` VALUES (43, 'dasu', '达速物流', 1, 0); -INSERT INTO `yx_express` VALUES (44, 'pfcexpress', '皇家物流', 1, 0); -INSERT INTO `yx_express` VALUES (45, 'hjs', '猴急送', 1, 0); -INSERT INTO `yx_express` VALUES (46, 'huilian', '辉联物流', 1, 0); -INSERT INTO `yx_express` VALUES (47, 'huanqiu', '环球速运', 1, 0); -INSERT INTO `yx_express` VALUES (48, 'huada', '华达快运', 1, 0); -INSERT INTO `yx_express` VALUES (49, 'htwd', '华通务达物流', 1, 0); -INSERT INTO `yx_express` VALUES (50, 'hipito', '海派通', 1, 0); -INSERT INTO `yx_express` VALUES (51, 'hqtd', '环球通达', 1, 0); -INSERT INTO `yx_express` VALUES (52, 'airgtc', '航空快递', 1, 0); -INSERT INTO `yx_express` VALUES (53, 'haoyoukuai', '好又快物流', 1, 0); -INSERT INTO `yx_express` VALUES (54, 'hanrun', '韩润物流', 1, 0); -INSERT INTO `yx_express` VALUES (55, 'ccd', '河南次晨达', 1, 0); -INSERT INTO `yx_express` VALUES (56, 'hfwuxi', '和丰同城', 1, 0); -INSERT INTO `yx_express` VALUES (57, 'Sky', '荷兰', 1, 0); -INSERT INTO `yx_express` VALUES (58, 'hongxun', '鸿讯物流', 1, 0); -INSERT INTO `yx_express` VALUES (59, 'hongjie', '宏捷国际物流', 1, 0); -INSERT INTO `yx_express` VALUES (60, 'httx56', '汇通天下物流', 1, 0); -INSERT INTO `yx_express` VALUES (61, 'lqht', '恒通快递', 1, 0); -INSERT INTO `yx_express` VALUES (62, 'jinguangsudikuaijian', '京广速递快件', 1, 0); -INSERT INTO `yx_express` VALUES (63, 'junfengguoji', '骏丰国际速递', 1, 0); -INSERT INTO `yx_express` VALUES (64, 'jiajiatong56', '佳家通', 1, 0); -INSERT INTO `yx_express` VALUES (65, 'jrypex', '吉日优派', 1, 0); -INSERT INTO `yx_express` VALUES (66, 'jinchengwuliu', '锦程国际物流', 1, 0); -INSERT INTO `yx_express` VALUES (67, 'jgwl', '景光物流', 1, 0); -INSERT INTO `yx_express` VALUES (68, 'pzhjst', '急顺通', 1, 0); -INSERT INTO `yx_express` VALUES (69, 'ruexp', '捷网俄全通', 1, 0); -INSERT INTO `yx_express` VALUES (70, 'jmjss', '金马甲', 1, 0); -INSERT INTO `yx_express` VALUES (71, 'lanhu', '蓝弧快递', 1, 0); -INSERT INTO `yx_express` VALUES (72, 'ltexp', '乐天速递', 1, 0); -INSERT INTO `yx_express` VALUES (73, 'lutong', '鲁通快运', 1, 0); -INSERT INTO `yx_express` VALUES (74, 'ledii', '乐递供应链', 1, 0); -INSERT INTO `yx_express` VALUES (75, 'lundao', '论道国际物流', 1, 0); -INSERT INTO `yx_express` VALUES (76, 'mailikuaidi', '麦力快递', 1, 0); -INSERT INTO `yx_express` VALUES (77, 'mchy', '木春货运', 1, 0); -INSERT INTO `yx_express` VALUES (78, 'meiquick', '美快国际物流', 1, 0); -INSERT INTO `yx_express` VALUES (79, 'valueway', '美通快递', 1, 0); -INSERT INTO `yx_express` VALUES (80, 'nuoyaao', '偌亚奥国际', 1, 0); -INSERT INTO `yx_express` VALUES (81, 'euasia', '欧亚专线', 1, 0); -INSERT INTO `yx_express` VALUES (82, 'pca', '澳大利亚PCA快递', 1, 0); -INSERT INTO `yx_express` VALUES (83, 'pingandatengfei', '平安达腾飞', 1, 0); -INSERT INTO `yx_express` VALUES (84, 'pjbest', '品骏快递', 1, 0); -INSERT INTO `yx_express` VALUES (85, 'qbexpress', '秦邦快运', 1, 0); -INSERT INTO `yx_express` VALUES (86, 'quanxintong', '全信通快递', 1, 0); -INSERT INTO `yx_express` VALUES (87, 'quansutong', '全速通国际快递', 1, 0); -INSERT INTO `yx_express` VALUES (88, 'qinyuan', '秦远物流', 1, 0); -INSERT INTO `yx_express` VALUES (89, 'qichen', '启辰国际物流', 1, 0); -INSERT INTO `yx_express` VALUES (90, 'quansu', '全速快运', 1, 0); -INSERT INTO `yx_express` VALUES (91, 'qzx56', '全之鑫物流', 1, 0); -INSERT INTO `yx_express` VALUES (92, 'qskdyxgs', '千顺快递', 1, 0); -INSERT INTO `yx_express` VALUES (93, 'runhengfeng', '全时速运', 1, 0); -INSERT INTO `yx_express` VALUES (94, 'rytsd', '日益通速递', 1, 0); -INSERT INTO `yx_express` VALUES (95, 'ruidaex', '瑞达国际速递', 1, 0); -INSERT INTO `yx_express` VALUES (96, 'shiyun', '世运快递', 1, 0); -INSERT INTO `yx_express` VALUES (97, 'sfift', '十方通物流', 1, 0); -INSERT INTO `yx_express` VALUES (98, 'stkd', '顺通快递', 1, 0); -INSERT INTO `yx_express` VALUES (99, 'bgn', '布谷鸟快递', 1, 0); -INSERT INTO `yx_express` VALUES (100, 'jiahuier', '佳惠尔快递', 1, 0); -INSERT INTO `yx_express` VALUES (101, 'pingyou', '小包', 1, 0); -INSERT INTO `yx_express` VALUES (102, 'yumeijie', '誉美捷快递', 1, 0); -INSERT INTO `yx_express` VALUES (103, 'meilong', '美龙快递', 1, 0); -INSERT INTO `yx_express` VALUES (104, 'guangtong', '广通速递', 1, 0); -INSERT INTO `yx_express` VALUES (105, 'STARS', '星晨急便', 1, 0); -INSERT INTO `yx_express` VALUES (106, 'NANHANG', '中国南方航空股份有限公司', 1, 0); -INSERT INTO `yx_express` VALUES (107, 'lanbiao', '蓝镖快递', 1, 0); -INSERT INTO `yx_express` VALUES (109, 'baotongda', '宝通达物流', 1, 0); -INSERT INTO `yx_express` VALUES (110, 'dashun', '大顺物流', 1, 0); -INSERT INTO `yx_express` VALUES (111, 'dada', '大达物流', 1, 0); -INSERT INTO `yx_express` VALUES (112, 'fangfangda', '方方达物流', 1, 0); -INSERT INTO `yx_express` VALUES (113, 'hebeijianhua', '河北建华物流', 1, 0); -INSERT INTO `yx_express` VALUES (114, 'haolaiyun', '好来运快递', 1, 0); -INSERT INTO `yx_express` VALUES (115, 'jinyue', '晋越快递', 1, 0); -INSERT INTO `yx_express` VALUES (116, 'kuaitao', '快淘快递', 1, 0); -INSERT INTO `yx_express` VALUES (117, 'peixing', '陪行物流', 1, 0); -INSERT INTO `yx_express` VALUES (118, 'hkpost', '香港邮政', 1, 0); -INSERT INTO `yx_express` VALUES (119, 'ytfh', '一统飞鸿快递', 1, 0); -INSERT INTO `yx_express` VALUES (120, 'zhongxinda', '中信达快递', 1, 0); -INSERT INTO `yx_express` VALUES (121, 'zhongtian', '中天快运', 1, 0); -INSERT INTO `yx_express` VALUES (122, 'zuochuan', '佐川急便', 1, 0); -INSERT INTO `yx_express` VALUES (123, 'chengguang', '程光快递', 1, 0); -INSERT INTO `yx_express` VALUES (124, 'cszx', '城市之星', 1, 0); -INSERT INTO `yx_express` VALUES (125, 'chuanzhi', '传志快递', 1, 0); -INSERT INTO `yx_express` VALUES (126, 'feibao', '飞豹快递', 1, 0); -INSERT INTO `yx_express` VALUES (127, 'huiqiang', '汇强快递', 1, 0); -INSERT INTO `yx_express` VALUES (128, 'lejiedi', '乐捷递', 1, 0); -INSERT INTO `yx_express` VALUES (129, 'lijisong', '成都立即送快递', 1, 0); -INSERT INTO `yx_express` VALUES (130, 'minbang', '民邦速递', 1, 0); -INSERT INTO `yx_express` VALUES (131, 'ocs', 'OCS国际快递', 1, 0); -INSERT INTO `yx_express` VALUES (132, 'santai', '三态速递', 1, 0); -INSERT INTO `yx_express` VALUES (133, 'saiaodi', '赛澳递', 1, 0); -INSERT INTO `yx_express` VALUES (134, 'jingdong', '京东快递', 1, 0); -INSERT INTO `yx_express` VALUES (135, 'zengyi', '增益快递', 1, 0); -INSERT INTO `yx_express` VALUES (136, 'fanyu', '凡宇速递', 1, 0); -INSERT INTO `yx_express` VALUES (137, 'fengda', '丰达快递', 1, 0); -INSERT INTO `yx_express` VALUES (138, 'coe', '东方快递', 1, 0); -INSERT INTO `yx_express` VALUES (139, 'ees', '百福东方快递', 1, 0); -INSERT INTO `yx_express` VALUES (140, 'disifang', '递四方速递', 1, 0); -INSERT INTO `yx_express` VALUES (141, 'rufeng', '如风达快递', 1, 0); -INSERT INTO `yx_express` VALUES (142, 'changtong', '长通物流', 1, 0); -INSERT INTO `yx_express` VALUES (143, 'chengshi100', '城市100快递', 1, 0); -INSERT INTO `yx_express` VALUES (144, 'feibang', '飞邦物流', 1, 0); -INSERT INTO `yx_express` VALUES (145, 'haosheng', '昊盛物流', 1, 0); -INSERT INTO `yx_express` VALUES (146, 'yinsu', '音速速运', 1, 0); -INSERT INTO `yx_express` VALUES (147, 'kuanrong', '宽容物流', 1, 0); -INSERT INTO `yx_express` VALUES (148, 'tongcheng', '通成物流', 1, 0); -INSERT INTO `yx_express` VALUES (149, 'tonghe', '通和天下物流', 1, 0); -INSERT INTO `yx_express` VALUES (150, 'zhima', '芝麻开门', 1, 0); -INSERT INTO `yx_express` VALUES (151, 'ririshun', '日日顺物流', 1, 0); -INSERT INTO `yx_express` VALUES (152, 'anxun', '安迅物流', 1, 0); -INSERT INTO `yx_express` VALUES (153, 'baiqian', '百千诚国际物流', 1, 0); -INSERT INTO `yx_express` VALUES (154, 'chukouyi', '出口易', 1, 0); -INSERT INTO `yx_express` VALUES (155, 'diantong', '店通快递', 1, 0); -INSERT INTO `yx_express` VALUES (156, 'dajin', '大金物流', 1, 0); -INSERT INTO `yx_express` VALUES (157, 'feite', '飞特物流', 1, 0); -INSERT INTO `yx_express` VALUES (159, 'gnxb', '国内小包', 1, 0); -INSERT INTO `yx_express` VALUES (160, 'huacheng', '华诚物流', 1, 0); -INSERT INTO `yx_express` VALUES (161, 'huahan', '华翰物流', 1, 0); -INSERT INTO `yx_express` VALUES (162, 'hengyu', '恒宇运通', 1, 0); -INSERT INTO `yx_express` VALUES (163, 'huahang', '华航快递', 1, 0); -INSERT INTO `yx_express` VALUES (164, 'jiuyi', '久易快递', 1, 0); -INSERT INTO `yx_express` VALUES (165, 'jiete', '捷特快递', 1, 0); -INSERT INTO `yx_express` VALUES (166, 'jingshi', '京世物流', 1, 0); -INSERT INTO `yx_express` VALUES (167, 'kuayue', '跨越快递', 1, 0); -INSERT INTO `yx_express` VALUES (168, 'mengsu', '蒙速快递', 1, 0); -INSERT INTO `yx_express` VALUES (169, 'nanbei', '南北快递', 1, 0); -INSERT INTO `yx_express` VALUES (171, 'pinganda', '平安达快递', 1, 0); -INSERT INTO `yx_express` VALUES (172, 'ruifeng', '瑞丰速递', 1, 0); -INSERT INTO `yx_express` VALUES (173, 'rongqing', '荣庆物流', 1, 0); -INSERT INTO `yx_express` VALUES (174, 'suijia', '穗佳物流', 1, 0); -INSERT INTO `yx_express` VALUES (175, 'simai', '思迈快递', 1, 0); -INSERT INTO `yx_express` VALUES (176, 'suteng', '速腾快递', 1, 0); -INSERT INTO `yx_express` VALUES (177, 'shengbang', '晟邦物流', 1, 0); -INSERT INTO `yx_express` VALUES (178, 'suchengzhaipei', '速呈宅配', 1, 0); -INSERT INTO `yx_express` VALUES (179, 'wuhuan', '五环速递', 1, 0); -INSERT INTO `yx_express` VALUES (180, 'xingchengzhaipei', '星程宅配', 1, 0); -INSERT INTO `yx_express` VALUES (181, 'yinjie', '顺捷丰达', 1, 0); -INSERT INTO `yx_express` VALUES (183, 'yanwen', '燕文物流', 1, 0); -INSERT INTO `yx_express` VALUES (184, 'zongxing', '纵行物流', 1, 0); -INSERT INTO `yx_express` VALUES (185, 'aae', 'AAE快递', 1, 0); -INSERT INTO `yx_express` VALUES (186, 'dhl', 'DHL快递', 1, 0); -INSERT INTO `yx_express` VALUES (187, 'feihu', '飞狐快递', 1, 0); -INSERT INTO `yx_express` VALUES (188, 'shunfeng', '顺丰速运', 92, 1); -INSERT INTO `yx_express` VALUES (189, 'spring', '春风物流', 1, 0); -INSERT INTO `yx_express` VALUES (190, 'yidatong', '易达通快递', 1, 0); -INSERT INTO `yx_express` VALUES (191, 'PEWKEE', '彪记快递', 1, 0); -INSERT INTO `yx_express` VALUES (192, 'PHOENIXEXP', '凤凰快递', 1, 0); -INSERT INTO `yx_express` VALUES (193, 'CNGLS', 'GLS快递', 1, 0); -INSERT INTO `yx_express` VALUES (194, 'BHTEXP', '华慧快递', 1, 0); -INSERT INTO `yx_express` VALUES (195, 'B2B', '卡行天下', 1, 0); -INSERT INTO `yx_express` VALUES (196, 'PEISI', '配思货运', 1, 0); -INSERT INTO `yx_express` VALUES (197, 'SUNDAPOST', '上大物流', 1, 0); -INSERT INTO `yx_express` VALUES (198, 'SUYUE', '苏粤货运', 1, 0); -INSERT INTO `yx_express` VALUES (199, 'F5XM', '伍圆速递', 1, 0); -INSERT INTO `yx_express` VALUES (200, 'GZWENJIE', '文捷航空速递', 1, 0); -INSERT INTO `yx_express` VALUES (201, 'yuancheng', '远成物流', 1, 0); -INSERT INTO `yx_express` VALUES (202, 'dpex', 'DPEX快递', 1, 0); -INSERT INTO `yx_express` VALUES (203, 'anjie', '安捷快递', 1, 0); -INSERT INTO `yx_express` VALUES (204, 'jldt', '嘉里大通', 1, 0); -INSERT INTO `yx_express` VALUES (205, 'yousu', '优速快递', 1, 0); -INSERT INTO `yx_express` VALUES (206, 'wanbo', '万博快递', 1, 0); -INSERT INTO `yx_express` VALUES (207, 'sure', '速尔物流', 1, 0); -INSERT INTO `yx_express` VALUES (208, 'sutong', '速通物流', 1, 0); -INSERT INTO `yx_express` VALUES (209, 'JUNCHUANWL', '骏川物流', 1, 0); -INSERT INTO `yx_express` VALUES (210, 'guada', '冠达快递', 1, 0); -INSERT INTO `yx_express` VALUES (211, 'dsu', 'D速快递', 1, 0); -INSERT INTO `yx_express` VALUES (212, 'LONGSHENWL', '龙胜物流', 1, 0); -INSERT INTO `yx_express` VALUES (213, 'abc', '爱彼西快递', 1, 0); -INSERT INTO `yx_express` VALUES (214, 'eyoubao', 'E邮宝', 1, 0); -INSERT INTO `yx_express` VALUES (215, 'aol', 'AOL快递', 1, 0); -INSERT INTO `yx_express` VALUES (216, 'jixianda', '急先达物流', 1, 0); -INSERT INTO `yx_express` VALUES (217, 'haihong', '山东海红快递', 1, 0); -INSERT INTO `yx_express` VALUES (218, 'feiyang', '飞洋快递', 1, 0); -INSERT INTO `yx_express` VALUES (219, 'rpx', 'RPX保时达', 1, 0); -INSERT INTO `yx_express` VALUES (220, 'zhaijisong', '宅急送', 1, 0); -INSERT INTO `yx_express` VALUES (221, 'tiantian', '天天快递', 99, 0); -INSERT INTO `yx_express` VALUES (222, 'yunwuliu', '云物流', 1, 0); -INSERT INTO `yx_express` VALUES (223, 'jiuye', '九曳供应链', 1, 0); -INSERT INTO `yx_express` VALUES (224, 'bsky', '百世快运', 1, 0); -INSERT INTO `yx_express` VALUES (225, 'higo', '黑狗物流', 1, 0); -INSERT INTO `yx_express` VALUES (226, 'arke', '方舟速递', 1, 0); -INSERT INTO `yx_express` VALUES (227, 'zwsy', '中外速运', 1, 0); -INSERT INTO `yx_express` VALUES (228, 'jxy', '吉祥邮', 1, 0); -INSERT INTO `yx_express` VALUES (229, 'aramex', 'Aramex', 1, 0); -INSERT INTO `yx_express` VALUES (230, 'guotong', '国通快递', 1, 0); -INSERT INTO `yx_express` VALUES (231, 'jiayi', '佳怡物流', 1, 0); -INSERT INTO `yx_express` VALUES (232, 'longbang', '龙邦快运', 1, 0); -INSERT INTO `yx_express` VALUES (233, 'minhang', '民航快递', 1, 0); -INSERT INTO `yx_express` VALUES (234, 'quanyi', '全一快递', 1, 0); -INSERT INTO `yx_express` VALUES (235, 'quanchen', '全晨快递', 1, 0); -INSERT INTO `yx_express` VALUES (236, 'usps', 'USPS快递', 1, 0); -INSERT INTO `yx_express` VALUES (237, 'xinbang', '新邦物流', 1, 0); -INSERT INTO `yx_express` VALUES (238, 'yuanzhi', '元智捷诚快递', 1, 0); -INSERT INTO `yx_express` VALUES (239, 'zhongyou', '中邮物流', 1, 0); -INSERT INTO `yx_express` VALUES (240, 'yuxin', '宇鑫物流', 1, 0); -INSERT INTO `yx_express` VALUES (241, 'cnpex', '中环快递', 1, 0); -INSERT INTO `yx_express` VALUES (242, 'shengfeng', '盛丰物流', 1, 0); -INSERT INTO `yx_express` VALUES (243, 'yuantong', '圆通速递', 97, 1); -INSERT INTO `yx_express` VALUES (244, 'jiayunmei', '加运美物流', 1, 0); -INSERT INTO `yx_express` VALUES (245, 'ywfex', '源伟丰快递', 1, 0); -INSERT INTO `yx_express` VALUES (246, 'xinfeng', '信丰物流', 1, 0); -INSERT INTO `yx_express` VALUES (247, 'wanxiang', '万象物流', 1, 0); -INSERT INTO `yx_express` VALUES (248, 'menduimen', '门对门', 1, 0); -INSERT INTO `yx_express` VALUES (249, 'mingliang', '明亮物流', 1, 0); -INSERT INTO `yx_express` VALUES (250, 'fengxingtianxia', '风行天下', 1, 0); -INSERT INTO `yx_express` VALUES (251, 'gongsuda', '共速达物流', 1, 0); -INSERT INTO `yx_express` VALUES (252, 'zhongtong', '中通快递', 100, 1); -INSERT INTO `yx_express` VALUES (253, 'quanritong', '全日通快递', 1, 0); -INSERT INTO `yx_express` VALUES (254, 'ems', 'EMS', 1, 1); -INSERT INTO `yx_express` VALUES (255, 'wanjia', '万家物流', 1, 0); -INSERT INTO `yx_express` VALUES (256, 'yuntong', '运通快递', 1, 0); -INSERT INTO `yx_express` VALUES (257, 'feikuaida', '飞快达物流', 1, 0); -INSERT INTO `yx_express` VALUES (258, 'haimeng', '海盟速递', 1, 0); -INSERT INTO `yx_express` VALUES (259, 'zhongsukuaidi', '中速快件', 1, 0); -INSERT INTO `yx_express` VALUES (260, 'yuefeng', '越丰快递', 1, 0); -INSERT INTO `yx_express` VALUES (261, 'shenghui', '盛辉物流', 1, 0); -INSERT INTO `yx_express` VALUES (262, 'datian', '大田物流', 1, 0); -INSERT INTO `yx_express` VALUES (263, 'quanjitong', '全际通快递', 1, 0); -INSERT INTO `yx_express` VALUES (264, 'longlangkuaidi', '隆浪快递', 1, 0); -INSERT INTO `yx_express` VALUES (265, 'neweggozzo', '新蛋奥硕物流', 1, 0); -INSERT INTO `yx_express` VALUES (266, 'shentong', '申通快递', 95, 1); -INSERT INTO `yx_express` VALUES (267, 'haiwaihuanqiu', '海外环球', 1, 0); -INSERT INTO `yx_express` VALUES (268, 'yad', '源安达快递', 1, 0); -INSERT INTO `yx_express` VALUES (269, 'jindawuliu', '金大物流', 1, 0); -INSERT INTO `yx_express` VALUES (270, 'sevendays', '七天连锁', 1, 0); -INSERT INTO `yx_express` VALUES (271, 'tnt', 'TNT快递', 1, 0); -INSERT INTO `yx_express` VALUES (272, 'huayu', '天地华宇物流', 1, 0); -INSERT INTO `yx_express` VALUES (273, 'lianhaotong', '联昊通快递', 1, 0); -INSERT INTO `yx_express` VALUES (274, 'nengda', '港中能达快递', 1, 0); -INSERT INTO `yx_express` VALUES (275, 'LBWL', '联邦物流', 1, 0); -INSERT INTO `yx_express` VALUES (276, 'ontrac', 'onTrac', 1, 0); -INSERT INTO `yx_express` VALUES (277, 'feihang', '原飞航快递', 1, 0); -INSERT INTO `yx_express` VALUES (278, 'bangsongwuliu', '邦送物流', 1, 0); -INSERT INTO `yx_express` VALUES (279, 'huaxialong', '华夏龙物流', 1, 0); -INSERT INTO `yx_express` VALUES (280, 'ztwy', '中天万运快递', 1, 0); -INSERT INTO `yx_express` VALUES (281, 'fkd', '飞康达物流', 1, 0); -INSERT INTO `yx_express` VALUES (282, 'anxinda', '安信达快递', 1, 0); -INSERT INTO `yx_express` VALUES (283, 'quanfeng', '全峰快递', 1, 0); -INSERT INTO `yx_express` VALUES (284, 'shengan', '圣安物流', 1, 0); -INSERT INTO `yx_express` VALUES (285, 'jiaji', '佳吉物流', 1, 0); -INSERT INTO `yx_express` VALUES (286, 'yunda', '韵达快运', 94, 0); -INSERT INTO `yx_express` VALUES (287, 'ups', 'UPS快递', 1, 0); -INSERT INTO `yx_express` VALUES (288, 'debang', '德邦物流', 1, 0); -INSERT INTO `yx_express` VALUES (289, 'yafeng', '亚风速递', 1, 0); -INSERT INTO `yx_express` VALUES (290, 'kuaijie', '快捷速递', 98, 0); -INSERT INTO `yx_express` VALUES (291, 'huitong', '百世快递', 93, 0); -INSERT INTO `yx_express` VALUES (293, 'aolau', 'AOL澳通速递', 1, 0); -INSERT INTO `yx_express` VALUES (294, 'anneng', '安能物流', 1, 0); -INSERT INTO `yx_express` VALUES (295, 'auexpress', '澳邮中国快运', 1, 0); -INSERT INTO `yx_express` VALUES (296, 'exfresh', '安鲜达', 1, 0); -INSERT INTO `yx_express` VALUES (297, 'bcwelt', 'BCWELT', 1, 0); -INSERT INTO `yx_express` VALUES (298, 'youzhengguonei', '挂号信', 1, 0); -INSERT INTO `yx_express` VALUES (299, 'xiaohongmao', '北青小红帽', 1, 0); -INSERT INTO `yx_express` VALUES (300, 'lbbk', '宝凯物流', 1, 0); -INSERT INTO `yx_express` VALUES (301, 'byht', '博源恒通', 1, 0); -INSERT INTO `yx_express` VALUES (302, 'idada', '百成大达物流', 1, 0); -INSERT INTO `yx_express` VALUES (303, 'baitengwuliu', '百腾物流', 1, 0); -INSERT INTO `yx_express` VALUES (304, 'birdex', '笨鸟海淘', 1, 0); -INSERT INTO `yx_express` VALUES (305, 'bsht', '百事亨通', 1, 0); -INSERT INTO `yx_express` VALUES (306, 'dayang', '大洋物流快递', 1, 0); -INSERT INTO `yx_express` VALUES (307, 'dechuangwuliu', '德创物流', 1, 0); -INSERT INTO `yx_express` VALUES (308, 'donghanwl', '东瀚物流', 1, 0); -INSERT INTO `yx_express` VALUES (309, 'dfpost', '达方物流', 1, 0); -INSERT INTO `yx_express` VALUES (310, 'dongjun', '东骏快捷物流', 1, 0); -INSERT INTO `yx_express` VALUES (311, 'dindon', '叮咚澳洲转运', 1, 0); -INSERT INTO `yx_express` VALUES (312, 'dazhong', '大众佐川急便', 1, 0); -INSERT INTO `yx_express` VALUES (313, 'decnlh', '德中快递', 1, 0); -INSERT INTO `yx_express` VALUES (314, 'dekuncn', '德坤供应链', 1, 0); -INSERT INTO `yx_express` VALUES (315, 'eshunda', '俄顺达', 1, 0); -INSERT INTO `yx_express` VALUES (316, 'ewe', 'EWE全球快递', 1, 0); -INSERT INTO `yx_express` VALUES (317, 'fedexuk', 'FedEx英国', 1, 0); -INSERT INTO `yx_express` VALUES (318, 'fox', 'FOX国际速递', 1, 0); -INSERT INTO `yx_express` VALUES (319, 'rufengda', '凡客如风达', 1, 0); -INSERT INTO `yx_express` VALUES (320, 'fandaguoji', '颿达国际快递', 1, 0); -INSERT INTO `yx_express` VALUES (321, 'hnfy', '飞鹰物流', 1, 0); -INSERT INTO `yx_express` VALUES (322, 'flysman', '飞力士物流', 1, 0); -INSERT INTO `yx_express` VALUES (323, 'sccod', '丰程物流', 1, 0); -INSERT INTO `yx_express` VALUES (324, 'farlogistis', '泛远国际物流', 1, 0); -INSERT INTO `yx_express` VALUES (325, 'gsm', 'GSM', 1, 0); -INSERT INTO `yx_express` VALUES (326, 'gaticn', 'GATI快递', 1, 0); -INSERT INTO `yx_express` VALUES (327, 'gts', 'GTS快递', 1, 0); -INSERT INTO `yx_express` VALUES (328, 'gangkuai', '港快速递', 1, 0); -INSERT INTO `yx_express` VALUES (329, 'gtsd', '高铁速递', 1, 0); -INSERT INTO `yx_express` VALUES (330, 'tiandihuayu', '华宇物流', 1, 0); -INSERT INTO `yx_express` VALUES (331, 'huangmajia', '黄马甲快递', 1, 0); -INSERT INTO `yx_express` VALUES (332, 'ucs', '合众速递', 1, 0); -INSERT INTO `yx_express` VALUES (333, 'huoban', '伙伴物流', 1, 0); -INSERT INTO `yx_express` VALUES (334, 'nedahm', '红马速递', 1, 0); -INSERT INTO `yx_express` VALUES (335, 'huiwen', '汇文配送', 1, 0); -INSERT INTO `yx_express` VALUES (336, 'nmhuahe', '华赫物流', 1, 0); -INSERT INTO `yx_express` VALUES (337, 'hangyu', '航宇快递', 1, 0); -INSERT INTO `yx_express` VALUES (338, 'minsheng', '闽盛物流', 1, 0); -INSERT INTO `yx_express` VALUES (339, 'riyu', '日昱物流', 1, 0); -INSERT INTO `yx_express` VALUES (340, 'sxhongmajia', '山西红马甲', 1, 0); -INSERT INTO `yx_express` VALUES (341, 'syjiahuier', '沈阳佳惠尔', 1, 0); -INSERT INTO `yx_express` VALUES (342, 'shlindao', '上海林道货运', 1, 0); -INSERT INTO `yx_express` VALUES (343, 'shunjiefengda', '顺捷丰达', 1, 0); -INSERT INTO `yx_express` VALUES (344, 'subida', '速必达物流', 1, 0); -INSERT INTO `yx_express` VALUES (345, 'bphchina', '速方国际物流', 1, 0); -INSERT INTO `yx_express` VALUES (346, 'sendtochina', '速递中国', 1, 0); -INSERT INTO `yx_express` VALUES (347, 'suning', '苏宁快递', 1, 0); -INSERT INTO `yx_express` VALUES (348, 'sihaiet', '四海快递', 1, 0); -INSERT INTO `yx_express` VALUES (349, 'tianzong', '天纵物流', 1, 0); -INSERT INTO `yx_express` VALUES (350, 'chinatzx', '同舟行物流', 1, 0); -INSERT INTO `yx_express` VALUES (351, 'nntengda', '腾达速递', 1, 0); -INSERT INTO `yx_express` VALUES (352, 'sd138', '泰国138', 1, 0); -INSERT INTO `yx_express` VALUES (353, 'tongdaxing', '通达兴物流', 1, 0); -INSERT INTO `yx_express` VALUES (354, 'tlky', '天联快运', 1, 0); -INSERT INTO `yx_express` VALUES (355, 'youshuwuliu', 'UC优速快递', 1, 0); -INSERT INTO `yx_express` VALUES (356, 'ueq', 'UEQ快递', 1, 0); -INSERT INTO `yx_express` VALUES (357, 'weitepai', '微特派快递', 1, 0); -INSERT INTO `yx_express` VALUES (358, 'wtdchina', '威时沛运', 1, 0); -INSERT INTO `yx_express` VALUES (359, 'wzhaunyun', '微转运', 1, 0); -INSERT INTO `yx_express` VALUES (360, 'gswtkd', '万通快递', 1, 0); -INSERT INTO `yx_express` VALUES (361, 'wotu', '渥途国际速运', 1, 0); -INSERT INTO `yx_express` VALUES (362, 'xiyoute', '希优特快递', 1, 0); -INSERT INTO `yx_express` VALUES (363, 'xilaikd', '喜来快递', 1, 0); -INSERT INTO `yx_express` VALUES (364, 'xsrd', '鑫世锐达', 1, 0); -INSERT INTO `yx_express` VALUES (365, 'xtb', '鑫通宝物流', 1, 0); -INSERT INTO `yx_express` VALUES (366, 'xintianjie', '信天捷快递', 1, 0); -INSERT INTO `yx_express` VALUES (367, 'xaetc', '西安胜峰', 1, 0); -INSERT INTO `yx_express` VALUES (368, 'xianfeng', '先锋快递', 1, 0); -INSERT INTO `yx_express` VALUES (369, 'sunspeedy', '新速航', 1, 0); -INSERT INTO `yx_express` VALUES (370, 'xipost', '西邮寄', 1, 0); -INSERT INTO `yx_express` VALUES (371, 'sinatone', '信联通', 1, 0); -INSERT INTO `yx_express` VALUES (372, 'sunjex', '新杰物流', 1, 0); -INSERT INTO `yx_express` VALUES (373, 'yundaexus', '韵达美国件', 1, 0); -INSERT INTO `yx_express` VALUES (374, 'yxwl', '宇鑫物流', 1, 0); -INSERT INTO `yx_express` VALUES (375, 'yitongda', '易通达', 1, 0); -INSERT INTO `yx_express` VALUES (376, 'yiqiguojiwuliu', '一柒物流', 1, 0); -INSERT INTO `yx_express` VALUES (377, 'yilingsuyun', '亿领速运', 1, 0); -INSERT INTO `yx_express` VALUES (378, 'yujiawuliu', '煜嘉物流', 1, 0); -INSERT INTO `yx_express` VALUES (379, 'gml', '英脉物流', 1, 0); -INSERT INTO `yx_express` VALUES (380, 'leopard', '云豹国际货运', 1, 0); -INSERT INTO `yx_express` VALUES (381, 'czwlyn', '云南中诚', 1, 0); -INSERT INTO `yx_express` VALUES (382, 'sdyoupei', '优配速运', 1, 0); -INSERT INTO `yx_express` VALUES (383, 'yongchang', '永昌物流', 1, 0); -INSERT INTO `yx_express` VALUES (384, 'yufeng', '御风速运', 1, 0); -INSERT INTO `yx_express` VALUES (385, 'yamaxunwuliu', '亚马逊物流', 1, 0); -INSERT INTO `yx_express` VALUES (386, 'yousutongda', '优速通达', 1, 0); -INSERT INTO `yx_express` VALUES (387, 'yishunhang', '亿顺航', 1, 0); -INSERT INTO `yx_express` VALUES (388, 'yongwangda', '永旺达快递', 1, 0); -INSERT INTO `yx_express` VALUES (389, 'ecmscn', '易满客', 1, 0); -INSERT INTO `yx_express` VALUES (390, 'yingchao', '英超物流', 1, 0); -INSERT INTO `yx_express` VALUES (391, 'edlogistics', '益递物流', 1, 0); -INSERT INTO `yx_express` VALUES (392, 'yyexpress', '远洋国际', 1, 0); -INSERT INTO `yx_express` VALUES (393, 'onehcang', '一号仓', 1, 0); -INSERT INTO `yx_express` VALUES (394, 'ycgky', '远成快运', 1, 0); -INSERT INTO `yx_express` VALUES (395, 'lineone', '一号线', 1, 0); -INSERT INTO `yx_express` VALUES (396, 'ypsd', '壹品速递', 1, 0); -INSERT INTO `yx_express` VALUES (397, 'vipexpress', '鹰运国际速递', 1, 0); -INSERT INTO `yx_express` VALUES (398, 'el56', '易联通达物流', 1, 0); -INSERT INTO `yx_express` VALUES (399, 'yyqc56', '一运全成物流', 1, 0); -INSERT INTO `yx_express` VALUES (400, 'zhongtie', '中铁快运', 1, 0); -INSERT INTO `yx_express` VALUES (401, 'ZTKY', '中铁物流', 1, 0); -INSERT INTO `yx_express` VALUES (402, 'zzjh', '郑州建华快递', 1, 0); -INSERT INTO `yx_express` VALUES (403, 'zhongruisudi', '中睿速递', 1, 0); -INSERT INTO `yx_express` VALUES (404, 'zhongwaiyun', '中外运速递', 1, 0); -INSERT INTO `yx_express` VALUES (405, 'zengyisudi', '增益速递', 1, 0); -INSERT INTO `yx_express` VALUES (406, 'sujievip', '郑州速捷', 1, 0); -INSERT INTO `yx_express` VALUES (407, 'zhichengtongda', '至诚通达快递', 1, 0); -INSERT INTO `yx_express` VALUES (408, 'zhdwl', '众辉达物流', 1, 0); -INSERT INTO `yx_express` VALUES (409, 'kuachangwuliu', '直邮易', 1, 0); -INSERT INTO `yx_express` VALUES (410, 'topspeedex', '中运全速', 1, 0); -INSERT INTO `yx_express` VALUES (411, 'otobv', '中欧快运', 1, 0); -INSERT INTO `yx_express` VALUES (412, 'zsky123', '准实快运', 1, 0); -INSERT INTO `yx_express` VALUES (413, 'donghong', '东红物流', 1, 0); -INSERT INTO `yx_express` VALUES (414, 'kuaiyouda', '快优达速递', 1, 0); -INSERT INTO `yx_express` VALUES (415, 'balunzhi', '巴伦支快递', 1, 0); -INSERT INTO `yx_express` VALUES (416, 'hutongwuliu', '户通物流', 1, 0); -INSERT INTO `yx_express` VALUES (417, 'xianchenglian', '西安城联速递', 1, 0); -INSERT INTO `yx_express` VALUES (418, 'youbijia', '邮必佳', 1, 0); -INSERT INTO `yx_express` VALUES (419, 'feiyuan', '飞远物流', 1, 0); -INSERT INTO `yx_express` VALUES (420, 'chengji', '城际速递', 1, 0); -INSERT INTO `yx_express` VALUES (421, 'huaqi', '华企快运', 1, 0); -INSERT INTO `yx_express` VALUES (422, 'yibang', '一邦快递', 1, 0); -INSERT INTO `yx_express` VALUES (423, 'citylink', 'CityLink快递', 1, 0); -INSERT INTO `yx_express` VALUES (424, 'meixi', '美西快递', 1, 0); -INSERT INTO `yx_express` VALUES (425, 'acs', 'ACS', 1, 0); +INSERT INTO `yx_express` VALUES (426, 'STO', '申通快递', 0, 0); +INSERT INTO `yx_express` VALUES (427, 'SF', '顺丰速运', 0, 0); +INSERT INTO `yx_express` VALUES (428, 'ZTO', '中通快递', 0, 0); +INSERT INTO `yx_express` VALUES (429, 'YTO', '圆通速递', 0, 0); -- ---------------------------- -- Table structure for yx_routine_access_token @@ -4978,7 +4798,7 @@ INSERT INTO `yx_store_order` VALUES (32, '20191107184639089', 12, 'hu', '1513617 INSERT INTO `yx_store_order` VALUES (33, '20191107185008487', 12, 'hu', '15136175246', '上海 闸北区 城区 99999', '32', 0.00, 1, 0.20, 0.00, 0.20, 0.00, 0.00, 0, 0.00, 1, 1573124914, 'yue', 1573123808, 0, 0, NULL, NULL, NULL, NULL, NULL, 0.00, '', NULL, NULL, NULL, 1.00, 0.00, NULL, '', 0, 'be898332372b4d1dbea444d2f547a031', NULL, 0, 0, 0, 0, 0.20, 0, 0, '', 0, 1, 1, 0, 0); INSERT INTO `yx_store_order` VALUES (34, '20191107185115070', 12, 'hu', '15136175246', '上海 闸北区 城区 99999', '33', 0.00, 1, 0.20, 0.00, 0.20, 0.00, 0.00, 0, 0.00, 1, 1573124900, 'yue', 1573123875, 0, 0, NULL, NULL, NULL, NULL, NULL, 0.00, '', NULL, NULL, NULL, 1.00, 0.00, NULL, '', 0, 'ef53cabfeff64a65b9c70ab5997d27ef', NULL, 0, 0, 0, 0, 0.20, 0, 0, '', 0, 1, 1, 0, 0); INSERT INTO `yx_store_order` VALUES (35, '20191110180051521', 12, 'hu', '15136175246', '上海 闸北区 城区 99999', '34', 0.00, 1, 120.00, 0.00, 119.00, 0.00, 0.00, 2, 1.00, 1, 1573380051, 'yue', 1573380051, 0, 0, NULL, NULL, NULL, NULL, NULL, 0.00, '', NULL, NULL, NULL, 1.00, 0.00, NULL, '', 0, 'ff56e24a213c40a08381fb10f5e30de5', NULL, 0, 0, 0, 0, 100.00, 0, 0, '', 0, 1, 1, 0, 0); -INSERT INTO `yx_store_order` VALUES (36, '20191110183227714', 12, 'hu', '15136175246', '上海 闸北区 城区 99999', '36', 0.00, 1, 170.00, 0.00, 160.00, 0.00, 10.00, 0, 0.00, 1, 1573381947, 'yue', 1573381947, 0, 0, NULL, NULL, NULL, NULL, NULL, 0.00, '', NULL, NULL, NULL, 1.00, 10.00, NULL, '', 0, '105e06edb7bf4113aff646a45b13abaa', NULL, 0, 0, 0, 0, 100.00, 0, 0, '', 0, 1, 1, 0, 0); +INSERT INTO `yx_store_order` VALUES (36, '20191110183227714', 12, 'hu', '15136175246', '上海 闸北区 城区 99999', '36', 0.00, 1, 170.00, 0.00, 160.00, 0.00, 10.00, 0, 0.00, 1, 1573381947, 'yue', 1573381947, 1, 0, NULL, NULL, NULL, NULL, NULL, 0.00, 'STO', '申通快递', 'express', NULL, 1.00, 10.00, NULL, '', 0, '105e06edb7bf4113aff646a45b13abaa', NULL, 0, 0, 0, 0, 100.00, 0, 0, '', 0, 1, 1, 0, 0); INSERT INTO `yx_store_order` VALUES (37, '20191113104022550', 14, 'zhang', '15136175247', '上海 静安区 城区 999', '37', 0.00, 1, 120.00, 0.00, 120.00, 0.00, 0.00, 0, 0.00, 1, 1573612822, 'yue', 1573612822, 2, 0, NULL, NULL, NULL, NULL, NULL, 0.00, '', '顺丰快递', 'express', '1111111', 1.00, 0.00, NULL, '', 0, 'db7d9878c8d2458587fb0441eba3bb55', NULL, 0, 0, 0, 0, 100.00, 0, 0, '', 0, 1, 1, 0, 0); INSERT INTO `yx_store_order` VALUES (38, '20191116145425159', 12, 'hu', '15136175246', '上海 闸北区 城区 99999', '35', 0.00, 1, 120.00, 0.00, 119.00, 0.00, 0.00, 1, 1.00, 0, NULL, 'weixin', 1573887265, 0, 0, NULL, NULL, NULL, NULL, NULL, 0.00, '', NULL, NULL, NULL, 1.00, 0.00, NULL, '', 1, '5cc35fef31864f4ebe158e43f8e02699', NULL, 0, 0, 0, 0, 100.00, 0, 0, '', 0, 1, 1, 0, 0); INSERT INTO `yx_store_order` VALUES (39, '20191116151201683', 14, 'zhang', '15136175247', '上海 静安区 城区 999', '42', 0.00, 1, 120.00, 0.00, 119.00, 0.00, 1.00, 0, 0.00, 0, NULL, 'weixin', 1573888321, 0, 0, NULL, NULL, NULL, NULL, NULL, 0.00, '', NULL, NULL, NULL, 1.00, 1.00, 1.00, '', 1, '84892a2626a341939dd05cd7f2adff9e', NULL, 0, 0, 0, 0, 100.00, 0, 0, '', 0, 1, 1, 0, 0); @@ -5001,12 +4821,12 @@ INSERT INTO `yx_store_order` VALUES (57, '20191117184108757', 14, 'zhang', '1513 INSERT INTO `yx_store_order` VALUES (58, '20191117185342145', 14, 'zhang', '15136175247', '上海 静安区 城区 999', '59', 0.00, 1, 120.00, 0.00, 120.00, 0.00, 0.00, 0, 0.00, 0, NULL, 'weixin', 1573988022, 0, 0, NULL, NULL, NULL, NULL, NULL, 0.00, '', NULL, NULL, NULL, 1.00, 0.00, NULL, '', 1, '51bdce0f229f44a8ae65c25e4718f408', NULL, 0, 0, 0, 0, 100.00, 0, 0, '', 0, 1, 1, 0, 0); INSERT INTO `yx_store_order` VALUES (59, '20191117185432953', 14, 'zhang', '15136175247', '上海 静安区 城区 999', '60', 0.00, 1, 120.00, 0.00, 120.00, 0.00, 0.00, 0, 0.00, 0, NULL, 'weixin', 1573988072, 0, 0, NULL, NULL, NULL, NULL, NULL, 0.00, '', NULL, NULL, NULL, 1.00, 0.00, NULL, '', 1, 'adc2a9b7f64940ea89d1f91b1b2f65c8', NULL, 0, 0, 0, 0, 100.00, 0, 0, '', 0, 1, 1, 0, 0); INSERT INTO `yx_store_order` VALUES (60, '20191117191949005', 14, 'zhang', '15136175247', '上海 静安区 城区 999', '61', 0.00, 1, 120.00, 0.00, 120.00, 0.00, 0.00, 0, 0.00, 0, NULL, 'weixin', 1573989589, 0, 0, NULL, NULL, NULL, NULL, NULL, 0.00, '', NULL, NULL, NULL, 1.00, 0.00, NULL, '', 1, 'dfa907c582e84696a1e31069907058c6', NULL, 0, 0, 0, 0, 100.00, 0, 0, '', 0, 1, 1, 0, 0); -INSERT INTO `yx_store_order` VALUES (61, '20191117195636214', 14, 'zhang', '15136175247', '上海 静安区 城区 999', '62', 0.00, 1, 120.00, 0.00, 120.00, 0.00, 0.00, 0, 0.00, 1, 1573991796, 'yue', 1573991796, 0, 0, NULL, NULL, NULL, NULL, NULL, 0.00, '', NULL, NULL, NULL, 1.00, 0.00, NULL, '', 0, 'a6a7f299f0c4460ab90a01558581ddec', NULL, 0, 0, 0, 0, 100.00, 0, 0, '', 0, 1, 1, 0, 0); +INSERT INTO `yx_store_order` VALUES (61, '20191117195636214', 14, 'zhang', '15136175247', '上海 静安区 城区 999', '62', 0.00, 1, 120.00, 0.00, 120.00, 0.00, 0.00, 0, 0.00, 1, 1573991796, 'yue', 1573991796, 1, 0, NULL, NULL, NULL, NULL, NULL, 0.00, 'SF', '顺丰速运', 'express', '99999', 1.00, 0.00, NULL, '', 0, 'a6a7f299f0c4460ab90a01558581ddec', NULL, 0, 0, 0, 0, 100.00, 0, 0, '', 0, 1, 1, 0, 0); INSERT INTO `yx_store_order` VALUES (62, '20191117195746607', 14, 'zhang', '15136175247', '上海 静安区 城区 999', '63', 0.00, 1, 120.00, 0.00, 120.00, 0.00, 0.00, 0, 0.00, 0, NULL, 'weixin', 1573991866, 0, 0, NULL, NULL, NULL, NULL, NULL, 0.00, '', NULL, NULL, NULL, 1.00, 0.00, NULL, '', 1, '5e5a3b127cc14e64a6c4a7a75f525187', NULL, 0, 0, 0, 0, 100.00, 0, 0, '', 0, 1, 1, 0, 0); INSERT INTO `yx_store_order` VALUES (63, '20191117200249481', 14, 'zhang', '15136175247', '上海 静安区 城区 999', '64', 0.00, 1, 120.00, 0.00, 120.00, 0.00, 0.00, 0, 0.00, 0, NULL, 'weixin', 1573992169, 0, 0, NULL, NULL, NULL, NULL, NULL, 0.00, '', NULL, NULL, NULL, 1.00, 0.00, NULL, '', 1, '38d23b945d7649d89176a55ebfa2cd0b', NULL, 0, 0, 0, 0, 100.00, 0, 0, '', 0, 1, 1, 0, 0); INSERT INTO `yx_store_order` VALUES (64, '20191117201129097', 14, 'zhang', '15136175247', '上海 静安区 城区 999', '65', 0.00, 1, 120.00, 0.00, 120.00, 0.00, 0.00, 0, 0.00, 0, NULL, 'weixin', 1573992689, 0, 0, NULL, NULL, NULL, NULL, NULL, 0.00, '', NULL, NULL, NULL, 1.00, 0.00, NULL, '', 1, 'd873176e7c2d4e9f811f01c92c14d6cd', NULL, 0, 0, 0, 0, 100.00, 0, 0, '', 0, 1, 1, 0, 0); INSERT INTO `yx_store_order` VALUES (66, '20191117210807397', 14, 'zhang', '15136175247', '上海 静安区 城区 999', '66', 0.00, 1, 120.00, 0.00, 120.00, 0.00, 0.00, 0, 0.00, 0, NULL, 'weixin', 1573996087, 0, 0, NULL, NULL, NULL, NULL, NULL, 0.00, '', NULL, NULL, NULL, 1.00, 0.00, NULL, '', 1, '3736d4b5d9064ddca5904b1c8bb46d32', NULL, 0, 0, 0, 0, 100.00, 0, 0, '', 0, 1, 1, 0, 0); -INSERT INTO `yx_store_order` VALUES (67, '20191117211003977', 14, 'zhang', '15136175247', '上海 静安区 城区 999', '67', 0.00, 1, 120.00, 0.00, 120.00, 0.00, 0.00, 0, 0.00, 1, 1573996204, 'yue', 1573996203, 0, 0, NULL, NULL, NULL, NULL, NULL, 0.00, '', NULL, NULL, NULL, 1.00, 0.00, NULL, '', 0, '2c8d6ea861f24e52a0ad0d464c35b60d', NULL, 0, 0, 0, 0, 100.00, 0, 0, '', 0, 1, 1, 0, 0); +INSERT INTO `yx_store_order` VALUES (67, '20191117211003977', 14, 'zhang', '15136175247', '上海 静安区 城区 999', '67', 0.00, 1, 120.00, 0.00, 120.00, 0.00, 0.00, 0, 0.00, 1, 1573996204, 'yue', 1573996203, 1, 0, NULL, NULL, NULL, NULL, NULL, 0.00, 'SF', '顺丰速运', 'express', '444444', 1.00, 0.00, NULL, '', 0, '2c8d6ea861f24e52a0ad0d464c35b60d', NULL, 0, 0, 0, 0, 100.00, 0, 0, '', 0, 1, 1, 0, 0); INSERT INTO `yx_store_order` VALUES (68, '20191117211348778', 14, 'zhang', '15136175247', '上海 静安区 城区 999', '68', 0.00, 1, 120.00, 0.00, 120.00, 0.00, 0.00, 0, 0.00, 1, 1573996429, 'yue', 1573996428, 2, 0, NULL, NULL, NULL, NULL, NULL, 0.00, '', '顺丰快递', 'express', '99999999', 1.00, 0.00, NULL, '', 0, '9216e6ba59de4a969f5be7ca69469f7e', NULL, 0, 0, 0, 0, 100.00, 0, 0, '', 0, 1, 1, 0, 0); INSERT INTO `yx_store_order` VALUES (75, '20191117215755011', 14, 'zhang', '15136175247', '上海 静安区 城区 999', '69', 0.00, 1, 120.00, 0.00, 120.00, 0.00, 0.00, 0, 0.00, 0, NULL, 'weixin', 1573999075, 0, 0, NULL, NULL, NULL, NULL, NULL, 0.00, '', NULL, NULL, NULL, 1.00, 0.00, NULL, '', 1, 'e0930d3bed624476b0c540e4191c5eb9', NULL, 0, 0, 0, 0, 100.00, 0, 0, '', 0, 1, 1, 0, 0); INSERT INTO `yx_store_order` VALUES (76, '20191117220023803', 14, 'zhang', '15136175247', '上海 静安区 城区 999', '70', 0.00, 1, 120.00, 0.00, 120.00, 0.00, 0.00, 0, 0.00, 0, NULL, 'weixin', 1573999223, 0, 0, NULL, NULL, NULL, NULL, NULL, 0.00, '', NULL, NULL, NULL, 1.00, 0.00, NULL, '', 1, 'c34ab48907b24ecf955ae813b1710925', NULL, 0, 0, 0, 0, 100.00, 0, 0, '', 0, 1, 1, 0, 0); @@ -5129,7 +4949,7 @@ CREATE TABLE `yx_store_order_status` ( PRIMARY KEY (`id`) USING BTREE, INDEX `oid`(`oid`) USING BTREE, INDEX `change_type`(`change_type`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 141 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '订单操作记录表' ROW_FORMAT = Dynamic; +) ENGINE = InnoDB AUTO_INCREMENT = 144 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '订单操作记录表' ROW_FORMAT = Dynamic; -- ---------------------------- -- Records of yx_store_order_status @@ -5235,6 +5055,9 @@ INSERT INTO `yx_store_order_status` VALUES (137, 99, 'cache_key_create_order', ' INSERT INTO `yx_store_order_status` VALUES (138, 99, 'pay_success', '用户付款成功', 1575771514); INSERT INTO `yx_store_order_status` VALUES (139, 96, 'user_take_delivery', '用户已收货', 1575868078); INSERT INTO `yx_store_order_status` VALUES (140, 92, 'delivery_goods', '已发货 快递公司：中通快递 快递单号：9999999', 1575880109); +INSERT INTO `yx_store_order_status` VALUES (141, 36, 'delivery_goods', '已发货 快递公司：申通快递 快递单号：null', 1576142259); +INSERT INTO `yx_store_order_status` VALUES (142, 67, 'delivery_goods', '已发货 快递公司：顺丰速运 快递单号：444444', 1576142488); +INSERT INTO `yx_store_order_status` VALUES (143, 61, 'delivery_goods', '已发货 快递公司：顺丰速运 快递单号：99999', 1576142551); -- ---------------------------- -- Table structure for yx_store_pink diff --git a/yshop-shop/pom.xml b/yshop-shop/pom.xml new file mode 100644 index 00000000..68146b21 --- /dev/null +++ b/yshop-shop/pom.xml @@ -0,0 +1,33 @@ + + + + yshop + co.yixiang + 1.4 + + 4.0.0 + + yshop-shop + 商城模块 + + + 0.9.1 + + + + + co.yixiang + yshop-logging + 1.4 + + + co.yixiang + yshop-mp + 1.4 + + + + + \ No newline at end of file diff --git a/yshop-system/src/main/java/co/yixiang/modules/activity/domain/YxStoreCombination.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/domain/YxStoreCombination.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/activity/domain/YxStoreCombination.java rename to yshop-shop/src/main/java/co/yixiang/modules/activity/domain/YxStoreCombination.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/activity/domain/YxStoreCoupon.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/domain/YxStoreCoupon.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/activity/domain/YxStoreCoupon.java rename to yshop-shop/src/main/java/co/yixiang/modules/activity/domain/YxStoreCoupon.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/activity/domain/YxStoreCouponIssue.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/domain/YxStoreCouponIssue.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/activity/domain/YxStoreCouponIssue.java rename to yshop-shop/src/main/java/co/yixiang/modules/activity/domain/YxStoreCouponIssue.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/activity/domain/YxStoreCouponIssueUser.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/domain/YxStoreCouponIssueUser.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/activity/domain/YxStoreCouponIssueUser.java rename to yshop-shop/src/main/java/co/yixiang/modules/activity/domain/YxStoreCouponIssueUser.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/activity/domain/YxStoreCouponUser.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/domain/YxStoreCouponUser.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/activity/domain/YxStoreCouponUser.java rename to yshop-shop/src/main/java/co/yixiang/modules/activity/domain/YxStoreCouponUser.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/activity/domain/YxStorePink.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/domain/YxStorePink.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/activity/domain/YxStorePink.java rename to yshop-shop/src/main/java/co/yixiang/modules/activity/domain/YxStorePink.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/activity/domain/YxStoreVisit.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/domain/YxStoreVisit.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/activity/domain/YxStoreVisit.java rename to yshop-shop/src/main/java/co/yixiang/modules/activity/domain/YxStoreVisit.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/activity/domain/YxUserExtract.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/domain/YxUserExtract.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/activity/domain/YxUserExtract.java rename to yshop-shop/src/main/java/co/yixiang/modules/activity/domain/YxUserExtract.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/activity/repository/YxStoreCombinationRepository.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/repository/YxStoreCombinationRepository.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/activity/repository/YxStoreCombinationRepository.java rename to yshop-shop/src/main/java/co/yixiang/modules/activity/repository/YxStoreCombinationRepository.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/activity/repository/YxStoreCouponIssueRepository.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/repository/YxStoreCouponIssueRepository.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/activity/repository/YxStoreCouponIssueRepository.java rename to yshop-shop/src/main/java/co/yixiang/modules/activity/repository/YxStoreCouponIssueRepository.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/activity/repository/YxStoreCouponIssueUserRepository.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/repository/YxStoreCouponIssueUserRepository.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/activity/repository/YxStoreCouponIssueUserRepository.java rename to yshop-shop/src/main/java/co/yixiang/modules/activity/repository/YxStoreCouponIssueUserRepository.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/activity/repository/YxStoreCouponRepository.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/repository/YxStoreCouponRepository.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/activity/repository/YxStoreCouponRepository.java rename to yshop-shop/src/main/java/co/yixiang/modules/activity/repository/YxStoreCouponRepository.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/activity/repository/YxStoreCouponUserRepository.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/repository/YxStoreCouponUserRepository.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/activity/repository/YxStoreCouponUserRepository.java rename to yshop-shop/src/main/java/co/yixiang/modules/activity/repository/YxStoreCouponUserRepository.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/activity/repository/YxStorePinkRepository.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/repository/YxStorePinkRepository.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/activity/repository/YxStorePinkRepository.java rename to yshop-shop/src/main/java/co/yixiang/modules/activity/repository/YxStorePinkRepository.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/activity/repository/YxStoreVisitRepository.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/repository/YxStoreVisitRepository.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/activity/repository/YxStoreVisitRepository.java rename to yshop-shop/src/main/java/co/yixiang/modules/activity/repository/YxStoreVisitRepository.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/activity/repository/YxUserExtractRepository.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/repository/YxUserExtractRepository.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/activity/repository/YxUserExtractRepository.java rename to yshop-shop/src/main/java/co/yixiang/modules/activity/repository/YxUserExtractRepository.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/activity/rest/YxStoreCombinationController.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/YxStoreCombinationController.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/activity/rest/YxStoreCombinationController.java rename to yshop-shop/src/main/java/co/yixiang/modules/activity/rest/YxStoreCombinationController.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/activity/rest/YxStoreCouponController.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/YxStoreCouponController.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/activity/rest/YxStoreCouponController.java rename to yshop-shop/src/main/java/co/yixiang/modules/activity/rest/YxStoreCouponController.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/activity/rest/YxStoreCouponIssueController.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/YxStoreCouponIssueController.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/activity/rest/YxStoreCouponIssueController.java rename to yshop-shop/src/main/java/co/yixiang/modules/activity/rest/YxStoreCouponIssueController.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/activity/rest/YxStoreCouponIssueUserController.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/YxStoreCouponIssueUserController.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/activity/rest/YxStoreCouponIssueUserController.java rename to yshop-shop/src/main/java/co/yixiang/modules/activity/rest/YxStoreCouponIssueUserController.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/activity/rest/YxStoreCouponUserController.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/YxStoreCouponUserController.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/activity/rest/YxStoreCouponUserController.java rename to yshop-shop/src/main/java/co/yixiang/modules/activity/rest/YxStoreCouponUserController.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/activity/rest/YxStorePinkController.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/YxStorePinkController.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/activity/rest/YxStorePinkController.java rename to yshop-shop/src/main/java/co/yixiang/modules/activity/rest/YxStorePinkController.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/activity/rest/YxStoreVisitController.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/YxStoreVisitController.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/activity/rest/YxStoreVisitController.java rename to yshop-shop/src/main/java/co/yixiang/modules/activity/rest/YxStoreVisitController.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/activity/rest/YxUserExtractController.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/YxUserExtractController.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/activity/rest/YxUserExtractController.java rename to yshop-shop/src/main/java/co/yixiang/modules/activity/rest/YxUserExtractController.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/activity/service/YxStoreCombinationService.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/YxStoreCombinationService.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/activity/service/YxStoreCombinationService.java rename to yshop-shop/src/main/java/co/yixiang/modules/activity/service/YxStoreCombinationService.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/activity/service/YxStoreCouponIssueService.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/YxStoreCouponIssueService.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/activity/service/YxStoreCouponIssueService.java rename to yshop-shop/src/main/java/co/yixiang/modules/activity/service/YxStoreCouponIssueService.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/activity/service/YxStoreCouponIssueUserService.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/YxStoreCouponIssueUserService.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/activity/service/YxStoreCouponIssueUserService.java rename to yshop-shop/src/main/java/co/yixiang/modules/activity/service/YxStoreCouponIssueUserService.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/activity/service/YxStoreCouponService.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/YxStoreCouponService.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/activity/service/YxStoreCouponService.java rename to yshop-shop/src/main/java/co/yixiang/modules/activity/service/YxStoreCouponService.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/activity/service/YxStoreCouponUserService.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/YxStoreCouponUserService.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/activity/service/YxStoreCouponUserService.java rename to yshop-shop/src/main/java/co/yixiang/modules/activity/service/YxStoreCouponUserService.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/activity/service/YxStorePinkService.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/YxStorePinkService.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/activity/service/YxStorePinkService.java rename to yshop-shop/src/main/java/co/yixiang/modules/activity/service/YxStorePinkService.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/activity/service/YxStoreVisitService.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/YxStoreVisitService.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/activity/service/YxStoreVisitService.java rename to yshop-shop/src/main/java/co/yixiang/modules/activity/service/YxStoreVisitService.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/activity/service/YxUserExtractService.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/YxUserExtractService.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/activity/service/YxUserExtractService.java rename to yshop-shop/src/main/java/co/yixiang/modules/activity/service/YxUserExtractService.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCombinationDTO.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCombinationDTO.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCombinationDTO.java rename to yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCombinationDTO.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCombinationQueryCriteria.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCombinationQueryCriteria.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCombinationQueryCriteria.java rename to yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCombinationQueryCriteria.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCouponDTO.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCouponDTO.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCouponDTO.java rename to yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCouponDTO.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCouponIssueDTO.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCouponIssueDTO.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCouponIssueDTO.java rename to yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCouponIssueDTO.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCouponIssueQueryCriteria.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCouponIssueQueryCriteria.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCouponIssueQueryCriteria.java rename to yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCouponIssueQueryCriteria.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCouponIssueUserDTO.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCouponIssueUserDTO.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCouponIssueUserDTO.java rename to yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCouponIssueUserDTO.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCouponIssueUserQueryCriteria.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCouponIssueUserQueryCriteria.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCouponIssueUserQueryCriteria.java rename to yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCouponIssueUserQueryCriteria.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCouponQueryCriteria.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCouponQueryCriteria.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCouponQueryCriteria.java rename to yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCouponQueryCriteria.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCouponUserDTO.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCouponUserDTO.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCouponUserDTO.java rename to yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCouponUserDTO.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCouponUserQueryCriteria.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCouponUserQueryCriteria.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCouponUserQueryCriteria.java rename to yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCouponUserQueryCriteria.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/activity/service/dto/YxStorePinkDTO.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStorePinkDTO.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/activity/service/dto/YxStorePinkDTO.java rename to yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStorePinkDTO.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/activity/service/dto/YxStorePinkQueryCriteria.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStorePinkQueryCriteria.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/activity/service/dto/YxStorePinkQueryCriteria.java rename to yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStorePinkQueryCriteria.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreVisitDTO.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreVisitDTO.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreVisitDTO.java rename to yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreVisitDTO.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreVisitQueryCriteria.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreVisitQueryCriteria.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreVisitQueryCriteria.java rename to yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreVisitQueryCriteria.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/activity/service/dto/YxUserExtractDTO.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxUserExtractDTO.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/activity/service/dto/YxUserExtractDTO.java rename to yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxUserExtractDTO.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/activity/service/dto/YxUserExtractQueryCriteria.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxUserExtractQueryCriteria.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/activity/service/dto/YxUserExtractQueryCriteria.java rename to yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxUserExtractQueryCriteria.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCombinationServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCombinationServiceImpl.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCombinationServiceImpl.java rename to yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCombinationServiceImpl.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCouponIssueServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCouponIssueServiceImpl.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCouponIssueServiceImpl.java rename to yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCouponIssueServiceImpl.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCouponIssueUserServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCouponIssueUserServiceImpl.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCouponIssueUserServiceImpl.java rename to yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCouponIssueUserServiceImpl.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCouponServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCouponServiceImpl.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCouponServiceImpl.java rename to yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCouponServiceImpl.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCouponUserServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCouponUserServiceImpl.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCouponUserServiceImpl.java rename to yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCouponUserServiceImpl.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/activity/service/impl/YxStorePinkServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStorePinkServiceImpl.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/activity/service/impl/YxStorePinkServiceImpl.java rename to yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStorePinkServiceImpl.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreVisitServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreVisitServiceImpl.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreVisitServiceImpl.java rename to yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreVisitServiceImpl.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/activity/service/impl/YxUserExtractServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxUserExtractServiceImpl.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/activity/service/impl/YxUserExtractServiceImpl.java rename to yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxUserExtractServiceImpl.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/activity/service/mapper/YxStoreCombinationMapper.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/mapper/YxStoreCombinationMapper.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/activity/service/mapper/YxStoreCombinationMapper.java rename to yshop-shop/src/main/java/co/yixiang/modules/activity/service/mapper/YxStoreCombinationMapper.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/activity/service/mapper/YxStoreCouponIssueMapper.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/mapper/YxStoreCouponIssueMapper.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/activity/service/mapper/YxStoreCouponIssueMapper.java rename to yshop-shop/src/main/java/co/yixiang/modules/activity/service/mapper/YxStoreCouponIssueMapper.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/activity/service/mapper/YxStoreCouponIssueUserMapper.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/mapper/YxStoreCouponIssueUserMapper.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/activity/service/mapper/YxStoreCouponIssueUserMapper.java rename to yshop-shop/src/main/java/co/yixiang/modules/activity/service/mapper/YxStoreCouponIssueUserMapper.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/activity/service/mapper/YxStoreCouponMapper.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/mapper/YxStoreCouponMapper.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/activity/service/mapper/YxStoreCouponMapper.java rename to yshop-shop/src/main/java/co/yixiang/modules/activity/service/mapper/YxStoreCouponMapper.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/activity/service/mapper/YxStoreCouponUserMapper.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/mapper/YxStoreCouponUserMapper.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/activity/service/mapper/YxStoreCouponUserMapper.java rename to yshop-shop/src/main/java/co/yixiang/modules/activity/service/mapper/YxStoreCouponUserMapper.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/activity/service/mapper/YxStorePinkMapper.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/mapper/YxStorePinkMapper.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/activity/service/mapper/YxStorePinkMapper.java rename to yshop-shop/src/main/java/co/yixiang/modules/activity/service/mapper/YxStorePinkMapper.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/activity/service/mapper/YxStoreVisitMapper.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/mapper/YxStoreVisitMapper.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/activity/service/mapper/YxStoreVisitMapper.java rename to yshop-shop/src/main/java/co/yixiang/modules/activity/service/mapper/YxStoreVisitMapper.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/activity/service/mapper/YxUserExtractMapper.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/mapper/YxUserExtractMapper.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/activity/service/mapper/YxUserExtractMapper.java rename to yshop-shop/src/main/java/co/yixiang/modules/activity/service/mapper/YxUserExtractMapper.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/shop/domain/StoreOrderCartInfo.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/StoreOrderCartInfo.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/shop/domain/StoreOrderCartInfo.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/domain/StoreOrderCartInfo.java diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxExpress.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxExpress.java new file mode 100644 index 00000000..fd0f66b7 --- /dev/null +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxExpress.java @@ -0,0 +1,48 @@ +package co.yixiang.modules.shop.domain; + +import lombok.Data; +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.bean.copier.CopyOptions; +import javax.persistence.*; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** +* @author hupeng +* @date 2019-12-12 +*/ +@Entity +@Data +@Table(name="yx_express") +public class YxExpress implements Serializable { + + // 快递公司id + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "id") + private Integer id; + + // 快递公司简称 + @Column(name = "code",unique = true,nullable = false) + @NotBlank(message = "快递公司编号不能为空") + private String code; + + // 快递公司全称 + @Column(name = "name",nullable = false) + @NotBlank(message = "快递公司名称不能为空") + private String name; + + // 排序 + @Column(name = "sort",nullable = false) + @NotNull(message = "排序必填") + private Integer sort; + + // 是否显示 + @Column(name = "is_show",insertable = false) + private Integer isShow; + + public void copy(YxExpress source){ + BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true)); + } +} \ No newline at end of file diff --git a/yshop-system/src/main/java/co/yixiang/modules/shop/domain/YxStoreCategory.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreCategory.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/shop/domain/YxStoreCategory.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreCategory.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/shop/domain/YxStoreOrder.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreOrder.java similarity index 97% rename from yshop-system/src/main/java/co/yixiang/modules/shop/domain/YxStoreOrder.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreOrder.java index fe666222..49630634 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/shop/domain/YxStoreOrder.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreOrder.java @@ -4,6 +4,7 @@ import lombok.Data; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; import javax.persistence.*; +import javax.validation.constraints.NotBlank; import java.math.BigDecimal; import java.io.Serializable; @@ -132,6 +133,7 @@ public class YxStoreOrder implements Serializable { // 快递名称/送货人姓名 @Column(name = "delivery_name") + @NotBlank(message = "请选择快递公司") private String deliveryName; @Column(name = "delivery_sn") @@ -144,6 +146,7 @@ public class YxStoreOrder implements Serializable { // 快递单号/手机号 @Column(name = "delivery_id") + @NotBlank(message = "快递单号不能为空") private String deliveryId; // 消费赚取积分 diff --git a/yshop-system/src/main/java/co/yixiang/modules/shop/domain/YxStoreOrderStatus.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreOrderStatus.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/shop/domain/YxStoreOrderStatus.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreOrderStatus.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/shop/domain/YxStoreProduct.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreProduct.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/shop/domain/YxStoreProduct.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreProduct.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/shop/domain/YxStoreProductAttr.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreProductAttr.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/shop/domain/YxStoreProductAttr.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreProductAttr.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/shop/domain/YxStoreProductAttrResult.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreProductAttrResult.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/shop/domain/YxStoreProductAttrResult.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreProductAttrResult.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/shop/domain/YxStoreProductAttrValue.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreProductAttrValue.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/shop/domain/YxStoreProductAttrValue.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreProductAttrValue.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/shop/domain/YxStoreProductReply.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreProductReply.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/shop/domain/YxStoreProductReply.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreProductReply.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/shop/domain/YxSystemGroupData.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxSystemGroupData.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/shop/domain/YxSystemGroupData.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxSystemGroupData.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/shop/domain/YxSystemUserLevel.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxSystemUserLevel.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/shop/domain/YxSystemUserLevel.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxSystemUserLevel.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/shop/domain/YxSystemUserTask.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxSystemUserTask.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/shop/domain/YxSystemUserTask.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxSystemUserTask.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/shop/domain/YxUser.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxUser.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/shop/domain/YxUser.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxUser.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/shop/domain/YxUserBill.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxUserBill.java similarity index 98% rename from yshop-system/src/main/java/co/yixiang/modules/shop/domain/YxUserBill.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxUserBill.java index ec956f2b..1b6728ac 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/shop/domain/YxUserBill.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxUserBill.java @@ -22,10 +22,12 @@ public class YxUserBill implements Serializable { @Column(name = "id") private Integer id; - // 用户uid + //用户uid @Column(name = "uid",nullable = false) private Integer uid; + + // 关联id @Column(name = "link_id",nullable = false) private String linkId; diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/repository/YxExpressRepository.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/repository/YxExpressRepository.java new file mode 100644 index 00000000..790ce6f4 --- /dev/null +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/repository/YxExpressRepository.java @@ -0,0 +1,19 @@ +package co.yixiang.modules.shop.repository; + +import co.yixiang.modules.shop.domain.YxExpress; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.JpaSpecificationExecutor; + +/** +* @author hupeng +* @date 2019-12-12 +*/ +public interface YxExpressRepository extends JpaRepository, JpaSpecificationExecutor { + + /** + * findByCode + * @param code + * @return + */ + YxExpress findByCode(String code); +} \ No newline at end of file diff --git a/yshop-system/src/main/java/co/yixiang/modules/shop/repository/YxStoreCategoryRepository.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/repository/YxStoreCategoryRepository.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/shop/repository/YxStoreCategoryRepository.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/repository/YxStoreCategoryRepository.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/shop/repository/YxStoreOrderCartInfoRepository.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/repository/YxStoreOrderCartInfoRepository.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/shop/repository/YxStoreOrderCartInfoRepository.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/repository/YxStoreOrderCartInfoRepository.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/shop/repository/YxStoreOrderRepository.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/repository/YxStoreOrderRepository.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/shop/repository/YxStoreOrderRepository.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/repository/YxStoreOrderRepository.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/shop/repository/YxStoreOrderStatusRepository.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/repository/YxStoreOrderStatusRepository.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/shop/repository/YxStoreOrderStatusRepository.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/repository/YxStoreOrderStatusRepository.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/shop/repository/YxStoreProductAttrRepository.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/repository/YxStoreProductAttrRepository.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/shop/repository/YxStoreProductAttrRepository.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/repository/YxStoreProductAttrRepository.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/shop/repository/YxStoreProductAttrResultRepository.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/repository/YxStoreProductAttrResultRepository.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/shop/repository/YxStoreProductAttrResultRepository.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/repository/YxStoreProductAttrResultRepository.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/shop/repository/YxStoreProductAttrValueRepository.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/repository/YxStoreProductAttrValueRepository.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/shop/repository/YxStoreProductAttrValueRepository.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/repository/YxStoreProductAttrValueRepository.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/shop/repository/YxStoreProductReplyRepository.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/repository/YxStoreProductReplyRepository.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/shop/repository/YxStoreProductReplyRepository.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/repository/YxStoreProductReplyRepository.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/shop/repository/YxStoreProductRepository.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/repository/YxStoreProductRepository.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/shop/repository/YxStoreProductRepository.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/repository/YxStoreProductRepository.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/shop/repository/YxSystemGroupDataRepository.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/repository/YxSystemGroupDataRepository.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/shop/repository/YxSystemGroupDataRepository.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/repository/YxSystemGroupDataRepository.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/shop/repository/YxSystemUserLevelRepository.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/repository/YxSystemUserLevelRepository.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/shop/repository/YxSystemUserLevelRepository.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/repository/YxSystemUserLevelRepository.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/shop/repository/YxSystemUserTaskRepository.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/repository/YxSystemUserTaskRepository.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/shop/repository/YxSystemUserTaskRepository.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/repository/YxSystemUserTaskRepository.java diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/repository/YxUserBillRepository.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/repository/YxUserBillRepository.java new file mode 100644 index 00000000..4d932384 --- /dev/null +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/repository/YxUserBillRepository.java @@ -0,0 +1,29 @@ +package co.yixiang.modules.shop.repository; + +import co.yixiang.modules.shop.domain.YxUserBill; +import co.yixiang.modules.shop.service.dto.UserBillDTO; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.JpaSpecificationExecutor; +import org.springframework.data.jpa.repository.Query; + +import java.util.Map; + +/** +* @author hupeng +* @date 2019-11-06 +*/ +public interface YxUserBillRepository extends JpaRepository, JpaSpecificationExecutor { + @Query(nativeQuery = true, + value = "select b.title,b.pm,b.category,b.type,b.number,b.add_time as addTime," + + "u.nickname from yx_user_bill b left join yx_user u on u.uid=b.uid " + + " where if(?1 !='',b.category=?1,1=1) and if(?2 !='',b.type=?2,1=1) " + + "and if(?3 !='',u.nickname LIKE CONCAT('%',?3,'%'),1=1)", + countQuery = "select count(*) from yx_user_bill b left join yx_user u on u.uid=b.uid" + + " where if(?1 !='',b.category=?1,1=1) and if(?2 !='',b.type=?2,1=1) " + + "and if(?3 !='',u.nickname LIKE CONCAT('%',?3,'%'),1=1)") + Page findAllByPageable(String category, String type, String nickname, + Pageable pageable); + +} \ No newline at end of file diff --git a/yshop-system/src/main/java/co/yixiang/modules/shop/repository/YxUserRepository.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/repository/YxUserRepository.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/shop/repository/YxUserRepository.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/repository/YxUserRepository.java diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/YxExpressController.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/YxExpressController.java new file mode 100644 index 00000000..5a681779 --- /dev/null +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/YxExpressController.java @@ -0,0 +1,66 @@ +package co.yixiang.modules.shop.rest; + +import cn.hutool.core.util.StrUtil; +import co.yixiang.aop.log.Log; +import co.yixiang.exception.BadRequestException; +import co.yixiang.modules.shop.domain.YxExpress; +import co.yixiang.modules.shop.service.YxExpressService; +import co.yixiang.modules.shop.service.dto.YxExpressQueryCriteria; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Pageable; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.*; + +/** +* @author hupeng +* @date 2019-12-12 +*/ +@Api(tags = "YxExpress管理") +@RestController +@RequestMapping("api") +public class YxExpressController { + + @Autowired + private YxExpressService yxExpressService; + + @Log("查询YxExpress") + @ApiOperation(value = "查询YxExpress") + @GetMapping(value = "/yxExpress") + @PreAuthorize("hasAnyRole('ADMIN','YXEXPRESS_ALL','YXEXPRESS_SELECT')") + public ResponseEntity getYxExpresss(YxExpressQueryCriteria criteria, Pageable pageable){ + return new ResponseEntity(yxExpressService.queryAll(criteria,pageable),HttpStatus.OK); + } + + @Log("新增YxExpress") + @ApiOperation(value = "新增YxExpress") + @PostMapping(value = "/yxExpress") + @PreAuthorize("hasAnyRole('ADMIN','YXEXPRESS_ALL','YXEXPRESS_CREATE')") + public ResponseEntity create(@Validated @RequestBody YxExpress resources){ + //if(StrUtil.isNotEmpty("22")) throw new BadRequestException("演示环境禁止操作"); + return new ResponseEntity(yxExpressService.create(resources),HttpStatus.CREATED); + } + + @Log("修改YxExpress") + @ApiOperation(value = "修改YxExpress") + @PutMapping(value = "/yxExpress") + @PreAuthorize("hasAnyRole('ADMIN','YXEXPRESS_ALL','YXEXPRESS_EDIT')") + public ResponseEntity update(@Validated @RequestBody YxExpress resources){ + //if(StrUtil.isNotEmpty("22")) throw new BadRequestException("演示环境禁止操作"); + yxExpressService.update(resources); + return new ResponseEntity(HttpStatus.NO_CONTENT); + } + + @Log("删除YxExpress") + @ApiOperation(value = "删除YxExpress") + @DeleteMapping(value = "/yxExpress/{id}") + @PreAuthorize("hasAnyRole('ADMIN','YXEXPRESS_ALL','YXEXPRESS_DELETE')") + public ResponseEntity delete(@PathVariable Integer id){ + //if(StrUtil.isNotEmpty("22")) throw new BadRequestException("演示环境禁止操作"); + yxExpressService.delete(id); + return new ResponseEntity(HttpStatus.OK); + } +} \ No newline at end of file diff --git a/yshop-system/src/main/java/co/yixiang/modules/shop/rest/YxStoreCategoryController.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/YxStoreCategoryController.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/shop/rest/YxStoreCategoryController.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/rest/YxStoreCategoryController.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/shop/rest/YxStoreOrderController.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/YxStoreOrderController.java similarity index 93% rename from yshop-system/src/main/java/co/yixiang/modules/shop/rest/YxStoreOrderController.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/rest/YxStoreOrderController.java index 7520159d..bebc69ae 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/shop/rest/YxStoreOrderController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/YxStoreOrderController.java @@ -5,12 +5,12 @@ import cn.hutool.core.util.StrUtil; import co.yixiang.exception.BadRequestException; import co.yixiang.modules.shop.domain.YxStoreOrder; import co.yixiang.modules.shop.domain.YxStoreOrderStatus; +import co.yixiang.modules.shop.service.YxExpressService; import co.yixiang.modules.shop.service.YxStoreOrderService; import co.yixiang.aop.log.Log; import co.yixiang.modules.shop.service.YxStoreOrderStatusService; +import co.yixiang.modules.shop.service.dto.YxExpressDTO; import co.yixiang.modules.shop.service.dto.YxStoreOrderQueryCriteria; -import co.yixiang.modules.system.service.DictDetailService; -import co.yixiang.modules.system.service.dto.DictDetailDTO; import co.yixiang.utils.OrderUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Pageable; @@ -37,7 +37,8 @@ public class YxStoreOrderController { private YxStoreOrderStatusService yxStoreOrderStatusService; @Autowired - private DictDetailService dictDetailService; + private YxExpressService yxExpressService; + @GetMapping(value = "/data/count") //@PreAuthorize("hasAnyRole('ADMIN','YXSTOREORDER_ALL','YXSTOREORDER_SELECT')") @@ -121,15 +122,15 @@ public class YxStoreOrderController { @PreAuthorize("hasAnyRole('ADMIN','YXSTOREORDER_ALL','YXSTOREORDER_EDIT')") public ResponseEntity update(@Validated @RequestBody YxStoreOrder resources){ - DictDetailDTO dictDetailDTO = dictDetailService.findById(Long.valueOf(resources + YxExpressDTO expressDTO = yxExpressService.findById(Integer.valueOf(resources .getDeliveryName())); - if(ObjectUtil.isNull(dictDetailDTO)){ + if(ObjectUtil.isNull(expressDTO)){ throw new BadRequestException("请先添加快递公司"); } resources.setStatus(1); resources.setDeliveryType("express"); - resources.setDeliveryName(dictDetailDTO.getLabel()); - resources.setDeliverySn(dictDetailDTO.getValue()); + resources.setDeliveryName(expressDTO.getName()); + resources.setDeliverySn(expressDTO.getCode()); yxStoreOrderService.update(resources); diff --git a/yshop-system/src/main/java/co/yixiang/modules/shop/rest/YxStoreProductController.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/YxStoreProductController.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/shop/rest/YxStoreProductController.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/rest/YxStoreProductController.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/shop/rest/YxStoreProductReplyController.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/YxStoreProductReplyController.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/shop/rest/YxStoreProductReplyController.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/rest/YxStoreProductReplyController.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/shop/rest/YxSystemGroupDataController.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/YxSystemGroupDataController.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/shop/rest/YxSystemGroupDataController.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/rest/YxSystemGroupDataController.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/shop/rest/YxSystemUserLevelController.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/YxSystemUserLevelController.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/shop/rest/YxSystemUserLevelController.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/rest/YxSystemUserLevelController.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/shop/rest/YxSystemUserTaskController.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/YxSystemUserTaskController.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/shop/rest/YxSystemUserTaskController.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/rest/YxSystemUserTaskController.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/shop/rest/YxUserBillController.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/YxUserBillController.java similarity index 53% rename from yshop-system/src/main/java/co/yixiang/modules/shop/rest/YxUserBillController.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/rest/YxUserBillController.java index e43240d0..90aa0c55 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/shop/rest/YxUserBillController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/YxUserBillController.java @@ -33,29 +33,9 @@ public class YxUserBillController { return new ResponseEntity(yxUserBillService.queryAll(criteria,pageable),HttpStatus.OK); } - @Log("新增YxUserBill") - @ApiOperation(value = "新增YxUserBill") - @PostMapping(value = "/yxUserBill") - @PreAuthorize("hasAnyRole('ADMIN','YXUSERBILL_ALL','YXUSERBILL_CREATE')") - public ResponseEntity create(@Validated @RequestBody YxUserBill resources){ - return new ResponseEntity(yxUserBillService.create(resources),HttpStatus.CREATED); - } - @Log("修改YxUserBill") - @ApiOperation(value = "修改YxUserBill") - @PutMapping(value = "/yxUserBill") - @PreAuthorize("hasAnyRole('ADMIN','YXUSERBILL_ALL','YXUSERBILL_EDIT')") - public ResponseEntity update(@Validated @RequestBody YxUserBill resources){ - yxUserBillService.update(resources); - return new ResponseEntity(HttpStatus.NO_CONTENT); - } - @Log("删除YxUserBill") - @ApiOperation(value = "删除YxUserBill") - @DeleteMapping(value = "/yxUserBill/{id}") - @PreAuthorize("hasAnyRole('ADMIN','YXUSERBILL_ALL','YXUSERBILL_DELETE')") - public ResponseEntity delete(@PathVariable Integer id){ - yxUserBillService.delete(id); - return new ResponseEntity(HttpStatus.OK); - } + + + } \ No newline at end of file diff --git a/yshop-system/src/main/java/co/yixiang/modules/shop/rest/YxUserController.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/YxUserController.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/shop/rest/YxUserController.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/rest/YxUserController.java diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxExpressService.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxExpressService.java new file mode 100644 index 00000000..6fa2ad6c --- /dev/null +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxExpressService.java @@ -0,0 +1,66 @@ +package co.yixiang.modules.shop.service; + +import co.yixiang.modules.shop.domain.YxExpress; +import co.yixiang.modules.shop.service.dto.YxExpressDTO; +import co.yixiang.modules.shop.service.dto.YxExpressQueryCriteria; +import org.springframework.cache.annotation.CacheConfig; +import org.springframework.cache.annotation.CacheEvict; +import org.springframework.cache.annotation.Cacheable; +import org.springframework.data.domain.Pageable; +import java.util.Map; +import java.util.List; + +/** +* @author hupeng +* @date 2019-12-12 +*/ +//@CacheConfig(cacheNames = "yxExpress") +public interface YxExpressService { + + /** + * 查询数据分页 + * @param criteria + * @param pageable + * @return + */ + //@Cacheable + Map queryAll(YxExpressQueryCriteria criteria, Pageable pageable); + + /** + * 查询所有数据不分页 + * @param criteria + * @return + */ + //@Cacheable + List queryAll(YxExpressQueryCriteria criteria); + + /** + * 根据ID查询 + * @param id + * @return + */ + //@Cacheable(key = "#p0") + YxExpressDTO findById(Integer id); + + /** + * 创建 + * @param resources + * @return + */ + //@CacheEvict(allEntries = true) + YxExpressDTO create(YxExpress resources); + + /** + * 编辑 + * @param resources + */ + //@CacheEvict(allEntries = true) + void update(YxExpress resources); + + /** + * 删除 + * @param id + */ + //@CacheEvict(allEntries = true) + void delete(Integer id); +} \ No newline at end of file diff --git a/yshop-system/src/main/java/co/yixiang/modules/shop/service/YxStoreCategoryService.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxStoreCategoryService.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/shop/service/YxStoreCategoryService.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxStoreCategoryService.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/shop/service/YxStoreOrderService.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxStoreOrderService.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/shop/service/YxStoreOrderService.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxStoreOrderService.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/shop/service/YxStoreOrderStatusService.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxStoreOrderStatusService.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/shop/service/YxStoreOrderStatusService.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxStoreOrderStatusService.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/shop/service/YxStoreProductReplyService.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxStoreProductReplyService.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/shop/service/YxStoreProductReplyService.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxStoreProductReplyService.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/shop/service/YxStoreProductService.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxStoreProductService.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/shop/service/YxStoreProductService.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxStoreProductService.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/shop/service/YxSystemGroupDataService.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxSystemGroupDataService.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/shop/service/YxSystemGroupDataService.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxSystemGroupDataService.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/shop/service/YxSystemUserLevelService.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxSystemUserLevelService.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/shop/service/YxSystemUserLevelService.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxSystemUserLevelService.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/shop/service/YxSystemUserTaskService.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxSystemUserTaskService.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/shop/service/YxSystemUserTaskService.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxSystemUserTaskService.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/shop/service/YxUserBillService.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxUserBillService.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/shop/service/YxUserBillService.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxUserBillService.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/shop/service/YxUserService.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxUserService.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/shop/service/YxUserService.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxUserService.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/shop/service/dto/ChartDataDTO.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/ChartDataDTO.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/shop/service/dto/ChartDataDTO.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/ChartDataDTO.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/shop/service/dto/DetailDTO.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/DetailDTO.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/shop/service/dto/DetailDTO.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/DetailDTO.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/shop/service/dto/FromatDetailDTO.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/FromatDetailDTO.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/shop/service/dto/FromatDetailDTO.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/FromatDetailDTO.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/shop/service/dto/OrderTimeDataDTO.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/OrderTimeDataDTO.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/shop/service/dto/OrderTimeDataDTO.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/OrderTimeDataDTO.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/shop/service/dto/ProductFormatDTO.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/ProductFormatDTO.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/shop/service/dto/ProductFormatDTO.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/ProductFormatDTO.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/shop/service/dto/StoreOrderCartInfoDTO.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/StoreOrderCartInfoDTO.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/shop/service/dto/StoreOrderCartInfoDTO.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/StoreOrderCartInfoDTO.java diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/UserBillDTO.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/UserBillDTO.java new file mode 100644 index 00000000..53bb7dd7 --- /dev/null +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/UserBillDTO.java @@ -0,0 +1,18 @@ +package co.yixiang.modules.shop.service.dto; + +import lombok.Data; + +/** + * @ClassName UserBillDTO + * @Author hupeng <610796224@qq.com> + * @Date 2019/12/11 + **/ +@Data +public class UserBillDTO { + private Integer pm; + private String gtitle; + private String category; + private String type; + private Double number; + private String nickname; +} diff --git a/yshop-system/src/main/java/co/yixiang/modules/shop/service/dto/UserMoneyDTO.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/UserMoneyDTO.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/shop/service/dto/UserMoneyDTO.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/UserMoneyDTO.java diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxExpressDTO.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxExpressDTO.java new file mode 100644 index 00000000..d908bfeb --- /dev/null +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxExpressDTO.java @@ -0,0 +1,28 @@ +package co.yixiang.modules.shop.service.dto; + +import lombok.Data; +import java.io.Serializable; + + +/** +* @author hupeng +* @date 2019-12-12 +*/ +@Data +public class YxExpressDTO implements Serializable { + + // 快递公司id + private Integer id; + + // 快递公司简称 + private String code; + + // 快递公司全称 + private String name; + + // 排序 + private Integer sort; + + // 是否显示 + private Integer isShow; +} \ No newline at end of file diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxExpressQueryCriteria.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxExpressQueryCriteria.java new file mode 100644 index 00000000..7991535f --- /dev/null +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxExpressQueryCriteria.java @@ -0,0 +1,12 @@ +package co.yixiang.modules.shop.service.dto; + +import lombok.Data; +import co.yixiang.annotation.Query; + +/** +* @author hupeng +* @date 2019-12-12 +*/ +@Data +public class YxExpressQueryCriteria{ +} \ No newline at end of file diff --git a/yshop-system/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreCategoryDTO.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreCategoryDTO.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreCategoryDTO.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreCategoryDTO.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreCategoryQueryCriteria.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreCategoryQueryCriteria.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreCategoryQueryCriteria.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreCategoryQueryCriteria.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreOrderDTO.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreOrderDTO.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreOrderDTO.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreOrderDTO.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreOrderQueryCriteria.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreOrderQueryCriteria.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreOrderQueryCriteria.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreOrderQueryCriteria.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreOrderStatusDTO.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreOrderStatusDTO.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreOrderStatusDTO.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreOrderStatusDTO.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreOrderStatusQueryCriteria.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreOrderStatusQueryCriteria.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreOrderStatusQueryCriteria.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreOrderStatusQueryCriteria.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreProductDTO.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreProductDTO.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreProductDTO.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreProductDTO.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreProductQueryCriteria.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreProductQueryCriteria.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreProductQueryCriteria.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreProductQueryCriteria.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreProductReplyDTO.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreProductReplyDTO.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreProductReplyDTO.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreProductReplyDTO.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreProductReplyQueryCriteria.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreProductReplyQueryCriteria.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreProductReplyQueryCriteria.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreProductReplyQueryCriteria.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemGroupDataDTO.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemGroupDataDTO.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemGroupDataDTO.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemGroupDataDTO.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemGroupDataQueryCriteria.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemGroupDataQueryCriteria.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemGroupDataQueryCriteria.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemGroupDataQueryCriteria.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemUserLevelDTO.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemUserLevelDTO.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemUserLevelDTO.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemUserLevelDTO.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemUserLevelQueryCriteria.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemUserLevelQueryCriteria.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemUserLevelQueryCriteria.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemUserLevelQueryCriteria.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemUserTaskDTO.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemUserTaskDTO.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemUserTaskDTO.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemUserTaskDTO.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemUserTaskQueryCriteria.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemUserTaskQueryCriteria.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemUserTaskQueryCriteria.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemUserTaskQueryCriteria.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/shop/service/dto/YxUserBillDTO.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxUserBillDTO.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/shop/service/dto/YxUserBillDTO.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxUserBillDTO.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/shop/service/dto/YxUserBillQueryCriteria.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxUserBillQueryCriteria.java similarity index 72% rename from yshop-system/src/main/java/co/yixiang/modules/shop/service/dto/YxUserBillQueryCriteria.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxUserBillQueryCriteria.java index 713c4516..3f747c61 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/shop/service/dto/YxUserBillQueryCriteria.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxUserBillQueryCriteria.java @@ -10,4 +10,7 @@ import co.yixiang.annotation.Query; */ @Data public class YxUserBillQueryCriteria{ + private String nickname; + private String category; + private String type; } \ No newline at end of file diff --git a/yshop-system/src/main/java/co/yixiang/modules/shop/service/dto/YxUserDTO.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxUserDTO.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/shop/service/dto/YxUserDTO.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxUserDTO.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/shop/service/dto/YxUserQueryCriteria.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxUserQueryCriteria.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/shop/service/dto/YxUserQueryCriteria.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxUserQueryCriteria.java diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxExpressServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxExpressServiceImpl.java new file mode 100644 index 00000000..c5da1f33 --- /dev/null +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxExpressServiceImpl.java @@ -0,0 +1,84 @@ +package co.yixiang.modules.shop.service.impl; + +import co.yixiang.exception.EntityExistException; +import co.yixiang.modules.shop.domain.YxExpress; +import co.yixiang.utils.ValidationUtil; +import co.yixiang.modules.shop.repository.YxExpressRepository; +import co.yixiang.modules.shop.service.YxExpressService; +import co.yixiang.modules.shop.service.dto.YxExpressDTO; +import co.yixiang.modules.shop.service.dto.YxExpressQueryCriteria; +import co.yixiang.modules.shop.service.mapper.YxExpressMapper; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; +import java.util.Optional; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import co.yixiang.utils.PageUtil; +import co.yixiang.utils.QueryHelp; +import java.util.List; +import java.util.Map; + +/** +* @author hupeng +* @date 2019-12-12 +*/ +@Service +@Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class) +public class YxExpressServiceImpl implements YxExpressService { + + @Autowired + private YxExpressRepository yxExpressRepository; + + @Autowired + private YxExpressMapper yxExpressMapper; + + @Override + public Map queryAll(YxExpressQueryCriteria criteria, Pageable pageable){ + Page page = yxExpressRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder),pageable); + return PageUtil.toPage(page.map(yxExpressMapper::toDto)); + } + + @Override + public List queryAll(YxExpressQueryCriteria criteria){ + return yxExpressMapper.toDto(yxExpressRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder))); + } + + @Override + public YxExpressDTO findById(Integer id) { + Optional yxExpress = yxExpressRepository.findById(id); + ValidationUtil.isNull(yxExpress,"YxExpress","id",id); + return yxExpressMapper.toDto(yxExpress.get()); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public YxExpressDTO create(YxExpress resources) { + if(yxExpressRepository.findByCode(resources.getCode()) != null){ + throw new EntityExistException(YxExpress.class,"code",resources.getCode()); + } + return yxExpressMapper.toDto(yxExpressRepository.save(resources)); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(YxExpress resources) { + Optional optionalYxExpress = yxExpressRepository.findById(resources.getId()); + ValidationUtil.isNull( optionalYxExpress,"YxExpress","id",resources.getId()); + YxExpress yxExpress = optionalYxExpress.get(); + YxExpress yxExpress1 = null; + yxExpress1 = yxExpressRepository.findByCode(resources.getCode()); + if(yxExpress1 != null && !yxExpress1.getId().equals(yxExpress.getId())){ + throw new EntityExistException(YxExpress.class,"code",resources.getCode()); + } + yxExpress.copy(resources); + yxExpressRepository.save(yxExpress); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(Integer id) { + yxExpressRepository.deleteById(id); + } +} \ No newline at end of file diff --git a/yshop-system/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreCategoryServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreCategoryServiceImpl.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreCategoryServiceImpl.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreCategoryServiceImpl.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreOrderServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreOrderServiceImpl.java similarity index 99% rename from yshop-system/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreOrderServiceImpl.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreOrderServiceImpl.java index 306115d0..e6896842 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreOrderServiceImpl.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreOrderServiceImpl.java @@ -124,6 +124,7 @@ public class YxStoreOrderServiceImpl implements YxStoreOrderService { YxUserBill userBill = new YxUserBill(); userBill.setUid(resources.getUid()); + userBill.setLinkId(resources.getId().toString()); userBill.setPm(1); userBill.setTitle("商品退款"); diff --git a/yshop-system/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreOrderStatusServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreOrderStatusServiceImpl.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreOrderStatusServiceImpl.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreOrderStatusServiceImpl.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductReplyServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductReplyServiceImpl.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductReplyServiceImpl.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductReplyServiceImpl.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductServiceImpl.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductServiceImpl.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductServiceImpl.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemGroupDataServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemGroupDataServiceImpl.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemGroupDataServiceImpl.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemGroupDataServiceImpl.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemUserLevelServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemUserLevelServiceImpl.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemUserLevelServiceImpl.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemUserLevelServiceImpl.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemUserTaskServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemUserTaskServiceImpl.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemUserTaskServiceImpl.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemUserTaskServiceImpl.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/shop/service/impl/YxUserBillServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxUserBillServiceImpl.java similarity index 86% rename from yshop-system/src/main/java/co/yixiang/modules/shop/service/impl/YxUserBillServiceImpl.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxUserBillServiceImpl.java index c14c0e01..65c465f8 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/shop/service/impl/YxUserBillServiceImpl.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxUserBillServiceImpl.java @@ -1,6 +1,7 @@ package co.yixiang.modules.shop.service.impl; import co.yixiang.modules.shop.domain.YxUserBill; +import co.yixiang.modules.shop.service.dto.UserBillDTO; import co.yixiang.utils.ValidationUtil; import co.yixiang.modules.shop.repository.YxUserBillRepository; import co.yixiang.modules.shop.service.YxUserBillService; @@ -11,6 +12,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; + +import java.util.LinkedHashMap; import java.util.Optional; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; @@ -35,8 +38,12 @@ public class YxUserBillServiceImpl implements YxUserBillService { @Override public Map queryAll(YxUserBillQueryCriteria criteria, Pageable pageable){ - Page page = yxUserBillRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder),pageable); - return PageUtil.toPage(page.map(yxUserBillMapper::toDto)); + Page page = yxUserBillRepository.findAllByPageable(criteria.getCategory() + ,criteria.getType(),criteria.getNickname(),pageable); + Map map = new LinkedHashMap<>(2); + map.put("content",page.getContent()); + map.put("totalElements",page.getTotalElements()); + return map; } @Override diff --git a/yshop-system/src/main/java/co/yixiang/modules/shop/service/impl/YxUserServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxUserServiceImpl.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/shop/service/impl/YxUserServiceImpl.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxUserServiceImpl.java diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxExpressMapper.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxExpressMapper.java new file mode 100644 index 00000000..13bb1c8b --- /dev/null +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxExpressMapper.java @@ -0,0 +1,16 @@ +package co.yixiang.modules.shop.service.mapper; + +import co.yixiang.mapper.EntityMapper; +import co.yixiang.modules.shop.domain.YxExpress; +import co.yixiang.modules.shop.service.dto.YxExpressDTO; +import org.mapstruct.Mapper; +import org.mapstruct.ReportingPolicy; + +/** +* @author hupeng +* @date 2019-12-12 +*/ +@Mapper(componentModel = "spring",uses = {},unmappedTargetPolicy = ReportingPolicy.IGNORE) +public interface YxExpressMapper extends EntityMapper { + +} \ No newline at end of file diff --git a/yshop-system/src/main/java/co/yixiang/modules/shop/service/mapper/YxStoreCategoryMapper.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxStoreCategoryMapper.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/shop/service/mapper/YxStoreCategoryMapper.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxStoreCategoryMapper.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/shop/service/mapper/YxStoreOrderMapper.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxStoreOrderMapper.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/shop/service/mapper/YxStoreOrderMapper.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxStoreOrderMapper.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/shop/service/mapper/YxStoreOrderStatusMapper.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxStoreOrderStatusMapper.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/shop/service/mapper/YxStoreOrderStatusMapper.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxStoreOrderStatusMapper.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/shop/service/mapper/YxStoreProductMapper.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxStoreProductMapper.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/shop/service/mapper/YxStoreProductMapper.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxStoreProductMapper.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/shop/service/mapper/YxStoreProductReplyMapper.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxStoreProductReplyMapper.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/shop/service/mapper/YxStoreProductReplyMapper.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxStoreProductReplyMapper.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/shop/service/mapper/YxSystemGroupDataMapper.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxSystemGroupDataMapper.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/shop/service/mapper/YxSystemGroupDataMapper.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxSystemGroupDataMapper.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/shop/service/mapper/YxSystemUserLevelMapper.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxSystemUserLevelMapper.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/shop/service/mapper/YxSystemUserLevelMapper.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxSystemUserLevelMapper.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/shop/service/mapper/YxSystemUserTaskMapper.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxSystemUserTaskMapper.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/shop/service/mapper/YxSystemUserTaskMapper.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxSystemUserTaskMapper.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/shop/service/mapper/YxUserBillMapper.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxUserBillMapper.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/shop/service/mapper/YxUserBillMapper.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxUserBillMapper.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/shop/service/mapper/YxUserMapper.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxUserMapper.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/shop/service/mapper/YxUserMapper.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxUserMapper.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/wechat/domain/YxSystemConfig.java b/yshop-shop/src/main/java/co/yixiang/modules/wechat/domain/YxSystemConfig.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/wechat/domain/YxSystemConfig.java rename to yshop-shop/src/main/java/co/yixiang/modules/wechat/domain/YxSystemConfig.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/wechat/repository/YxSystemConfigRepository.java b/yshop-shop/src/main/java/co/yixiang/modules/wechat/repository/YxSystemConfigRepository.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/wechat/repository/YxSystemConfigRepository.java rename to yshop-shop/src/main/java/co/yixiang/modules/wechat/repository/YxSystemConfigRepository.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/wechat/rest/YxSystemConfigController.java b/yshop-shop/src/main/java/co/yixiang/modules/wechat/rest/YxSystemConfigController.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/wechat/rest/YxSystemConfigController.java rename to yshop-shop/src/main/java/co/yixiang/modules/wechat/rest/YxSystemConfigController.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/wechat/service/YxSystemConfigService.java b/yshop-shop/src/main/java/co/yixiang/modules/wechat/service/YxSystemConfigService.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/wechat/service/YxSystemConfigService.java rename to yshop-shop/src/main/java/co/yixiang/modules/wechat/service/YxSystemConfigService.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/wechat/service/dto/YxSystemConfigDTO.java b/yshop-shop/src/main/java/co/yixiang/modules/wechat/service/dto/YxSystemConfigDTO.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/wechat/service/dto/YxSystemConfigDTO.java rename to yshop-shop/src/main/java/co/yixiang/modules/wechat/service/dto/YxSystemConfigDTO.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/wechat/service/dto/YxSystemConfigQueryCriteria.java b/yshop-shop/src/main/java/co/yixiang/modules/wechat/service/dto/YxSystemConfigQueryCriteria.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/wechat/service/dto/YxSystemConfigQueryCriteria.java rename to yshop-shop/src/main/java/co/yixiang/modules/wechat/service/dto/YxSystemConfigQueryCriteria.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/wechat/service/impl/YxSystemConfigServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/wechat/service/impl/YxSystemConfigServiceImpl.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/wechat/service/impl/YxSystemConfigServiceImpl.java rename to yshop-shop/src/main/java/co/yixiang/modules/wechat/service/impl/YxSystemConfigServiceImpl.java diff --git a/yshop-system/src/main/java/co/yixiang/modules/wechat/service/mapper/YxSystemConfigMapper.java b/yshop-shop/src/main/java/co/yixiang/modules/wechat/service/mapper/YxSystemConfigMapper.java similarity index 100% rename from yshop-system/src/main/java/co/yixiang/modules/wechat/service/mapper/YxSystemConfigMapper.java rename to yshop-shop/src/main/java/co/yixiang/modules/wechat/service/mapper/YxSystemConfigMapper.java diff --git a/yshop-system/pom.xml b/yshop-system/pom.xml index a91d401a..8d03493b 100644 --- a/yshop-system/pom.xml +++ b/yshop-system/pom.xml @@ -36,7 +36,7 @@ co.yixiang - yshop-mp + yshop-shop 1.4 diff --git a/yshop-system/src/main/java/co/yixiang/modules/shop/repository/YxUserBillRepository.java b/yshop-system/src/main/java/co/yixiang/modules/shop/repository/YxUserBillRepository.java deleted file mode 100644 index 19e5384d..00000000 --- a/yshop-system/src/main/java/co/yixiang/modules/shop/repository/YxUserBillRepository.java +++ /dev/null @@ -1,12 +0,0 @@ -package co.yixiang.modules.shop.repository; - -import co.yixiang.modules.shop.domain.YxUserBill; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.JpaSpecificationExecutor; - -/** -* @author hupeng -* @date 2019-11-06 -*/ -public interface YxUserBillRepository extends JpaRepository, JpaSpecificationExecutor { -} \ No newline at end of file diff --git a/yshop-system/src/main/java/co/yixiang/modules/system/rest/DeptController.java b/yshop-system/src/main/java/co/yixiang/modules/system/rest/DeptController.java index 60c131a7..a1057d31 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/system/rest/DeptController.java +++ b/yshop-system/src/main/java/co/yixiang/modules/system/rest/DeptController.java @@ -32,7 +32,7 @@ public class DeptController { private static final String ENTITY_NAME = "dept"; - @Log("查询部门") + // @Log("查询部门") @GetMapping(value = "/dept") @PreAuthorize("hasAnyRole('ADMIN','USER_ALL','USER_SELECT','DEPT_ALL','DEPT_SELECT')") public ResponseEntity getDepts(DeptQueryCriteria criteria){ @@ -42,7 +42,7 @@ public class DeptController { return new ResponseEntity(deptService.buildTree(deptDTOS),HttpStatus.OK); } - @Log("新增部门") + //@Log("新增部门") @PostMapping(value = "/dept") @PreAuthorize("hasAnyRole('ADMIN','DEPT_ALL','DEPT_CREATE')") public ResponseEntity create(@Validated @RequestBody Dept resources){ @@ -52,7 +52,7 @@ public class DeptController { return new ResponseEntity(deptService.create(resources),HttpStatus.CREATED); } - @Log("修改部门") + //@Log("修改部门") @PutMapping(value = "/dept") @PreAuthorize("hasAnyRole('ADMIN','DEPT_ALL','DEPT_EDIT')") public ResponseEntity update(@Validated(Dept.Update.class) @RequestBody Dept resources){ @@ -60,7 +60,7 @@ public class DeptController { return new ResponseEntity(HttpStatus.NO_CONTENT); } - @Log("删除部门") + //@Log("删除部门") @DeleteMapping(value = "/dept/{id}") @PreAuthorize("hasAnyRole('ADMIN','DEPT_ALL','DEPT_DELETE')") public ResponseEntity delete(@PathVariable Long id){ diff --git a/yshop-system/src/main/java/co/yixiang/modules/system/rest/MenuController.java b/yshop-system/src/main/java/co/yixiang/modules/system/rest/MenuController.java index a60ff16e..202e7c94 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/system/rest/MenuController.java +++ b/yshop-system/src/main/java/co/yixiang/modules/system/rest/MenuController.java @@ -75,7 +75,7 @@ public class MenuController { @PostMapping(value = "/menus") @PreAuthorize("hasAnyRole('ADMIN','MENU_ALL','MENU_CREATE')") public ResponseEntity create(@Validated @RequestBody Menu resources){ - //if(StrUtil.isNotEmpty("22")) throw new BadRequestException("演示环境禁止操作"); + ////if(StrUtil.isNotEmpty("22")) throw new BadRequestException("演示环境禁止操作"); if (resources.getId() != null) { throw new BadRequestException("A new "+ ENTITY_NAME +" cannot already have an ID"); } diff --git a/yshop-system/src/main/java/co/yixiang/modules/system/service/dto/DeptDTO.java b/yshop-system/src/main/java/co/yixiang/modules/system/service/dto/DeptDTO.java index 4d408b52..c8ec82a4 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/system/service/dto/DeptDTO.java +++ b/yshop-system/src/main/java/co/yixiang/modules/system/service/dto/DeptDTO.java @@ -2,6 +2,8 @@ package co.yixiang.modules.system.service.dto; import com.fasterxml.jackson.annotation.JsonInclude; import lombok.Data; +import lombok.Getter; +import lombok.Setter; import javax.validation.constraints.NotNull; import java.sql.Timestamp; @@ -12,7 +14,9 @@ import java.util.List; * @author Zheng Jie * @date 2019-03-25 */ -@Data +//@Data +@Getter +@Setter public class DeptDTO implements Serializable { /** diff --git a/yshop-system/src/main/resources/config/application-dev.yml b/yshop-system/src/main/resources/config/application-dev.yml index 4e0c4856..bf800895 100644 --- a/yshop-system/src/main/resources/config/application-dev.yml +++ b/yshop-system/src/main/resources/config/application-dev.yml @@ -40,6 +40,7 @@ spring: hibernate: # 生产环境设置成 none，避免程序运行时自动更新数据库结构 ddl-auto: update + show-sql: true redis: #数据库索引