From f0e52430628fecacd449aaf3e7df9401f15d8a87 Mon Sep 17 00:00:00 2001 From: chendt <18902722133@163.com> Date: Wed, 10 Nov 2021 15:55:16 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8D=E7=A7=B0=E6=9B=BF=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 40 +- db/yami_shop.sql | 6 +- ...06\345\223\201\345\210\206\347\273\204.md" | 2 +- .../Swagger\346\226\207\346\241\243.md" | 6 +- mall4m/pages/basket/basket.js | 71 +-- mall4m/pages/binding-phone/binding-phone.js | 2 +- mall4m/pages/login/login.js | 4 +- mall4m/pages/order-detail/order-detail.wxml | 6 +- mall4m/pages/prod-classify/prod-classify.wxml | 4 +- mall4m/pages/prod-classify/prod-classify.wxss | 2 +- mall4m/pages/search-page/search-page.js | 2 +- mall4m/pages/user/user.wxml | 4 +- mall4uni/pages.json | 2 +- mall4uni/pages/basket/basket.vue | 4 +- .../delivery-address/delivery-address.vue | 5 +- mall4uni/pages/editAddress/editAddress.vue | 6 +- mall4uni/pages/news-detail/news-detail.css | 2 +- .../pages/prod-classify/prod-classify.css | 2 +- .../pages/prod-classify/prod-classify.vue | 4 +- .../search-prod-show/search-prod-show.css | 11 + .../search-prod-show/search-prod-show.vue | 3 +- mall4uni/pages/submit-order/submit-order.vue | 2 +- mall4v/README.md | 6 +- mall4v/src/components/file-upload/index.vue | 2 +- .../src/components/mul-pic-upload/index.vue | 6 + mall4v/src/components/pic-upload/index.vue | 7 +- mall4v/src/crud/user/user.js | 7 +- mall4v/src/views/modules/order/orderInfo.vue | 1 - mall4v/src/views/modules/prod/category.vue | 2 +- mall4v/src/views/modules/prod/prodInfo.vue | 1 + mall4v/src/views/modules/prod/sku-tag.vue | 547 ++++++++++++------ .../views/modules/prod/spec-add-or-update.vue | 9 +- .../modules/shop/hotSearch-add-or-update.vue | 22 +- mall4v/src/views/modules/shop/hotSearch.vue | 4 +- mall4v/src/views/modules/shop/pickAddr.vue | 4 +- .../modules/shop/transport-add-or-update.vue | 2 +- mall4v/src/views/modules/shop/transport.vue | 185 +++--- mall4v/src/views/modules/sys/role.vue | 2 +- mall4v/src/views/modules/user/user.vue | 20 +- mall4v/static/config/index-prod.js | 4 +- mall4v/static/config/index.js | 2 +- mall4v/static/config/init.js | 6 +- .../com/yami/shop/admin/WebApplication.java | 4 +- .../shop/admin/config/AdminBeanConfig.java | 4 +- .../yami/shop/admin/config/AdminConfig.java | 4 +- .../admin/config/SwaggerConfiguration.java | 12 +- .../shop/admin/controller/AreaController.java | 4 +- .../admin/controller/AttributeController.java | 4 +- .../admin/controller/BrandController.java | 4 +- .../admin/controller/CategoryController.java | 4 +- .../admin/controller/DeliveryController.java | 4 +- .../shop/admin/controller/FileController.java | 4 +- .../admin/controller/HotSearchController.java | 5 +- .../admin/controller/IndexImgController.java | 4 +- .../admin/controller/MessageController.java | 4 +- .../admin/controller/NoticeController.java | 6 +- .../admin/controller/OrderController.java | 4 +- .../admin/controller/PickAddrController.java | 5 +- .../admin/controller/ProdCommController.java | 4 +- .../admin/controller/ProdTagController.java | 4 +- .../ProdTagReferenceController.java | 4 +- .../admin/controller/ProductController.java | 4 +- .../controller/ShopDetailController.java | 4 +- .../shop/admin/controller/SpecController.java | 15 +- .../admin/controller/TransportController.java | 4 +- .../admin/controller/UserAddrController.java | 4 +- .../shop/admin/controller/UserController.java | 4 +- .../security/AdminAuthenticationToken.java | 4 +- .../security/LoginAuthenticationFilter.java | 4 +- .../security/ResourceServerConfiguration.java | 4 +- .../YamiSysUserDetailsServiceImpl.java | 20 +- .../com/yami/shop/admin/task/OrderTask.java | 4 +- .../com/yami/shop/admin/task/TestTask.java | 4 +- .../com/yami/shop/api/ApiApplication.java | 4 +- .../yami/shop/api/config/ApiBeanConfig.java | 4 +- .../com/yami/shop/api/config/ApiConfig.java | 4 +- .../shop/api/config/SwaggerConfiguration.java | 12 +- .../shop/api/controller/AddrController.java | 4 +- .../shop/api/controller/AreaController.java | 4 +- .../api/controller/CategoryController.java | 4 +- .../api/controller/DeliveryController.java | 4 +- .../api/controller/IndexImgController.java | 4 +- .../api/controller/MyOrderController.java | 4 +- .../shop/api/controller/NoticeController.java | 4 +- .../shop/api/controller/OrderController.java | 4 +- .../shop/api/controller/PayController.java | 7 +- .../api/controller/PayNoticeController.java | 4 +- .../api/controller/ProdCommController.java | 8 +- .../shop/api/controller/ProdController.java | 4 +- .../api/controller/ProdTagController.java | 4 +- .../shop/api/controller/SearchController.java | 4 +- .../api/controller/ShopCartController.java | 4 +- .../shop/api/controller/SkuController.java | 4 +- .../shop/api/controller/SmsController.java | 4 +- .../controller/UserCollectionController.java | 4 +- .../shop/api/controller/UserController.java | 4 +- .../controller/UserRegisterController.java | 164 +++++- .../api/listener/ConfirmOrderListener.java | 4 +- .../shop/api/listener/ShopCartListener.java | 4 +- .../api/listener/SubmitOrderListener.java | 4 +- .../api/security/AuthenticationToken.java | 4 +- .../security/LoginAuthenticationFilter.java | 4 +- .../security/MiniAppAuthenticationToken.java | 4 +- .../security/ResourceServerConfiguration.java | 4 +- .../api/security/WebAuthenticationToken.java | 4 +- .../WebLoginAuthenticationFilter.java | 18 +- .../YamiAuthenticationProcessingFilter.java | 2 +- .../api/security/YamiUserServiceImpl.java | 37 +- .../com/yami/shop/bean/SmsInfoContext.java | 4 +- .../yami/shop/bean/app/dto/BasketItemDto.java | 4 +- .../yami/shop/bean/app/dto/CategoryDto.java | 4 +- .../bean/app/dto/ChooseDiscountItemDto.java | 4 +- .../shop/bean/app/dto/CouponOrderDto.java | 4 +- .../yami/shop/bean/app/dto/DeliveryDto.java | 4 +- .../shop/bean/app/dto/DeliveryInfoDto.java | 4 +- .../yami/shop/bean/app/dto/DiscountDto.java | 4 +- .../yami/shop/bean/app/dto/IndexImgDto.java | 4 +- .../yami/shop/bean/app/dto/MyOrderDto.java | 4 +- .../shop/bean/app/dto/MyOrderItemDto.java | 4 +- .../com/yami/shop/bean/app/dto/NoticeDto.java | 4 +- .../shop/bean/app/dto/OrderCountData.java | 4 +- .../yami/shop/bean/app/dto/OrderItemDto.java | 4 +- .../shop/bean/app/dto/OrderNumbersDto.java | 4 +- .../yami/shop/bean/app/dto/OrderShopDto.java | 4 +- .../shop/bean/app/dto/ProdCommDataDto.java | 4 +- .../yami/shop/bean/app/dto/ProdCommDto.java | 4 +- .../yami/shop/bean/app/dto/ProdTagDto.java | 4 +- .../yami/shop/bean/app/dto/ProductDto.java | 4 +- .../shop/bean/app/dto/ProductItemDto.java | 4 +- .../shop/bean/app/dto/ShopCartAmountDto.java | 4 +- .../yami/shop/bean/app/dto/ShopCartDto.java | 4 +- .../bean/app/dto/ShopCartExpiryItemDto.java | 4 +- .../bean/app/dto/ShopCartItemDiscountDto.java | 4 +- .../shop/bean/app/dto/ShopCartItemDto.java | 4 +- .../shop/bean/app/dto/ShopCartOrderDto.java | 4 +- .../bean/app/dto/ShopCartOrderMergerDto.java | 4 +- .../com/yami/shop/bean/app/dto/SkuDto.java | 4 +- .../yami/shop/bean/app/dto/TagProductDto.java | 4 +- .../yami/shop/bean/app/dto/UserAddrDto.java | 4 +- .../shop/bean/app/dto/UserCollectionDto.java | 4 +- .../com/yami/shop/bean/app/dto/UserDto.java | 4 +- .../yami/shop/bean/app/param/AddrParam.java | 4 +- .../bean/app/param/ChangeShopCartParam.java | 4 +- .../yami/shop/bean/app/param/LoginParam.java | 4 +- .../shop/bean/app/param/OrderItemParam.java | 4 +- .../yami/shop/bean/app/param/OrderParam.java | 4 +- .../shop/bean/app/param/OrderShopParam.java | 4 +- .../yami/shop/bean/app/param/PayParam.java | 4 +- .../shop/bean/app/param/ProdCommParam.java | 4 +- .../shop/bean/app/param/SendSmsParam.java | 4 +- .../shop/bean/app/param/ShopCartParam.java | 4 +- .../shop/bean/app/param/ShopCartParams.java | 4 +- .../shop/bean/app/param/SubmitOrderParam.java | 4 +- .../shop/bean/app/param/UserInfoParam.java | 4 +- .../java/com/yami/shop/bean/bo/SmsInfoBo.java | 4 +- .../distribution/UserShoppingDataDto.java | 4 +- .../com/yami/shop/bean/dto/HotSearchDto.java | 4 +- .../com/yami/shop/bean/dto/ProductDto.java | 4 +- .../com/yami/shop/bean/dto/SearchProdDto.java | 4 +- .../yami/shop/bean/dto/TinymceEditorDto.java | 4 +- .../yami/shop/bean/enums/MessageStatus.java | 4 +- .../com/yami/shop/bean/enums/OrderEntry.java | 4 +- .../com/yami/shop/bean/enums/OrderStatus.java | 4 +- .../com/yami/shop/bean/enums/PayType.java | 4 +- .../yami/shop/bean/enums/ProdPropRule.java | 4 +- .../com/yami/shop/bean/enums/SmsType.java | 4 +- .../shop/bean/enums/TransportChargeType.java | 4 +- .../shop/bean/event/CancelOrderEvent.java | 4 +- .../shop/bean/event/ConfirmOrderEvent.java | 4 +- .../shop/bean/event/PaySuccessOrderEvent.java | 4 +- .../shop/bean/event/ReceiptOrderEvent.java | 4 +- .../yami/shop/bean/event/ShopCartEvent.java | 4 +- .../shop/bean/event/SubmitOrderEvent.java | 4 +- .../java/com/yami/shop/bean/model/Area.java | 4 +- .../com/yami/shop/bean/model/AttachFile.java | 4 +- .../java/com/yami/shop/bean/model/Basket.java | 4 +- .../java/com/yami/shop/bean/model/Brand.java | 4 +- .../com/yami/shop/bean/model/Category.java | 4 +- .../yami/shop/bean/model/CategoryBrand.java | 4 +- .../yami/shop/bean/model/CategoryProp.java | 4 +- .../com/yami/shop/bean/model/Delivery.java | 4 +- .../com/yami/shop/bean/model/HotSearch.java | 4 +- .../com/yami/shop/bean/model/IndexImg.java | 4 +- .../com/yami/shop/bean/model/LoginHist.java | 4 +- .../com/yami/shop/bean/model/Message.java | 4 +- .../java/com/yami/shop/bean/model/Notice.java | 4 +- .../java/com/yami/shop/bean/model/Order.java | 4 +- .../com/yami/shop/bean/model/OrderItem.java | 4 +- .../com/yami/shop/bean/model/OrderRefund.java | 4 +- .../yami/shop/bean/model/OrderSettlement.java | 4 +- .../com/yami/shop/bean/model/PickAddr.java | 4 +- .../com/yami/shop/bean/model/ProdComm.java | 4 +- .../com/yami/shop/bean/model/ProdImg.java | 4 +- .../com/yami/shop/bean/model/ProdProp.java | 4 +- .../yami/shop/bean/model/ProdPropValue.java | 4 +- .../com/yami/shop/bean/model/ProdTag.java | 4 +- .../shop/bean/model/ProdTagReference.java | 4 +- .../com/yami/shop/bean/model/Product.java | 4 +- .../com/yami/shop/bean/model/ShopDetail.java | 4 +- .../java/com/yami/shop/bean/model/Sku.java | 4 +- .../java/com/yami/shop/bean/model/SmsLog.java | 4 +- .../com/yami/shop/bean/model/Transcity.java | 4 +- .../yami/shop/bean/model/TranscityFree.java | 4 +- .../com/yami/shop/bean/model/Transfee.java | 4 +- .../yami/shop/bean/model/TransfeeFree.java | 4 +- .../com/yami/shop/bean/model/Transport.java | 4 +- .../java/com/yami/shop/bean/model/User.java | 4 +- .../com/yami/shop/bean/model/UserAddr.java | 4 +- .../yami/shop/bean/model/UserAddrOrder.java | 4 +- .../yami/shop/bean/model/UserCollection.java | 4 +- .../shop/bean/order/ConfirmOrderOrder.java | 4 +- .../shop/bean/order/ShopCartEventOrder.java | 4 +- .../shop/bean/order/SubmitOrderOrder.java | 4 +- .../shop/bean/param/DeliveryOrderParam.java | 4 +- .../com/yami/shop/bean/param/OrderParam.java | 4 +- .../yami/shop/bean/param/ProductParam.java | 4 +- .../yami/shop/bean/param/ShopDetailParam.java | 4 +- .../shop/bean/param/UserRegisterParam.java | 28 +- .../com/yami/shop/bean/pay/PayInfoDto.java | 4 +- .../java/com/yami/shop/bean/vo/SysUserVO.java | 4 +- .../java/com/yami/shop/bean/vo/UserVO.java | 4 +- .../shop/common/annotation/RedisLock.java | 4 +- .../yami/shop/common/annotation/SysLog.java | 4 +- .../shop/common/aspect/RedisLockAspect.java | 4 +- .../com/yami/shop/common/bean/ALiDaYu.java | 4 +- .../java/com/yami/shop/common/bean/Qiniu.java | 4 +- .../config/DefaultExceptionHandlerConfig.java | 4 +- .../shop/common/config/FileUploadConfig.java | 4 +- .../shop/common/config/MybatisPlusConfig.java | 4 +- .../yami/shop/common/config/OrikaConfig.java | 4 +- .../shop/common/config/RedisCacheConfig.java | 4 +- .../shop/common/config/ShopBasicConfig.java | 4 +- .../shop/common/config/ShopBeanConfig.java | 4 +- .../shop/common/enums/YamiHttpStatus.java | 4 +- .../exception/YamiShopBindException.java | 4 +- .../yami/shop/common/filter/FilterConfig.java | 4 +- .../yami/shop/common/filter/XssFilter.java | 4 +- .../shop/common/response/ResponseCode.java | 4 +- .../shop/common/response/ServerResponse.java | 4 +- .../common/response/ServerResponseEntity.java | 4 +- .../shop/common/serializer/FSTSerializer.java | 4 +- .../serializer/json/EmojiJsonSerializer.java | 4 +- .../serializer/json/ImgJsonSerializer.java | 4 +- .../serializer/redis/FstRedisSerializer.java | 4 +- .../common/serializer/redisson/FstCodec.java | 4 +- .../SpringFoxJsonSerializerConfig.java | 4 +- .../springfox/SpringfoxJsonSerializer.java | 4 +- .../java/com/yami/shop/common/util/Arith.java | 4 +- .../shop/common/util/CacheManagerUtil.java | 4 +- .../shop/common/util/HttpContextUtils.java | 4 +- .../com/yami/shop/common/util/IPHelper.java | 4 +- .../com/yami/shop/common/util/IdUtil.java | 4 +- .../java/com/yami/shop/common/util/Json.java | 4 +- .../yami/shop/common/util/PageAdapter.java | 4 +- .../com/yami/shop/common/util/PageParam.java | 4 +- .../com/yami/shop/common/util/RedisUtil.java | 4 +- .../yami/shop/common/util/SimpleCaptcha.java | 4 +- .../com/yami/shop/common/util/SpelUtil.java | 4 +- .../shop/common/util/SpringContextUtils.java | 4 +- .../com/yami/shop/common/xss/XssUtil.java | 4 +- .../com/yami/shop/common/xss/XssWrapper.java | 4 +- .../src/main/resources/shop.properties | 2 +- .../yami/shop/mp/builder/AbstractBuilder.java | 4 +- .../yami/shop/mp/builder/ImageBuilder.java | 4 +- .../com/yami/shop/mp/builder/TextBuilder.java | 4 +- .../shop/mp/component/WxMaInRedisConfig.java | 4 +- .../component/WxMpInRedisConfigStorage.java | 4 +- .../shop/mp/config/WxMaConfiguration.java | 4 +- .../shop/mp/config/WxMpConfiguration.java | 4 +- .../shop/mp/config/WxPayConfiguration.java | 4 +- .../yami/shop/mp/config/bean/WxMiniApp.java | 4 +- .../com/yami/shop/mp/config/bean/WxMp.java | 4 +- .../com/yami/shop/mp/config/bean/WxPay.java | 4 +- .../mp/controller/api/WxPortalController.java | 4 +- .../yami/shop/mp/handler/AbstractHandler.java | 4 +- .../com/yami/shop/mp/handler/MenuHandler.java | 4 +- .../quartz/config/QuartzCustomizerConfig.java | 4 +- .../yami/shop/quartz/config/QuartzJob.java | 4 +- .../shop/quartz/config/ScheduleManager.java | 4 +- .../controller/ScheduleJobController.java | 4 +- .../controller/ScheduleJobLogController.java | 4 +- .../shop/quartz/dao/ScheduleJobLogMapper.java | 4 +- .../shop/quartz/dao/ScheduleJobMapper.java | 4 +- .../shop/quartz/enums/ScheduleStatus.java | 4 +- .../shop/quartz/event/ScheduleJobEvent.java | 4 +- .../shop/quartz/listener/SysJobListener.java | 4 +- .../yami/shop/quartz/model/ScheduleJob.java | 4 +- .../shop/quartz/model/ScheduleJobLog.java | 4 +- .../quartz/service/ScheduleJobLogService.java | 4 +- .../quartz/service/ScheduleJobService.java | 4 +- .../impl/ScheduleJobLogServiceImpl.java | 4 +- .../service/impl/ScheduleJobServiceImpl.java | 4 +- .../shop/quartz/util/SpringBeanTaskUtil.java | 4 +- yami-shop-security/pom.xml | 2 +- .../config/AuthorizationServerConfig.java | 4 +- .../security/config/WebSecurityConfig.java | 4 +- .../security/constants/SecurityConstants.java | 4 +- .../controller/SysLoginController.java | 4 +- .../shop/security/dao/AppConnectMapper.java | 4 +- .../com/yami/shop/security/enums/App.java | 4 +- .../exception/BadCredentialsException.java | 4 +- .../BadCredentialsExceptionBase.java | 4 +- .../exception/BaseYamiAuth2Exception.java | 4 +- .../exception/ImageCodeNotMatchException.java | 4 +- .../ImageCodeNotMatchExceptionBase.java | 4 +- .../exception/UnauthorizedException.java | 4 +- .../exception/UnauthorizedExceptionBase.java | 4 +- .../exception/UnknownGrantTypeException.java | 4 +- .../UnknownGrantTypeExceptionBase.java | 4 +- .../exception/UsernameNotFoundException.java | 6 +- .../UsernameNotFoundExceptionBase.java | 4 +- .../security/exception/WxErrorException.java | 4 +- .../exception/WxErrorExceptionBase.java | 4 +- .../exception/YamiAuth2Exception.java | 4 +- .../handler/LoginAuthFailedHandler.java | 8 +- .../handler/LoginAuthSuccessHandler.java | 4 +- .../yami/shop/security/model/AppConnect.java | 4 +- .../permission/PermissionService.java | 4 +- ...ractUserDetailsAuthenticationProvider.java | 4 +- .../provider/MpAuthenticationProvider.java | 4 +- .../security/service/AppConnectService.java | 8 +- .../service/YamiClientDetailsService.java | 4 +- .../shop/security/service/YamiSysUser.java | 4 +- .../yami/shop/security/service/YamiUser.java | 84 ++- .../service/YamiUserDetailsService.java | 9 +- .../service/impl/AppConnectServiceImpl.java | 62 +- .../security/token/MpAuthenticationToken.java | 4 +- .../security/token/MyAuthenticationToken.java | 4 +- .../shop/security/util/SecurityUtils.java | 4 +- .../shop/security/util/YamiTokenServices.java | 4 +- .../java/com/yami/shop/dao/AreaMapper.java | 4 +- .../com/yami/shop/dao/AttachFileMapper.java | 4 +- .../java/com/yami/shop/dao/BasketMapper.java | 4 +- .../java/com/yami/shop/dao/BrandMapper.java | 4 +- .../yami/shop/dao/CategoryBrandMapper.java | 4 +- .../com/yami/shop/dao/CategoryMapper.java | 4 +- .../com/yami/shop/dao/CategoryPropMapper.java | 4 +- .../com/yami/shop/dao/DeliveryMapper.java | 4 +- .../com/yami/shop/dao/HotSearchMapper.java | 4 +- .../com/yami/shop/dao/IndexImgMapper.java | 4 +- .../com/yami/shop/dao/LoginHistMapper.java | 4 +- .../java/com/yami/shop/dao/MessageMapper.java | 4 +- .../java/com/yami/shop/dao/NoticeMapper.java | 4 +- .../com/yami/shop/dao/OrderItemMapper.java | 4 +- .../java/com/yami/shop/dao/OrderMapper.java | 4 +- .../com/yami/shop/dao/OrderRefundMapper.java | 4 +- .../yami/shop/dao/OrderSettlementMapper.java | 4 +- .../com/yami/shop/dao/PickAddrMapper.java | 4 +- .../com/yami/shop/dao/ProdCommMapper.java | 10 +- .../java/com/yami/shop/dao/ProdImgMapper.java | 4 +- .../com/yami/shop/dao/ProdPropMapper.java | 4 +- .../yami/shop/dao/ProdPropValueMapper.java | 4 +- .../java/com/yami/shop/dao/ProdTagMapper.java | 4 +- .../yami/shop/dao/ProdTagReferenceMapper.java | 4 +- .../java/com/yami/shop/dao/ProductMapper.java | 4 +- .../com/yami/shop/dao/ShopDetailMapper.java | 4 +- .../java/com/yami/shop/dao/SkuMapper.java | 4 +- .../java/com/yami/shop/dao/SmsLogMapper.java | 4 +- .../yami/shop/dao/TranscityFreeMapper.java | 4 +- .../com/yami/shop/dao/TranscityMapper.java | 4 +- .../com/yami/shop/dao/TransfeeFreeMapper.java | 4 +- .../com/yami/shop/dao/TransfeeMapper.java | 4 +- .../com/yami/shop/dao/TransportMapper.java | 4 +- .../com/yami/shop/dao/UserAddrMapper.java | 4 +- .../yami/shop/dao/UserAddrOrderMapper.java | 4 +- .../yami/shop/dao/UserCollectionMapper.java | 4 +- .../java/com/yami/shop/dao/UserMapper.java | 4 +- .../com/yami/shop/service/AreaService.java | 4 +- .../yami/shop/service/AttachFileService.java | 4 +- .../com/yami/shop/service/BasketService.java | 4 +- .../com/yami/shop/service/BrandService.java | 4 +- .../shop/service/CategoryBrandService.java | 4 +- .../shop/service/CategoryPropService.java | 4 +- .../yami/shop/service/CategoryService.java | 4 +- .../yami/shop/service/DeliveryService.java | 4 +- .../yami/shop/service/HotSearchService.java | 4 +- .../yami/shop/service/IndexImgService.java | 4 +- .../com/yami/shop/service/MessageService.java | 4 +- .../com/yami/shop/service/MyOrderService.java | 4 +- .../com/yami/shop/service/NoticeService.java | 4 +- .../yami/shop/service/OrderItemService.java | 4 +- .../com/yami/shop/service/OrderService.java | 4 +- .../shop/service/OrderSettlementService.java | 4 +- .../com/yami/shop/service/PayService.java | 4 +- .../yami/shop/service/PickAddrService.java | 4 +- .../yami/shop/service/ProdCommService.java | 8 +- .../yami/shop/service/ProdPropService.java | 4 +- .../shop/service/ProdPropValueService.java | 4 +- .../shop/service/ProdTagReferenceService.java | 4 +- .../com/yami/shop/service/ProdTagService.java | 4 +- .../com/yami/shop/service/ProductService.java | 4 +- .../yami/shop/service/ShopDetailService.java | 4 +- .../com/yami/shop/service/SkuService.java | 4 +- .../com/yami/shop/service/SmsLogService.java | 4 +- .../shop/service/TranscityFreeService.java | 4 +- .../yami/shop/service/TranscityService.java | 4 +- .../shop/service/TransfeeFreeService.java | 4 +- .../yami/shop/service/TransfeeService.java | 4 +- .../shop/service/TransportManagerService.java | 4 +- .../yami/shop/service/TransportService.java | 4 +- .../shop/service/UserAddrOrderService.java | 4 +- .../yami/shop/service/UserAddrService.java | 4 +- .../shop/service/UserCollectionService.java | 4 +- .../com/yami/shop/service/UserService.java | 6 +- .../shop/service/impl/AreaServiceImpl.java | 4 +- .../service/impl/AttachFileServiceImpl.java | 4 +- .../shop/service/impl/BasketServiceImpl.java | 4 +- .../shop/service/impl/BrandServiceImpl.java | 4 +- .../impl/CategoryBrandServiceImpl.java | 4 +- .../service/impl/CategoryPropServiceImpl.java | 4 +- .../service/impl/CategoryServiceImpl.java | 4 +- .../service/impl/DeliveryServiceImpl.java | 4 +- .../service/impl/HotSearchServiceImpl.java | 4 +- .../service/impl/IndexImgServiceImpl.java | 4 +- .../shop/service/impl/MessageServiceImpl.java | 4 +- .../shop/service/impl/MyOrderServiceImpl.java | 4 +- .../shop/service/impl/NoticeServiceImpl.java | 4 +- .../service/impl/OrderItemServiceImpl.java | 4 +- .../shop/service/impl/OrderServiceImpl.java | 4 +- .../impl/OrderSettlementServiceImpl.java | 4 +- .../shop/service/impl/PayServiceImpl.java | 4 +- .../service/impl/PickAddrServiceImpl.java | 4 +- .../service/impl/ProdCommServiceImpl.java | 12 +- .../service/impl/ProdPropServiceImpl.java | 4 +- .../impl/ProdPropValueServiceImpl.java | 4 +- .../impl/ProdTagReferenceServiceImpl.java | 4 +- .../shop/service/impl/ProdTagServiceImpl.java | 4 +- .../shop/service/impl/ProductServiceImpl.java | 4 +- .../service/impl/ShopDetailServiceImpl.java | 4 +- .../shop/service/impl/SkuServiceImpl.java | 4 +- .../shop/service/impl/SmsLogServiceImpl.java | 4 +- .../impl/TranscityFreeServiceImpl.java | 4 +- .../service/impl/TranscityServiceImpl.java | 4 +- .../service/impl/TransfeeFreeServiceImpl.java | 4 +- .../service/impl/TransfeeServiceImpl.java | 4 +- .../impl/TransportManagerServiceImpl.java | 4 +- .../service/impl/TransportServiceImpl.java | 4 +- .../impl/UserAddrOrderServiceImpl.java | 4 +- .../service/impl/UserAddrServiceImpl.java | 4 +- .../impl/UserCollectionServiceImpl.java | 4 +- .../shop/service/impl/UserServiceImpl.java | 28 +- .../main/resources/mapper/IndexImgMapper.xml | 1 + .../main/resources/mapper/ProdCommMapper.xml | 8 +- .../yami/shop/sys/aspect/SysLogAspect.java | 4 +- .../com/yami/shop/sys/constant/Constant.java | 4 +- .../sys/controller/SysConfigController.java | 4 +- .../shop/sys/controller/SysLogController.java | 4 +- .../sys/controller/SysMenuController.java | 4 +- .../sys/controller/SysRoleController.java | 4 +- .../sys/controller/SysUserController.java | 20 +- .../yami/shop/sys/dao/SysConfigMapper.java | 4 +- .../com/yami/shop/sys/dao/SysLogMapper.java | 4 +- .../com/yami/shop/sys/dao/SysMenuMapper.java | 4 +- .../com/yami/shop/sys/dao/SysRoleMapper.java | 4 +- .../yami/shop/sys/dao/SysRoleMenuMapper.java | 4 +- .../com/yami/shop/sys/dao/SysUserMapper.java | 4 +- .../yami/shop/sys/dao/SysUserRoleMapper.java | 4 +- .../yami/shop/sys/dto/UpdatePasswordDto.java | 4 +- .../com/yami/shop/sys/model/SysConfig.java | 4 +- .../java/com/yami/shop/sys/model/SysLog.java | 4 +- .../java/com/yami/shop/sys/model/SysMenu.java | 4 +- .../java/com/yami/shop/sys/model/SysRole.java | 4 +- .../com/yami/shop/sys/model/SysRoleMenu.java | 4 +- .../java/com/yami/shop/sys/model/SysUser.java | 4 +- .../com/yami/shop/sys/model/SysUserRole.java | 4 +- .../shop/sys/service/SysConfigService.java | 4 +- .../yami/shop/sys/service/SysLogService.java | 4 +- .../yami/shop/sys/service/SysMenuService.java | 4 +- .../yami/shop/sys/service/SysRoleService.java | 4 +- .../yami/shop/sys/service/SysUserService.java | 4 +- .../service/impl/SysConfigServiceImpl.java | 4 +- .../sys/service/impl/SysLogServiceImpl.java | 4 +- .../sys/service/impl/SysMenuServiceImpl.java | 4 +- .../sys/service/impl/SysRoleServiceImpl.java | 4 +- .../sys/service/impl/SysUserServiceImpl.java | 4 +- 475 files changed, 1941 insertions(+), 1313 deletions(-) diff --git a/README.md b/README.md index ca27d62d..3b0d968c 100644 --- a/README.md +++ b/README.md @@ -31,21 +31,19 @@ vue后台前端：https://gitee.com/gz-yami/mall4v 小程序：https://gitee.com/gz-yami/mall4m -uniapp端：https://gitee.com/gz-yami/mall4uni - +uni-app：https://gitee.com/gz-yami/mall4uni ## 演示地址 **由于我们并不希望小程序的数据被弄混乱，我们弄了两个数据库。因此，您修改了后台的商品信息，小程序并不能看到！** -后台： 账号：admin/123456 +后台： 账号：admin/123456 -小程序：1. 扫描二维码 +小程序：扫描二维码 ![小程序](https://gitee.com/gz-yami/mall4j/raw/master/screenshot/miniQrcode.jpg) -​ 2. 搜索小程序 **亚米商城** ## 技术选型 @@ -81,44 +79,38 @@ https://gitee.com/gz-yami/mall4j/wikis ### 1. 后台截图 +![输入图片说明](https://images.gitee.com/uploads/images/2021/1110/143738_88a8a1e6_5094767.gif "后台.gif") -![登陆](https://gitee.com/gz-yami/mall4j/raw/master/screenshot/login.png) - -![订单](https://gitee.com/gz-yami/mall4j/raw/master/screenshot/order.png) - -![商品列表](https://gitee.com/gz-yami/mall4j/raw/master/screenshot/prodList.png) - -![sku](https://gitee.com/gz-yami/mall4j/raw/master/screenshot/sku.png) -![运费模板](https://gitee.com/gz-yami/mall4j/raw/master/screenshot/transport.png) +### 2. 移动端截图 -### 2. 小程序截图 +![输入图片说明](https://images.gitee.com/uploads/images/2021/1110/145209_2ec1ad04_5094767.png "开源移动端截图.png") -![小程序截图](https://images.gitee.com/uploads/images/2019/0706/085234_4eb7509b_5094767.jpeg "小程序截图") +### 3. 软著截图 +![输入图片说明](https://images.gitee.com/uploads/images/2021/0703/110940_a9b72c43_5094767.png "Mall4j商城系统V1.0.png") -### 3. uni-app截图 -![uni-app模板](https://gitee.com/gz-yami/mall4j/raw/master/screenshot/uniappInfo.png) +## 提交反馈 +- Mall4j官网 https://www.mall4j.com +- mall4j开源技术QQ群：722835385 -## 提交反馈 +![输入图片说明](https://images.gitee.com/uploads/images/2021/0703/110919_835cf484_5094767.jpeg "mall4j群.jpg") -- QQ群：722835385 - ![输入图片说明](https://images.gitee.com/uploads/images/2019/0723/094927_e686539d_5094767.jpeg "微信图片_20190723091006.jpg") +## 特别鸣谢 +- wxjava:https://github.com/Wechat-Group/WxJava -## 后续会加入微服务框架、分布式版本 +## mall4cloud微服务版本已上线 +https://gitee.com/gz-yami/mall4cloud ## 你的点赞鼓励，是我们前进的动力~ ## 你的点赞鼓励，是我们前进的动力~ ## 你的点赞鼓励，是我们前进的动力~ - - -![软著截图](https://images.gitee.com/uploads/images/2020/0515/200917_995e6632_1613814.png "软著.png") diff --git a/db/yami_shop.sql b/db/yami_shop.sql index 90bd467b..7f3a4a38 100644 --- a/db/yami_shop.sql +++ b/db/yami_shop.sql @@ -4787,9 +4787,9 @@ CREATE TABLE `tz_shop_detail` ( /*Data for the table `tz_shop_detail` */ insert into `tz_shop_detail`(`shop_id`,`shop_name`,`user_id`,`shop_type`,`intro`,`shop_notice`,`shop_industry`,`shop_owner`,`mobile`,`tel`,`shop_lat`,`shop_lng`,`shop_address`,`province`,`city`,`area`,`pca_code`,`shop_logo`,`shop_photos`,`open_time`,`shop_status`,`transport_type`,`fixed_freight`,`full_free_shipping`,`create_time`,`update_time`,`is_distribution`) values -(1,'亚米小店1',NULL,NULL,'亚米小店 爱你哟',NULL,NULL,NULL,NULL,'020-123456',NULL,NULL,'大学城北','广东省','广州市','番禺区','44/4401/440113','2018/08/78a6a63cf02d4965912bc5047f49afa0.jpg','2018/08/c7a50f443a85462d8129d83cf0f7eb91.jpg,2018/08/79791fc749444ef1ab4d2ca56fe9363f.jpg','00:00:00 - 00:20:00',1,NULL,NULL,NULL,'2018-08-30 11:10:05',NULL,1), -(2,'亚米大店2',NULL,NULL,'亚米大店 店大大',NULL,NULL,NULL,NULL,'010-123456',NULL,NULL,'天安门哟','北京市','市辖区','东城区','11/1101/110101','2018/08/0907446e05c44431be5d27ec7c277ee6.jpg','2018/08/5f97fc62c18d4d2292f8101fa0291e85.jpg','06:00:00 - 00:00:00',1,NULL,NULL,NULL,'2018-08-31 10:16:06',NULL,NULL), -(3,'亚米3',NULL,NULL,'亚米 店铺描述',NULL,NULL,NULL,NULL,'010-211111111',NULL,NULL,'大学城北','天津市','市辖区','和平区','12/1201/120101','2018/09/4bb8b326f85a4c6aad251c561a17f0c4.png','2018/09/63c3d47beb5544f9b30103721002ca2e.jpg,2018/09/899e1ebf3c6c467d8d8630a3c18720db.jpg','00:02:00 - 00:00:00',1,NULL,NULL,NULL,'2018-09-06 18:50:00','2018-09-29 09:50:05',NULL); +(1,'mall4j小店1',NULL,NULL,'mall4j小店 爱你哟',NULL,NULL,NULL,NULL,'020-123456',NULL,NULL,'大学城北','广东省','广州市','番禺区','44/4401/440113','2018/08/78a6a63cf02d4965912bc5047f49afa0.jpg','2018/08/c7a50f443a85462d8129d83cf0f7eb91.jpg,2018/08/79791fc749444ef1ab4d2ca56fe9363f.jpg','00:00:00 - 00:20:00',1,NULL,NULL,NULL,'2018-08-30 11:10:05',NULL,1), +(2,'mall4j大店2',NULL,NULL,'mall4j大店 店大大',NULL,NULL,NULL,NULL,'010-123456',NULL,NULL,'天安门哟','北京市','市辖区','东城区','11/1101/110101','2018/08/0907446e05c44431be5d27ec7c277ee6.jpg','2018/08/5f97fc62c18d4d2292f8101fa0291e85.jpg','06:00:00 - 00:00:00',1,NULL,NULL,NULL,'2018-08-31 10:16:06',NULL,NULL), +(3,'mall4j3',NULL,NULL,'mall4j 店铺描述',NULL,NULL,NULL,NULL,'010-211111111',NULL,NULL,'大学城北','天津市','市辖区','和平区','12/1201/120101','2018/09/4bb8b326f85a4c6aad251c561a17f0c4.png','2018/09/63c3d47beb5544f9b30103721002ca2e.jpg,2018/09/899e1ebf3c6c467d8d8630a3c18720db.jpg','00:02:00 - 00:00:00',1,NULL,NULL,NULL,'2018-09-06 18:50:00','2018-09-29 09:50:05',NULL); /*Table structure for table `tz_sku` */ diff --git "a/doc/\345\225\206\345\237\216\350\241\250\350\256\276\350\256\241/\345\225\206\345\223\201\345\210\206\347\273\204.md" "b/doc/\345\225\206\345\237\216\350\241\250\350\256\276\350\256\241/\345\225\206\345\223\201\345\210\206\347\273\204.md" index 3ef4c104..5d12fbac 100644 --- "a/doc/\345\225\206\345\237\216\350\241\250\350\256\276\350\256\241/\345\225\206\345\223\201\345\210\206\347\273\204.md" +++ "b/doc/\345\225\206\345\237\216\350\241\250\350\256\276\350\256\241/\345\225\206\345\223\201\345\210\206\347\273\204.md" @@ -2,7 +2,7 @@ #### 商城应用 -在亚米精选商城首页中，可以看到有`每日上新`、`商城热卖`、`更多商品`等标签栏，在每一栏位中用来展示特定的商品列表，如下图：。 +在mall4j精选商城首页中，可以看到有`每日上新`、`商城热卖`、`更多商品`等标签栏，在每一栏位中用来展示特定的商品列表，如下图：。 ![1566266497255](.\img\小程序-分组商品.png) diff --git "a/doc/\345\237\272\346\234\254\346\241\206\346\236\266\350\256\276\350\256\241/Swagger\346\226\207\346\241\243.md" "b/doc/\345\237\272\346\234\254\346\241\206\346\236\266\350\256\276\350\256\241/Swagger\346\226\207\346\241\243.md" index d48513c3..5795a0b1 100644 --- "a/doc/\345\237\272\346\234\254\346\241\206\346\236\266\350\256\276\350\256\241/Swagger\346\226\207\346\241\243.md" +++ "b/doc/\345\237\272\346\234\254\346\241\206\346\236\266\350\256\276\350\256\241/Swagger\346\226\207\346\241\243.md" @@ -50,10 +50,10 @@ public class SwaggerConfiguration { @Bean public ApiInfo apiInfo() { return new ApiInfoBuilder() - .title("亚米商城接口文档") - .description("亚米商城接口文档Swagger版") + .title("mall4j商城接口文档") + .description("mall4j商城接口文档Swagger版") .termsOfServiceUrl("http://www.gz-yami.com/") - .contact(new Contact("广州亚米信息科技有限公司","https://www.gz-yami.com/", "")) + .contact(new Contact("广州市蓝海创新科技有限公司","https://www.mall4j.com/", "")) .version("1.0") .build(); } diff --git a/mall4m/pages/basket/basket.js b/mall4m/pages/basket/basket.js index 62e4c2c1..7400dc69 100644 --- a/mall4m/pages/basket/basket.js +++ b/mall4m/pages/basket/basket.js @@ -14,7 +14,7 @@ Page({ finalMoney: 0, totalMoney: 0, subtractMoney: 0, - allChecked: true + allChecked: false }, /** @@ -35,41 +35,42 @@ Page({ * 生命周期函数--监听页面显示 */ onShow: function () { - wx.showLoading(); - //加载购物车 - var params = { - url: "/p/shopCart/info", - method: "POST", - data: {}, - callBack: res => { - if (res.length > 0) { - // 默认全选 - var shopCartItemDiscounts = res[0].shopCartItemDiscounts; - shopCartItemDiscounts.forEach(shopCartItemDiscount => { - shopCartItemDiscount.shopCartItems.forEach(shopCartItem => { - shopCartItem.checked = true; - }) - }) - - this.setData({ - shopCartItemDiscounts: shopCartItemDiscounts, - allChecked: true - }); - - } else { - this.setData({ - shopCartItemDiscounts: [], - }); - } - this.calTotalPrice();//计算总价 - wx.hideLoading(); - } - }; - http.request(params); - + this.loadBasketData(); http.getCartCount();//重新计算购物车总数量 - }, + loadBasketData(){ + wx.showLoading(); //加载购物车 + + var params = { + url: "/p/shopCart/info", + method: "POST", + data: {}, + callBack: res => { + if (res.length > 0) { + // 默认不选中 + var shopCartItemDiscounts = res[0].shopCartItemDiscounts; + shopCartItemDiscounts.forEach(shopCartItemDiscount => { + shopCartItemDiscount.shopCartItems.forEach(shopCartItem => { + shopCartItem.checked = false; + }); + }); + this.setData({ + shopCartItemDiscounts: shopCartItemDiscounts, + allChecked: false + }); + } else { + this.setData({ + shopCartItemDiscounts: [] + }); + } + + this.calTotalPrice(); //计算总价 + + wx.hideLoading(); + } + }; + http.request(params); + }, /** * 去结算 @@ -290,7 +291,7 @@ Page({ data: basketIds, callBack: function (res) { wx.hideLoading(); - ths.onShow(); + ths.loadBasketData(); } }; http.request(params); diff --git a/mall4m/pages/binding-phone/binding-phone.js b/mall4m/pages/binding-phone/binding-phone.js index 6f1b2dab..fa726a31 100644 --- a/mall4m/pages/binding-phone/binding-phone.js +++ b/mall4m/pages/binding-phone/binding-phone.js @@ -106,7 +106,7 @@ Page({ url: '/user/registerOrBindUser', method: 'PUT', data: { - appType: 1, // 微信小程序 + appType: 1, // 微信小程序 mobile: this.data.phonenum, validCode: this.data.code, validateType: 1, // 验证类型:1验证码验证 , diff --git a/mall4m/pages/login/login.js b/mall4m/pages/login/login.js index 77ed53f3..13d38e33 100644 --- a/mall4m/pages/login/login.js +++ b/mall4m/pages/login/login.js @@ -9,12 +9,12 @@ Page({ }, onGotUserInfo: function (res) { - http.updateUserInfo(); wx.navigateBack({ delta: 1 }) }, + /** * 生命周期函数--监听页面加载 */ @@ -70,4 +70,4 @@ Page({ onShareAppMessage: function () { } -}) \ No newline at end of file +}) diff --git a/mall4m/pages/order-detail/order-detail.wxml b/mall4m/pages/order-detail/order-detail.wxml index cc3bf2f8..446ced84 100644 --- a/mall4m/pages/order-detail/order-detail.wxml +++ b/mall4m/pages/order-detail/order-detail.wxml @@ -38,7 +38,7 @@ {{wxs.parsePrice(item.price)[0]}} .{{wxs.parsePrice(item.price)[1]}} - 申请售后 + 申请售后 加购物车 @@ -62,7 +62,7 @@ {{wxs.parsePrice(40.00)[0]}} .{{wxs.parsePrice(40.00)[1]}} - 申请售后 + 申请售后 加购物车 @@ -156,4 +156,4 @@ - + \ No newline at end of file diff --git a/mall4m/pages/prod-classify/prod-classify.wxml b/mall4m/pages/prod-classify/prod-classify.wxml index 99f7eecb..cd299068 100644 --- a/mall4m/pages/prod-classify/prod-classify.wxml +++ b/mall4m/pages/prod-classify/prod-classify.wxml @@ -1,8 +1,8 @@ - - + + diff --git a/mall4m/pages/prod-classify/prod-classify.wxss b/mall4m/pages/prod-classify/prod-classify.wxss index 81ffdc0d..3eb933b6 100644 --- a/mall4m/pages/prod-classify/prod-classify.wxss +++ b/mall4m/pages/prod-classify/prod-classify.wxss @@ -23,4 +23,4 @@ page { color: #999; text-align: center; margin: 100rpx 0; -} \ No newline at end of file +} diff --git a/mall4m/pages/search-page/search-page.js b/mall4m/pages/search-page/search-page.js index fc8581d9..7ffa1d1d 100644 --- a/mall4m/pages/search-page/search-page.js +++ b/mall4m/pages/search-page/search-page.js @@ -100,7 +100,7 @@ Page({ * 生命周期函数--监听页面隐藏 */ onHide: function () { - this.prodName = '' + }, /** diff --git a/mall4m/pages/user/user.wxml b/mall4m/pages/user/user.wxml index 6b6494a4..610a0d83 100644 --- a/mall4m/pages/user/user.wxml +++ b/mall4m/pages/user/user.wxml @@ -56,11 +56,11 @@ 我的收藏 - 5 + 0 我的消息 - 3 + 0 我的足迹 diff --git a/mall4uni/pages.json b/mall4uni/pages.json index 723f2620..c6b7d4b2 100644 --- a/mall4uni/pages.json +++ b/mall4uni/pages.json @@ -4,7 +4,7 @@ "path": "pages/index/index", "style": { "backgroundTextStyle": "dark", - "navigationBarBackgroundColor": "white", + "navigationBarBackgroundColor": "#fff", "navigationBarTextStyle": "black", "enablePullDownRefresh": true, "navigationBarTitleText": "mall4j" diff --git a/mall4uni/pages/basket/basket.vue b/mall4uni/pages/basket/basket.vue index 2257d8e2..a9d1c673 100644 --- a/mall4uni/pages/basket/basket.vue +++ b/mall4uni/pages/basket/basket.vue @@ -150,11 +150,11 @@ export default { * 生命周期函数--监听页面显示 */ onShow: function () { - this.loadBasketData(); + this.loadBasketData(); http.getCartCount(); //重新计算购物车总数量 }, methods: { - loadBasketData(){ + loadBasketData(){ uni.showLoading(); //加载购物车 var params = { diff --git a/mall4uni/pages/delivery-address/delivery-address.vue b/mall4uni/pages/delivery-address/delivery-address.vue index df8ce854..a43a8bdd 100644 --- a/mall4uni/pages/delivery-address/delivery-address.vue +++ b/mall4uni/pages/delivery-address/delivery-address.vue @@ -109,7 +109,7 @@ export default { }; http.request(params); }, - // 修改地址 + // 修改地址 toEditAddress: function (e) { var addrId = e.currentTarget.dataset.addrid; uni.navigateTo({ @@ -125,7 +125,6 @@ export default { var pages = getCurrentPages(); //当前页面 var prevPage = pages[pages.length - 2]; //上一页面 - //直接给上一页面赋值 prevPage.item = item prevPage.selAddress = 'yes' @@ -140,4 +139,4 @@ export default { \ No newline at end of file + diff --git a/mall4uni/pages/editAddress/editAddress.vue b/mall4uni/pages/editAddress/editAddress.vue index abc71f3c..6df696c2 100644 --- a/mall4uni/pages/editAddress/editAddress.vue +++ b/mall4uni/pages/editAddress/editAddress.vue @@ -356,7 +356,7 @@ export default { var addr = ths.addr; if (!receiver.trim()) { - ths.receiver = '' + this.receiver = '' uni.showToast({ title: '请输入收货人姓名', icon: "none" @@ -381,7 +381,7 @@ export default { } if (!addr.trim()) { - ths.receiver = '' + this.addr = '' uni.showToast({ title: '请输入详细地址', icon: "none" @@ -475,4 +475,4 @@ export default { \ No newline at end of file + diff --git a/mall4uni/pages/news-detail/news-detail.css b/mall4uni/pages/news-detail/news-detail.css index 23cf3b53..6eacaeaa 100644 --- a/mall4uni/pages/news-detail/news-detail.css +++ b/mall4uni/pages/news-detail/news-detail.css @@ -23,4 +23,4 @@ display: block; width: 100%; height: auto; -} +} \ No newline at end of file diff --git a/mall4uni/pages/prod-classify/prod-classify.css b/mall4uni/pages/prod-classify/prod-classify.css index f8178c94..2bdc5834 100644 --- a/mall4uni/pages/prod-classify/prod-classify.css +++ b/mall4uni/pages/prod-classify/prod-classify.css @@ -30,4 +30,4 @@ page { color: #999; margin-top: 20vh; text-align: center; -} \ No newline at end of file +} diff --git a/mall4uni/pages/prod-classify/prod-classify.vue b/mall4uni/pages/prod-classify/prod-classify.vue index 56194e97..c81f40fc 100644 --- a/mall4uni/pages/prod-classify/prod-classify.vue +++ b/mall4uni/pages/prod-classify/prod-classify.vue @@ -4,7 +4,7 @@ - + @@ -302,4 +302,4 @@ export default { \ No newline at end of file + diff --git a/mall4uni/pages/search-prod-show/search-prod-show.css b/mall4uni/pages/search-prod-show/search-prod-show.css index 5ba7cd19..601f0f42 100644 --- a/mall4uni/pages/search-prod-show/search-prod-show.css +++ b/mall4uni/pages/search-prod-show/search-prod-show.css @@ -24,6 +24,7 @@ page { z-index: 3; padding: 0 30rpx; box-sizing: border-box; + margin: 30rpx 0; } .search-bar .search-box { @@ -197,3 +198,13 @@ page { color: #eb2444; font-family: arial; } + +.container .empty { + margin-top: 100rpx; + text-align: center; + color: #999; + font-size: 26rpx; +} +.container .empty.empty-top { + margin-top: 300rpx; +} \ No newline at end of file diff --git a/mall4uni/pages/search-prod-show/search-prod-show.vue b/mall4uni/pages/search-prod-show/search-prod-show.vue index d323c7ff..7185be29 100644 --- a/mall4uni/pages/search-prod-show/search-prod-show.vue +++ b/mall4uni/pages/search-prod-show/search-prod-show.vue @@ -53,6 +53,7 @@ + 暂无结果 @@ -202,4 +203,4 @@ export default { \ No newline at end of file + diff --git a/mall4uni/pages/submit-order/submit-order.vue b/mall4uni/pages/submit-order/submit-order.vue index 7e5a06ca..8846b6c1 100644 --- a/mall4uni/pages/submit-order/submit-order.vue +++ b/mall4uni/pages/submit-order/submit-order.vue @@ -87,7 +87,7 @@ 买家留言： - + diff --git a/mall4v/README.md b/mall4v/README.md index 1a22561a..22427e29 100644 --- a/mall4v/README.md +++ b/mall4v/README.md @@ -26,7 +26,7 @@ vue中后台：https://gitee.com/gz-yami/mall4v ## 演示地址 - **由于我们并不希望小程序的数据被弄混乱，我们弄了两个数据库。因此，您修改了后台的商品信息，小程序并不能看到！** + **由于我们并不希望小程序的数据被弄混乱，我们弄了两个数据库。因此，您修改了后台的商品信息，小程序并不能看到！** 后台： 账号：admin/123456 @@ -34,7 +34,7 @@ vue中后台：https://gitee.com/gz-yami/mall4v ![小程序](https://gitee.com/gz-yami/mall4j/raw/master/screenshot/miniQrcode.jpg) -​ 2. 搜索小程序 **mall4j商城** +​ 2. 搜索小程序 **mall4j商城** @@ -86,4 +86,4 @@ npm run build - 论坛： -- 商务邮箱：yamitech@163.com \ No newline at end of file +- 商务邮箱：yamitech@163.com diff --git a/mall4v/src/components/file-upload/index.vue b/mall4v/src/components/file-upload/index.vue index 8cf2cfc7..8584ba4c 100644 --- a/mall4v/src/components/file-upload/index.vue +++ b/mall4v/src/components/file-upload/index.vue @@ -51,7 +51,7 @@ beforeAvatarUpload (file) { const isLt2M = file.size / 1024 / 1024 < 2 if (!isLt2M) { - this.$message.error('上传头像图片大小不能超过 2MB!') + this.$message.error('上传图片大小不能超过 2MB!') } return isLt2M }, diff --git a/mall4v/src/components/mul-pic-upload/index.vue b/mall4v/src/components/mul-pic-upload/index.vue index b612d75f..1c6177bc 100644 --- a/mall4v/src/components/mul-pic-upload/index.vue +++ b/mall4v/src/components/mul-pic-upload/index.vue @@ -55,11 +55,17 @@ }, // 限制图片上传大小 beforeAvatarUpload (file) { + const isJPG = file.type === 'image/jpeg' || file.type === 'image/png' || file.type === 'image/gif' || file.type === 'image/jpg' + if (!isJPG) { + this.$message.error('上传图片只能是jpeg/jpg/png/gif 格式!') + } const isLt2M = file.size / 1024 / 1024 < 2 if (!isLt2M) { this.$message.error('上传头像图片大小不能超过 2MB!') + this.$message.error('上传图片大小不能超过 2MB!') } return isLt2M + return isLt2M && isJPG }, handleRemove (file, fileList) { let pics = fileList.map(file => { diff --git a/mall4v/src/components/pic-upload/index.vue b/mall4v/src/components/pic-upload/index.vue index 3680c2fe..6b255b49 100644 --- a/mall4v/src/components/pic-upload/index.vue +++ b/mall4v/src/components/pic-upload/index.vue @@ -34,10 +34,15 @@ // 限制图片上传大小 beforeAvatarUpload (file) { const isLt2M = file.size / 1024 / 1024 < 2 + const isJPG = file.type === 'image/jpeg' || file.type === 'image/png' || file.type === 'image/gif' || file.type === 'image/jpg' + if (!isJPG) { + this.$message.error('上传图片只能是jpeg/jpg/png/gif 格式!') + } if (!isLt2M) { - this.$message.error('上传头像图片大小不能超过 2MB!') + this.$message.error('上传图片大小不能超过 2MB!') } return isLt2M + return isLt2M && isJPG } } } diff --git a/mall4v/src/crud/user/user.js b/mall4v/src/crud/user/user.js index d39e38cc..79306e48 100644 --- a/mall4v/src/crud/user/user.js +++ b/mall4v/src/crud/user/user.js @@ -1,6 +1,6 @@ export const tableOption = { border: true, - selection: true, + // selection: true, index: false, indexLabel: '序号', stripe: true, @@ -42,6 +42,9 @@ export const tableOption = { value: 1 } ] - + }, { + label: '注册时间', + prop: 'userRegtime', + imgWidth: 150 }] } diff --git a/mall4v/src/views/modules/order/orderInfo.vue b/mall4v/src/views/modules/order/orderInfo.vue index f9776a38..3b68d87f 100644 --- a/mall4v/src/views/modules/order/orderInfo.vue +++ b/mall4v/src/views/modules/order/orderInfo.vue @@ -472,7 +472,6 @@ /* margin-top: 15px; */ color: #4395ff; } - .order-log .log-cont .el-form-item__content { line-height: 1.5em; } diff --git a/mall4v/src/views/modules/prod/category.vue b/mall4v/src/views/modules/prod/category.vue index d3c8688f..c0ed590b 100644 --- a/mall4v/src/views/modules/prod/category.vue +++ b/mall4v/src/views/modules/prod/category.vue @@ -111,7 +111,7 @@ export default { }, // 删除 deleteHandle (id) { - this.$confirm(`确定对[id=${id}]进行[删除]操作?`, '提示', { + this.$confirm(`确定进行删除操作?`, '提示', { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning' diff --git a/mall4v/src/views/modules/prod/prodInfo.vue b/mall4v/src/views/modules/prod/prodInfo.vue index 340f96f1..a56fdb4d 100644 --- a/mall4v/src/views/modules/prod/prodInfo.vue +++ b/mall4v/src/views/modules/prod/prodInfo.vue @@ -63,6 +63,7 @@ - {{tagItem}} + {{tagItem.propValue}} 确定 取消 + + diff --git a/mall4v/src/views/modules/prod/spec-add-or-update.vue b/mall4v/src/views/modules/prod/spec-add-or-update.vue index 334551be..57ec96b1 100644 --- a/mall4v/src/views/modules/prod/spec-add-or-update.vue +++ b/mall4v/src/views/modules/prod/spec-add-or-update.vue @@ -52,7 +52,7 @@ export default { dataList: [{ propId: 0, propName: '', prodPropValues: [{ valueId: 0 }] }], dataRule: { propName: [ - { required: true, message: '菜单名称不能为空', trigger: 'blur' } + { required: true, message: '属性名称不能为空', trigger: 'blur' } ] }, page: { @@ -87,6 +87,11 @@ export default { } this.dataList[0].prodPropValues = temp } + if (this.dataList[0].prodPropValues.length < 1) { + this.dataList[0].prodPropValues = [{ valueId: 0 }] + this.$message.error('规格项不能为空') + return + } this.$http({ url: this.$http.adornUrl(`/prod/spec`), method: this.dataList[0].propId ? 'put' : 'post', @@ -126,4 +131,4 @@ export default { } } } - \ No newline at end of file + diff --git a/mall4v/src/views/modules/shop/hotSearch-add-or-update.vue b/mall4v/src/views/modules/shop/hotSearch-add-or-update.vue index 9796c28e..59c98d31 100644 --- a/mall4v/src/views/modules/shop/hotSearch-add-or-update.vue +++ b/mall4v/src/views/modules/shop/hotSearch-add-or-update.vue @@ -84,15 +84,21 @@ export default { }, components: {}, methods: { - init (data) { + init (id) { + this.dataForm.hotSearchId = id || 0 this.visible = true - if (data) { - this.dataForm = Object.assign({}, data) - } else { - this.$nextTick(() => { - this.$refs['dataForm'].resetFields() - }) - } + this.$nextTick(() => { + this.$refs['dataForm'].resetFields() + if (this.dataForm.hotSearchId) { + this.$http({ + url: this.$http.adornUrl('/admin/hotSearch/info/' + this.dataForm.hotSearchId), + method: 'get', + params: this.$http.adornParams() + }).then(({data}) => { + this.dataForm = data + }) + } + }) }, // 表单提交 dataFormSubmit () { diff --git a/mall4v/src/views/modules/shop/hotSearch.vue b/mall4v/src/views/modules/shop/hotSearch.vue index 88d35ae2..7d6654b4 100644 --- a/mall4v/src/views/modules/shop/hotSearch.vue +++ b/mall4v/src/views/modules/shop/hotSearch.vue @@ -38,7 +38,7 @@ type="primary" size="small" icon="el-icon-edit" - @click="addOrUpdateHandle(scope.row)">修改 + @click="addOrUpdateHandle(scope.row.hotSearchId)">修改 { return item.hotSearchId }) - this.$confirm(`确定对[id=${ids.join(',')}]进行[${row.hotSearchId ? '删除' : '批量删除'}]操作?`, '提示', { + this.$confirm(`确定进行[${row.hotSearchId ? '删除' : '批量删除'}]操作?`, '提示', { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning' diff --git a/mall4v/src/views/modules/shop/pickAddr.vue b/mall4v/src/views/modules/shop/pickAddr.vue index 5e6c9e7d..57c6ddbc 100644 --- a/mall4v/src/views/modules/shop/pickAddr.vue +++ b/mall4v/src/views/modules/shop/pickAddr.vue @@ -18,6 +18,7 @@ 批量删除 @@ -108,8 +109,7 @@ export default { return item.addrId }) this.$confirm( - `确定对[id=${ids.join(',')}]进行[${id ? '删除' : '批量删除'}]操作?`, - '提示', + `确定进行删除操作?`, '提示', { confirmButtonText: '确定', cancelButtonText: '取消', diff --git a/mall4v/src/views/modules/shop/transport-add-or-update.vue b/mall4v/src/views/modules/shop/transport-add-or-update.vue index a36eba98..ef8d15b3 100644 --- a/mall4v/src/views/modules/shop/transport-add-or-update.vue +++ b/mall4v/src/views/modules/shop/transport-add-or-update.vue @@ -418,4 +418,4 @@ export default { margin-top: 16px; margin-bottom: 16px!important; } - \ No newline at end of file + diff --git a/mall4v/src/views/modules/shop/transport.vue b/mall4v/src/views/modules/shop/transport.vue index 8923d029..36574acf 100644 --- a/mall4v/src/views/modules/shop/transport.vue +++ b/mall4v/src/views/modules/shop/transport.vue @@ -10,19 +10,23 @@ @@ -48,102 +54,107 @@ diff --git a/mall4v/src/views/modules/sys/role.vue b/mall4v/src/views/modules/sys/role.vue index 6090f8da..9b5e19c5 100644 --- a/mall4v/src/views/modules/sys/role.vue +++ b/mall4v/src/views/modules/sys/role.vue @@ -106,7 +106,7 @@ export default { var ids = id ? [id] : this.dataListSelections.map(item => { return item.roleId }) - this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? '删除' : '批量删除'}]操作?`, '提示', { + this.$confirm(`确定进行[${id ? '删除' : '批量删除'}]操作?`, '提示', { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning' diff --git a/mall4v/src/views/modules/user/user.vue b/mall4v/src/views/modules/user/user.vue index 327d17a0..429ad816 100644 --- a/mall4v/src/views/modules/user/user.vue +++ b/mall4v/src/views/modules/user/user.vue @@ -8,11 +8,11 @@ @selection-change="selectionChange" @on-load="getDataList"> diff --git a/mall4v/static/config/index-prod.js b/mall4v/static/config/index-prod.js index 9a83d129..e289d8d4 100644 --- a/mall4v/static/config/index-prod.js +++ b/mall4v/static/config/index-prod.js @@ -5,9 +5,9 @@ window.SITE_CONFIG = {} // api接口请求地址 - window.SITE_CONFIG['baseUrl'] = 'http://mall4j-admin.gz-yami.com/apis' + window.SITE_CONFIG['baseUrl'] = 'https://mall4j-admin.mall4j.com/apis' // 静态资源文件url - window.SITE_CONFIG['resourcesUrl'] = 'http://img-test.gz-yami.com/' + window.SITE_CONFIG['resourcesUrl'] = 'https://img.mall4j.com//' // cdn地址 = 域名 + 版本号 window.SITE_CONFIG['domain'] = './' // 域名 window.SITE_CONFIG['version'] = '' // 版本号(年月日时分) diff --git a/mall4v/static/config/index.js b/mall4v/static/config/index.js index 85df2077..d93e7433 100644 --- a/mall4v/static/config/index.js +++ b/mall4v/static/config/index.js @@ -8,7 +8,7 @@ window.SITE_CONFIG['baseUrl'] = 'http://192.168.0.143:8085' // 静态资源文件url - window.SITE_CONFIG['resourcesUrl'] = 'http://img-test.gz-yami.com/' + window.SITE_CONFIG['resourcesUrl'] = 'https://img.mall4j.com/' // cdn地址 = 域名 + 版本号 window.SITE_CONFIG['domain'] = './' // 域名 window.SITE_CONFIG['version'] = '' // 版本号(年月日时分) diff --git a/mall4v/static/config/init.js b/mall4v/static/config/init.js index e189224a..0a2bd9f7 100644 --- a/mall4v/static/config/init.js +++ b/mall4v/static/config/init.js @@ -10,9 +10,11 @@ js: [ // 插件, 放置业务之前加载, 以免业务需求依赖插件时, 还未加载出错 // 插件 - echarts - 'https://cdn.bootcss.com/echarts/4.2.1/echarts.common.min.js', + 'https://cdn.jsdelivr.net/npm/echarts@4.8.0/dist/echarts.min.js', + // 插件 - tinymce - 'https://cdn.bootcss.com/tinymce/4.9.4/tinymce.min.js', + 'https://cdn.jsdelivr.net/npm/tinymce@4.9.4/tinymce.min.js', + 'https://cdn.jsdelivr.net/npm/d3@5.16.0/dist/d3.min.js', window.SITE_CONFIG.cdnUrl + '/static/plugins/tinymce.4.9.4/zh_CN.js', // 业务 window.SITE_CONFIG.cdnUrl + '/static/js/manifest.js', diff --git a/yami-shop-admin/src/main/java/com/yami/shop/admin/WebApplication.java b/yami-shop-admin/src/main/java/com/yami/shop/admin/WebApplication.java index ca9ceddc..756bee23 100644 --- a/yami-shop-admin/src/main/java/com/yami/shop/admin/WebApplication.java +++ b/yami-shop-admin/src/main/java/com/yami/shop/admin/WebApplication.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-admin/src/main/java/com/yami/shop/admin/config/AdminBeanConfig.java b/yami-shop-admin/src/main/java/com/yami/shop/admin/config/AdminBeanConfig.java index dda57aa6..eddb72e4 100644 --- a/yami-shop-admin/src/main/java/com/yami/shop/admin/config/AdminBeanConfig.java +++ b/yami-shop-admin/src/main/java/com/yami/shop/admin/config/AdminBeanConfig.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-admin/src/main/java/com/yami/shop/admin/config/AdminConfig.java b/yami-shop-admin/src/main/java/com/yami/shop/admin/config/AdminConfig.java index 2891e14c..bd6bc791 100644 --- a/yami-shop-admin/src/main/java/com/yami/shop/admin/config/AdminConfig.java +++ b/yami-shop-admin/src/main/java/com/yami/shop/admin/config/AdminConfig.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-admin/src/main/java/com/yami/shop/admin/config/SwaggerConfiguration.java b/yami-shop-admin/src/main/java/com/yami/shop/admin/config/SwaggerConfiguration.java index f8c31cca..8b067a25 100644 --- a/yami-shop-admin/src/main/java/com/yami/shop/admin/config/SwaggerConfiguration.java +++ b/yami-shop-admin/src/main/java/com/yami/shop/admin/config/SwaggerConfiguration.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * @@ -45,10 +45,10 @@ public Docket createRestApi() { @Bean public ApiInfo apiInfo() { return new ApiInfoBuilder() - .title("亚米管理系统接口文档") - .description("亚米商城接口文档Swagger版") - .termsOfServiceUrl("https://www.gz-yami.com/") - .contact(new Contact("广州亚米信息科技有限公司","https://www.gz-yami.com/", "")) + .title("mall4j管理系统接口文档") + .description("mall4j商城接口文档Swagger版") + .termsOfServiceUrl("https://www.mall4j.com/") + .contact(new Contact("广州市蓝海创新科技有限公司","https://www.mall4j.com/", "")) .version("1.0") .build(); } diff --git a/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/AreaController.java b/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/AreaController.java index d9074d84..f6d8da28 100644 --- a/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/AreaController.java +++ b/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/AreaController.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/AttributeController.java b/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/AttributeController.java index 164b8fcd..6b7b2322 100644 --- a/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/AttributeController.java +++ b/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/AttributeController.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/BrandController.java b/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/BrandController.java index 68127e4f..9d302b8d 100644 --- a/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/BrandController.java +++ b/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/BrandController.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/CategoryController.java b/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/CategoryController.java index ebe1e283..c1490df1 100644 --- a/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/CategoryController.java +++ b/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/CategoryController.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/DeliveryController.java b/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/DeliveryController.java index 37050b5c..b6d3f223 100644 --- a/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/DeliveryController.java +++ b/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/DeliveryController.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/FileController.java b/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/FileController.java index 96c03404..9d79546b 100644 --- a/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/FileController.java +++ b/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/FileController.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/HotSearchController.java b/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/HotSearchController.java index 913eed92..a1f43b00 100644 --- a/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/HotSearchController.java +++ b/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/HotSearchController.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * @@ -69,7 +69,6 @@ public ResponseEntity> page(HotSearch hotSearch,PageParam info(@PathVariable("id") Long id){ HotSearch hotSearch = hotSearchService.getById(id); return ResponseEntity.ok(hotSearch); diff --git a/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/IndexImgController.java b/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/IndexImgController.java index 23133bb2..f68f7949 100644 --- a/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/IndexImgController.java +++ b/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/IndexImgController.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/MessageController.java b/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/MessageController.java index 5b5d8338..bde61637 100644 --- a/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/MessageController.java +++ b/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/MessageController.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/NoticeController.java b/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/NoticeController.java index aaeb8e08..17b84de4 100644 --- a/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/NoticeController.java +++ b/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/NoticeController.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * @@ -49,7 +49,7 @@ public class NoticeController { public ResponseEntity> getNoticePage(PageParam page, Notice notice) { IPage noticeIPage = noticeService.page(page, new LambdaQueryWrapper() .eq(notice.getStatus() != null, Notice::getStatus, notice.getStatus()) - .eq(notice.getIsTop() != null, Notice::getIsTop, notice.getIsTop()) + .eq(notice.getIsTop()!=null,Notice::getIsTop,notice.getIsTop()) .like(notice.getTitle() != null, Notice::getTitle, notice.getTitle()).orderByDesc(Notice::getUpdateTime)); return ResponseEntity.ok(noticeIPage); } diff --git a/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/OrderController.java b/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/OrderController.java index 1050627d..95bfb6c0 100644 --- a/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/OrderController.java +++ b/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/OrderController.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/PickAddrController.java b/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/PickAddrController.java index 41ac2f94..94164854 100644 --- a/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/PickAddrController.java +++ b/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/PickAddrController.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * @@ -94,6 +94,7 @@ public ResponseEntity save(@Valid @RequestBody PickAddr pickAddr){ @PreAuthorize("@pms.hasPermission('shop:pickAddr:update')") public ResponseEntity update(@Valid @RequestBody PickAddr pickAddr){ PickAddr dbPickAddr = pickAddrService.getById(pickAddr.getAddrId()); + if (!Objects.equals(dbPickAddr.getShopId(),SecurityUtils.getSysUser().getShopId())) { throw new YamiShopBindException(YamiHttpStatus.UNAUTHORIZED); } diff --git a/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/ProdCommController.java b/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/ProdCommController.java index cb1de9e7..5062dddd 100644 --- a/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/ProdCommController.java +++ b/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/ProdCommController.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/ProdTagController.java b/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/ProdTagController.java index 8c37663a..ffef4c97 100644 --- a/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/ProdTagController.java +++ b/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/ProdTagController.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/ProdTagReferenceController.java b/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/ProdTagReferenceController.java index f9f7013a..06ed61c9 100644 --- a/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/ProdTagReferenceController.java +++ b/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/ProdTagReferenceController.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/ProductController.java b/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/ProductController.java index d501ad6f..67ba873b 100644 --- a/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/ProductController.java +++ b/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/ProductController.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/ShopDetailController.java b/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/ShopDetailController.java index 6f2ad53b..8e7d6b74 100644 --- a/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/ShopDetailController.java +++ b/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/ShopDetailController.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/SpecController.java b/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/SpecController.java index 4b3371de..b1ae4be6 100644 --- a/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/SpecController.java +++ b/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/SpecController.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * @@ -123,4 +123,15 @@ public ResponseEntity delete(@PathVariable Long id) { prodPropService.deleteProdPropAndValues(id, ProdPropRule.SPEC.value(), SecurityUtils.getSysUser().getShopId()); return ResponseEntity.ok().build(); } + + /** + * 根据获取规格值最大的自增id + */ + @GetMapping("/listSpecMaxValueId") + public ResponseEntity listSpecMaxValueId() { + ProdPropValue propValue = prodPropValueService.getOne(new LambdaQueryWrapper() + .orderByDesc(ProdPropValue::getValueId).last("limit 1")); + return ResponseEntity.ok(Objects.isNull(propValue) ? 0L : propValue.getValueId()); + } + } diff --git a/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/TransportController.java b/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/TransportController.java index ef92ad2d..305d0b3f 100644 --- a/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/TransportController.java +++ b/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/TransportController.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/UserAddrController.java b/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/UserAddrController.java index 0da34dd2..8034945c 100644 --- a/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/UserAddrController.java +++ b/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/UserAddrController.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/UserController.java b/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/UserController.java index 22fab836..f4d5989e 100644 --- a/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/UserController.java +++ b/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/UserController.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-admin/src/main/java/com/yami/shop/admin/security/AdminAuthenticationToken.java b/yami-shop-admin/src/main/java/com/yami/shop/admin/security/AdminAuthenticationToken.java index 53c3ac39..2f263508 100644 --- a/yami-shop-admin/src/main/java/com/yami/shop/admin/security/AdminAuthenticationToken.java +++ b/yami-shop-admin/src/main/java/com/yami/shop/admin/security/AdminAuthenticationToken.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-admin/src/main/java/com/yami/shop/admin/security/LoginAuthenticationFilter.java b/yami-shop-admin/src/main/java/com/yami/shop/admin/security/LoginAuthenticationFilter.java index b1163784..99cd6cac 100644 --- a/yami-shop-admin/src/main/java/com/yami/shop/admin/security/LoginAuthenticationFilter.java +++ b/yami-shop-admin/src/main/java/com/yami/shop/admin/security/LoginAuthenticationFilter.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-admin/src/main/java/com/yami/shop/admin/security/ResourceServerConfiguration.java b/yami-shop-admin/src/main/java/com/yami/shop/admin/security/ResourceServerConfiguration.java index c71ab345..a945c5ca 100644 --- a/yami-shop-admin/src/main/java/com/yami/shop/admin/security/ResourceServerConfiguration.java +++ b/yami-shop-admin/src/main/java/com/yami/shop/admin/security/ResourceServerConfiguration.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-admin/src/main/java/com/yami/shop/admin/security/YamiSysUserDetailsServiceImpl.java b/yami-shop-admin/src/main/java/com/yami/shop/admin/security/YamiSysUserDetailsServiceImpl.java index 1de2137c..7152fba4 100644 --- a/yami-shop-admin/src/main/java/com/yami/shop/admin/security/YamiSysUserDetailsServiceImpl.java +++ b/yami-shop-admin/src/main/java/com/yami/shop/admin/security/YamiSysUserDetailsServiceImpl.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * @@ -12,6 +12,7 @@ import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.yami.shop.bean.model.User; import com.yami.shop.common.util.CacheManagerUtil; import com.yami.shop.sys.constant.Constant; import com.yami.shop.security.enums.App; @@ -117,4 +118,19 @@ public YamiUser loadUserByAppIdAndBizUserId(App app, String bizUserId) { public void insertUserIfNecessary(AppConnect appConnect) { } + + @Override + public YamiUser loadUserByUserMail(String userMail, String loginPassword) { + return null; + } + + @Override + public User loadUserByMobileOrUserName(String mobileOrUserName, Integer loginType) { + return null; + } + + @Override + public YamiUser getYamiUser(Integer appId, User user, String bizUserId) { + return null; + } } diff --git a/yami-shop-admin/src/main/java/com/yami/shop/admin/task/OrderTask.java b/yami-shop-admin/src/main/java/com/yami/shop/admin/task/OrderTask.java index 0e02881e..03ea2e5a 100644 --- a/yami-shop-admin/src/main/java/com/yami/shop/admin/task/OrderTask.java +++ b/yami-shop-admin/src/main/java/com/yami/shop/admin/task/OrderTask.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-admin/src/main/java/com/yami/shop/admin/task/TestTask.java b/yami-shop-admin/src/main/java/com/yami/shop/admin/task/TestTask.java index 8a57dcdd..3c3050dc 100644 --- a/yami-shop-admin/src/main/java/com/yami/shop/admin/task/TestTask.java +++ b/yami-shop-admin/src/main/java/com/yami/shop/admin/task/TestTask.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-api/src/main/java/com/yami/shop/api/ApiApplication.java b/yami-shop-api/src/main/java/com/yami/shop/api/ApiApplication.java index 9ef503b5..5c5f18b1 100644 --- a/yami-shop-api/src/main/java/com/yami/shop/api/ApiApplication.java +++ b/yami-shop-api/src/main/java/com/yami/shop/api/ApiApplication.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-api/src/main/java/com/yami/shop/api/config/ApiBeanConfig.java b/yami-shop-api/src/main/java/com/yami/shop/api/config/ApiBeanConfig.java index aad131f9..9475ff5f 100644 --- a/yami-shop-api/src/main/java/com/yami/shop/api/config/ApiBeanConfig.java +++ b/yami-shop-api/src/main/java/com/yami/shop/api/config/ApiBeanConfig.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-api/src/main/java/com/yami/shop/api/config/ApiConfig.java b/yami-shop-api/src/main/java/com/yami/shop/api/config/ApiConfig.java index ddaf99d6..03469db4 100644 --- a/yami-shop-api/src/main/java/com/yami/shop/api/config/ApiConfig.java +++ b/yami-shop-api/src/main/java/com/yami/shop/api/config/ApiConfig.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-api/src/main/java/com/yami/shop/api/config/SwaggerConfiguration.java b/yami-shop-api/src/main/java/com/yami/shop/api/config/SwaggerConfiguration.java index 4156367a..2c0cbef0 100644 --- a/yami-shop-api/src/main/java/com/yami/shop/api/config/SwaggerConfiguration.java +++ b/yami-shop-api/src/main/java/com/yami/shop/api/config/SwaggerConfiguration.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * @@ -46,10 +46,10 @@ public Docket baseRestApi() { @Bean public ApiInfo apiInfo() { return new ApiInfoBuilder() - .title("亚米商城接口文档") - .description("亚米商城接口文档Swagger版") - .termsOfServiceUrl("http://www.gz-yami.com/") - .contact(new Contact("广州亚米信息科技有限公司","https://www.gz-yami.com/", "")) + .title("mall4j商城接口文档") + .description("mall4j商城接口文档Swagger版") + .termsOfServiceUrl("http://www.mall4j.com/") + .contact(new Contact("广州市蓝海创新科技有限公司","https://www.mall4j.com/", "")) .version("1.0") .build(); } diff --git a/yami-shop-api/src/main/java/com/yami/shop/api/controller/AddrController.java b/yami-shop-api/src/main/java/com/yami/shop/api/controller/AddrController.java index 8287a804..6c88ce94 100644 --- a/yami-shop-api/src/main/java/com/yami/shop/api/controller/AddrController.java +++ b/yami-shop-api/src/main/java/com/yami/shop/api/controller/AddrController.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-api/src/main/java/com/yami/shop/api/controller/AreaController.java b/yami-shop-api/src/main/java/com/yami/shop/api/controller/AreaController.java index e2e4cfb7..fbbb916d 100644 --- a/yami-shop-api/src/main/java/com/yami/shop/api/controller/AreaController.java +++ b/yami-shop-api/src/main/java/com/yami/shop/api/controller/AreaController.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-api/src/main/java/com/yami/shop/api/controller/CategoryController.java b/yami-shop-api/src/main/java/com/yami/shop/api/controller/CategoryController.java index aad4ac0b..492bd2c3 100644 --- a/yami-shop-api/src/main/java/com/yami/shop/api/controller/CategoryController.java +++ b/yami-shop-api/src/main/java/com/yami/shop/api/controller/CategoryController.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-api/src/main/java/com/yami/shop/api/controller/DeliveryController.java b/yami-shop-api/src/main/java/com/yami/shop/api/controller/DeliveryController.java index a5797f18..dd0c6620 100644 --- a/yami-shop-api/src/main/java/com/yami/shop/api/controller/DeliveryController.java +++ b/yami-shop-api/src/main/java/com/yami/shop/api/controller/DeliveryController.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-api/src/main/java/com/yami/shop/api/controller/IndexImgController.java b/yami-shop-api/src/main/java/com/yami/shop/api/controller/IndexImgController.java index 8fa3b79a..b438066a 100644 --- a/yami-shop-api/src/main/java/com/yami/shop/api/controller/IndexImgController.java +++ b/yami-shop-api/src/main/java/com/yami/shop/api/controller/IndexImgController.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-api/src/main/java/com/yami/shop/api/controller/MyOrderController.java b/yami-shop-api/src/main/java/com/yami/shop/api/controller/MyOrderController.java index 21fbdeec..6a0d47b0 100644 --- a/yami-shop-api/src/main/java/com/yami/shop/api/controller/MyOrderController.java +++ b/yami-shop-api/src/main/java/com/yami/shop/api/controller/MyOrderController.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-api/src/main/java/com/yami/shop/api/controller/NoticeController.java b/yami-shop-api/src/main/java/com/yami/shop/api/controller/NoticeController.java index f8cd9d0c..58eb66be 100644 --- a/yami-shop-api/src/main/java/com/yami/shop/api/controller/NoticeController.java +++ b/yami-shop-api/src/main/java/com/yami/shop/api/controller/NoticeController.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-api/src/main/java/com/yami/shop/api/controller/OrderController.java b/yami-shop-api/src/main/java/com/yami/shop/api/controller/OrderController.java index ac25cc00..794c0d52 100644 --- a/yami-shop-api/src/main/java/com/yami/shop/api/controller/OrderController.java +++ b/yami-shop-api/src/main/java/com/yami/shop/api/controller/OrderController.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-api/src/main/java/com/yami/shop/api/controller/PayController.java b/yami-shop-api/src/main/java/com/yami/shop/api/controller/PayController.java index 4c229043..7855613b 100644 --- a/yami-shop-api/src/main/java/com/yami/shop/api/controller/PayController.java +++ b/yami-shop-api/src/main/java/com/yami/shop/api/controller/PayController.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * @@ -10,6 +10,7 @@ package com.yami.shop.api.controller; +import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyResult; import com.github.binarywang.wxpay.bean.order.WxPayMpOrderResult; import com.github.binarywang.wxpay.bean.request.WxPayUnifiedOrderRequest; import com.github.binarywang.wxpay.constant.WxPayConstants; @@ -32,6 +33,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + @RestController @RequestMapping("/p/order") @Api(tags = "订单接口") diff --git a/yami-shop-api/src/main/java/com/yami/shop/api/controller/PayNoticeController.java b/yami-shop-api/src/main/java/com/yami/shop/api/controller/PayNoticeController.java index ef144888..bade51c6 100644 --- a/yami-shop-api/src/main/java/com/yami/shop/api/controller/PayNoticeController.java +++ b/yami-shop-api/src/main/java/com/yami/shop/api/controller/PayNoticeController.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-api/src/main/java/com/yami/shop/api/controller/ProdCommController.java b/yami-shop-api/src/main/java/com/yami/shop/api/controller/ProdCommController.java index 7be65e20..baf6b25a 100644 --- a/yami-shop-api/src/main/java/com/yami/shop/api/controller/ProdCommController.java +++ b/yami-shop-api/src/main/java/com/yami/shop/api/controller/ProdCommController.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * @@ -43,7 +43,7 @@ public class ProdCommController { @GetMapping("/prodCommData") @ApiOperation(value = "返回商品评论数据(好评率 好评数量 中评数 差评数)", notes = "根据商品id获取") public ResponseEntity getProdCommData(Long prodId) { - return ResponseEntity.ok(prodCommService.getProdCommDataByProdId(prodId, SecurityUtils.getUser().getUserId())); + return ResponseEntity.ok(prodCommService.getProdCommDataByProdId(prodId)); } @GetMapping("/prodCommPageByUser") @@ -59,7 +59,7 @@ public ResponseEntity> getProdCommPage(PageParam page) { @ApiImplicitParam(name = "evaluate", value = "-1或null 全部，0好评 1中评 2差评 3有图", required = true, dataType = "Long"), }) public ResponseEntity> getProdCommPageByProdId(PageParam page, Long prodId, Integer evaluate) { - return ResponseEntity.ok(prodCommService.getProdCommDtoPageByProdId(page, prodId, evaluate, SecurityUtils.getUser().getUserId())); + return ResponseEntity.ok(prodCommService.getProdCommDtoPageByProdId(page, prodId, evaluate)); } @PostMapping diff --git a/yami-shop-api/src/main/java/com/yami/shop/api/controller/ProdController.java b/yami-shop-api/src/main/java/com/yami/shop/api/controller/ProdController.java index 497f237c..1082ac4b 100644 --- a/yami-shop-api/src/main/java/com/yami/shop/api/controller/ProdController.java +++ b/yami-shop-api/src/main/java/com/yami/shop/api/controller/ProdController.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-api/src/main/java/com/yami/shop/api/controller/ProdTagController.java b/yami-shop-api/src/main/java/com/yami/shop/api/controller/ProdTagController.java index c38d1ba9..9ab97b8c 100644 --- a/yami-shop-api/src/main/java/com/yami/shop/api/controller/ProdTagController.java +++ b/yami-shop-api/src/main/java/com/yami/shop/api/controller/ProdTagController.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-api/src/main/java/com/yami/shop/api/controller/SearchController.java b/yami-shop-api/src/main/java/com/yami/shop/api/controller/SearchController.java index f13769b1..ed8b9030 100644 --- a/yami-shop-api/src/main/java/com/yami/shop/api/controller/SearchController.java +++ b/yami-shop-api/src/main/java/com/yami/shop/api/controller/SearchController.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-api/src/main/java/com/yami/shop/api/controller/ShopCartController.java b/yami-shop-api/src/main/java/com/yami/shop/api/controller/ShopCartController.java index abba7666..3ee7e65f 100644 --- a/yami-shop-api/src/main/java/com/yami/shop/api/controller/ShopCartController.java +++ b/yami-shop-api/src/main/java/com/yami/shop/api/controller/ShopCartController.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-api/src/main/java/com/yami/shop/api/controller/SkuController.java b/yami-shop-api/src/main/java/com/yami/shop/api/controller/SkuController.java index 0e7cdaa6..ae463261 100644 --- a/yami-shop-api/src/main/java/com/yami/shop/api/controller/SkuController.java +++ b/yami-shop-api/src/main/java/com/yami/shop/api/controller/SkuController.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-api/src/main/java/com/yami/shop/api/controller/SmsController.java b/yami-shop-api/src/main/java/com/yami/shop/api/controller/SmsController.java index d2a62269..40381db4 100644 --- a/yami-shop-api/src/main/java/com/yami/shop/api/controller/SmsController.java +++ b/yami-shop-api/src/main/java/com/yami/shop/api/controller/SmsController.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-api/src/main/java/com/yami/shop/api/controller/UserCollectionController.java b/yami-shop-api/src/main/java/com/yami/shop/api/controller/UserCollectionController.java index e05b7a4b..34bb6b19 100644 --- a/yami-shop-api/src/main/java/com/yami/shop/api/controller/UserCollectionController.java +++ b/yami-shop-api/src/main/java/com/yami/shop/api/controller/UserCollectionController.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-api/src/main/java/com/yami/shop/api/controller/UserController.java b/yami-shop-api/src/main/java/com/yami/shop/api/controller/UserController.java index 33f1ac2d..95bc36b4 100644 --- a/yami-shop-api/src/main/java/com/yami/shop/api/controller/UserController.java +++ b/yami-shop-api/src/main/java/com/yami/shop/api/controller/UserController.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-api/src/main/java/com/yami/shop/api/controller/UserRegisterController.java b/yami-shop-api/src/main/java/com/yami/shop/api/controller/UserRegisterController.java index 2ae02ecb..7cfbcb93 100644 --- a/yami-shop-api/src/main/java/com/yami/shop/api/controller/UserRegisterController.java +++ b/yami-shop-api/src/main/java/com/yami/shop/api/controller/UserRegisterController.java @@ -1,21 +1,31 @@ package com.yami.shop.api.controller; +import cn.binarywang.wx.miniapp.bean.WxMaPhoneNumberInfo; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.yami.shop.api.security.AuthenticationToken; +import com.yami.shop.bean.enums.SmsType; import com.yami.shop.bean.model.User; import com.yami.shop.bean.param.UserRegisterParam; import com.yami.shop.common.exception.YamiShopBindException; import com.yami.shop.common.util.IPHelper; +import com.yami.shop.common.util.PrincipalUtil; +import com.yami.shop.mp.config.WxMaConfiguration; +import com.yami.shop.security.enums.App; import com.yami.shop.security.handler.LoginAuthSuccessHandler; import com.yami.shop.security.model.AppConnect; +import com.yami.shop.security.service.AppConnectService; +import com.yami.shop.security.service.YamiUser; import com.yami.shop.security.service.YamiUserDetailsService; +import com.yami.shop.security.util.SecurityUtils; +import com.yami.shop.service.SmsLogService; import com.yami.shop.service.UserService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import org.springframework.http.ResponseEntity; +import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.security.oauth2.provider.token.ConsumerTokenServices; import org.springframework.web.bind.annotation.*; @@ -24,6 +34,7 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.Date; +import java.util.Objects; /** * 用户信息 @@ -38,8 +49,22 @@ public class UserRegisterController { private final UserService userService; + private final SmsLogService smsLogService; + + private final AppConnectService appConnectService; + + private final LoginAuthSuccessHandler loginAuthSuccessHandler; + + private final WxMaConfiguration wxConfig; + + private final YamiUserDetailsService yamiUserDetailsService; + private final PasswordEncoder passwordEncoder; + public static final String CHECK_REGISTER_SMS_FLAG = "checkRegisterSmsFlag"; + + public static final String CHECK_UPDATE_PWD_SMS_FLAG = "updatePwdSmsFlag"; + @PostMapping("/register") @ApiOperation(value = "注册", notes = "用户注册或绑定手机号接口") public ResponseEntity register(@Valid @RequestBody UserRegisterParam userRegisterParam) { @@ -54,19 +79,152 @@ public ResponseEntity updatePwd(@Valid @RequestBody UserRegisterParam user User user = userService.getOne(new LambdaQueryWrapper().eq(User::getUserMobile, userRegisterParam.getUserMail())); if (user == null) { // 无法获取用户信息 - throw new YamiShopBindException("yami.user.no.exist"); + throw new YamiShopBindException("无法获取用户信息"); } if (StrUtil.isBlank(userRegisterParam.getPassword())) { // 新密码不能为空 - throw new YamiShopBindException("yami.user.password.no.exist"); + throw new YamiShopBindException("新密码不能为空"); } if (StrUtil.equals(passwordEncoder.encode(userRegisterParam.getPassword()), user.getLoginPassword())) { // 新密码不能与原密码相同 - throw new YamiShopBindException("yami.user.password.check"); + throw new YamiShopBindException("新密码不能与原密码相同"); } user.setModifyTime(new Date()); user.setLoginPassword(passwordEncoder.encode(userRegisterParam.getPassword())); userService.updateById(user); return ResponseEntity.ok().build(); } + + @PutMapping("/registerOrBindUser") + @ApiOperation(value="注册或绑定手机号", notes="用户注册或绑定手机号接口") + public ResponseEntity register(HttpServletRequest request, HttpServletResponse response, @Valid @RequestBody UserRegisterParam userRegisterParam) { + + String mobile = userRegisterParam.getMobile(); + AppConnect appConnect = null; + User user = null; + String bizUserId = null; + boolean isWxAppId = Objects.equals(userRegisterParam.getAppType(), App.MINI.value()) || Objects.equals(userRegisterParam.getAppType(), App.MP.value()); + if(isWxAppId) { + bizUserId = SecurityUtils.getUser().getBizUserId(); + } + + // 正在进行注册，通过验证码校验 + if (Objects.equals(userRegisterParam.getRegisterOrBind(), 1)) { + + // 看看有没有校验验证码成功的标识 + userService.validate(userRegisterParam, CHECK_REGISTER_SMS_FLAG + userRegisterParam.getCheckRegisterSmsFlag()); + // 正在进行申请注册 + if (userService.count(new LambdaQueryWrapper().eq(User::getUserMobile,userRegisterParam.getMobile())) > 0) { + // 手机号已存在，无法注册 + throw new YamiShopBindException("yami.user.phone.exist"); + } + } + // 小程序注册/绑定手机号 + else { + YamiUser yamiUser = SecurityUtils.getUser(); + + appConnect = appConnectService.getByBizUserId(yamiUser.getBizUserId(), App.instance(yamiUser.getAppType())); + // 通过微信手机号校验 + if (Objects.equals(2, userRegisterParam.getValidateType())) { + try { + WxMaPhoneNumberInfo wxMaPhoneNumberInfo = wxConfig.wxMaService().getUserService().getPhoneNoInfo(yamiUser.getSessionKey(), userRegisterParam.getEncryptedData(), userRegisterParam.getIvStr()); + mobile = wxMaPhoneNumberInfo.getPhoneNumber(); + + } catch (Exception e) { + // 授权失败，请重新授权 + throw new YamiShopBindException(" 授权失败，请重新授权"); + } + if (StrUtil.isBlank(mobile)) { + // 无法获取用户手机号信息 + throw new YamiShopBindException("无法获取用户手机号信息"); + } + user = yamiUserDetailsService.loadUserByMobileOrUserName(mobile, 0); + } + // 通过账号密码校验 + else if (Objects.equals(3, userRegisterParam.getValidateType())) { + user = yamiUserDetailsService.loadUserByMobileOrUserName(mobile, 0); + if (user == null) { + // 账号或密码不正确 + throw new YamiShopBindException("yami.user.account.error"); + } + String encodedPassword = user.getLoginPassword(); + String rawPassword = userRegisterParam.getPassword(); + // 密码不正确 + if (StrUtil.isBlank(encodedPassword) || !passwordEncoder.matches(rawPassword,encodedPassword)){ + // 账号或密码不正确 + throw new YamiShopBindException("yami.user.account.error"); + } + } + // 通过验证码校验 + else { + if (!smsLogService.checkValidCode(userRegisterParam.getMobile(), userRegisterParam.getValidCode(), SmsType.VALID)){ + // 验证码有误或已过期 + throw new YamiShopBindException("yami.user.code.error"); + } + } + } + + Date now = new Date(); + + // 尝试用手机号获取用户信息 + if (user == null && StrUtil.isNotBlank(mobile)) { + user = userService.getOne(new LambdaQueryWrapper().eq(User::getUserMobile,mobile)); + } + + // 新建用户 + if (user == null) { + user = new User(); + if (StrUtil.isBlank(userRegisterParam.getUserName())) { + userRegisterParam.setUserName(mobile); + } + + // 如果有用户名,就判断用户名格式是否正确 + if (!PrincipalUtil.isUserName(userRegisterParam.getUserName())) { + throw new YamiShopBindException("用户名应由4-16位数字字母下划线组成"); + } + + user.setModifyTime(now); + user.setUserRegtime(now); + user.setUserRegip(IPHelper.getIpAddr()); + user.setStatus(1); + + user.setPic(userRegisterParam.getImg()); + user.setUserMobile(mobile); + if (StrUtil.isNotBlank(userRegisterParam.getPassword())) { + user.setLoginPassword(passwordEncoder.encode(userRegisterParam.getPassword())); + } + // 用户名就是默认的昵称 + user.setNickName(StrUtil.isBlank(userRegisterParam.getNickName())? userRegisterParam.getUserName(): userRegisterParam.getNickName()); +// } else { +// String userId = user.getUserId(); +// // 绑定账号 +// if (Objects.equals(userRegisterParam.getRegisterOrBind(),2)) { +// int count = appConnectService.count(new LambdaQueryWrapper().eq(AppConnect::getUserId, userId).eq(AppConnect::getAppId, userRegisterParam.getAppType())); +// if (count > 0) { +// throw new YamiShopBindException("该账号已被绑定，请换个账号试试"); +// } +// } + + } + if(Objects.nonNull(bizUserId)){ + appConnect = new AppConnect(); + appConnect.setBizUserId(bizUserId); + } + + appConnectService.registerOrBindUser(user, appConnect, userRegisterParam.getAppType()); + + + //进行授权登录 + UserDetails userDetails = yamiUserDetailsService.getYamiUser(userRegisterParam.getAppType(),user, bizUserId); + AuthenticationToken authenticationToken = new AuthenticationToken(); + authenticationToken.setPrincipal(user.getUserMobile()); + authenticationToken.setCredentials(user.getLoginPassword()); + authenticationToken.setPrincipal(userDetails.getUsername()); + authenticationToken.setDetails(userDetails); + authenticationToken.setAuthenticated(true); + loginAuthSuccessHandler.onAuthenticationSuccess(request,response,authenticationToken); + + return ResponseEntity.ok().build(); + } + } diff --git a/yami-shop-api/src/main/java/com/yami/shop/api/listener/ConfirmOrderListener.java b/yami-shop-api/src/main/java/com/yami/shop/api/listener/ConfirmOrderListener.java index d09d303e..55a8fad3 100644 --- a/yami-shop-api/src/main/java/com/yami/shop/api/listener/ConfirmOrderListener.java +++ b/yami-shop-api/src/main/java/com/yami/shop/api/listener/ConfirmOrderListener.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-api/src/main/java/com/yami/shop/api/listener/ShopCartListener.java b/yami-shop-api/src/main/java/com/yami/shop/api/listener/ShopCartListener.java index 64532b87..4c4087e5 100644 --- a/yami-shop-api/src/main/java/com/yami/shop/api/listener/ShopCartListener.java +++ b/yami-shop-api/src/main/java/com/yami/shop/api/listener/ShopCartListener.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-api/src/main/java/com/yami/shop/api/listener/SubmitOrderListener.java b/yami-shop-api/src/main/java/com/yami/shop/api/listener/SubmitOrderListener.java index fc5cef2c..42038ae5 100644 --- a/yami-shop-api/src/main/java/com/yami/shop/api/listener/SubmitOrderListener.java +++ b/yami-shop-api/src/main/java/com/yami/shop/api/listener/SubmitOrderListener.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-api/src/main/java/com/yami/shop/api/security/AuthenticationToken.java b/yami-shop-api/src/main/java/com/yami/shop/api/security/AuthenticationToken.java index 644c48da..dbc4bb64 100644 --- a/yami-shop-api/src/main/java/com/yami/shop/api/security/AuthenticationToken.java +++ b/yami-shop-api/src/main/java/com/yami/shop/api/security/AuthenticationToken.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-api/src/main/java/com/yami/shop/api/security/LoginAuthenticationFilter.java b/yami-shop-api/src/main/java/com/yami/shop/api/security/LoginAuthenticationFilter.java index a1fbed1a..25694f04 100644 --- a/yami-shop-api/src/main/java/com/yami/shop/api/security/LoginAuthenticationFilter.java +++ b/yami-shop-api/src/main/java/com/yami/shop/api/security/LoginAuthenticationFilter.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-api/src/main/java/com/yami/shop/api/security/MiniAppAuthenticationToken.java b/yami-shop-api/src/main/java/com/yami/shop/api/security/MiniAppAuthenticationToken.java index a1f192fd..b72b40cb 100644 --- a/yami-shop-api/src/main/java/com/yami/shop/api/security/MiniAppAuthenticationToken.java +++ b/yami-shop-api/src/main/java/com/yami/shop/api/security/MiniAppAuthenticationToken.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-api/src/main/java/com/yami/shop/api/security/ResourceServerConfiguration.java b/yami-shop-api/src/main/java/com/yami/shop/api/security/ResourceServerConfiguration.java index e9ba15bc..63e406db 100644 --- a/yami-shop-api/src/main/java/com/yami/shop/api/security/ResourceServerConfiguration.java +++ b/yami-shop-api/src/main/java/com/yami/shop/api/security/ResourceServerConfiguration.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-api/src/main/java/com/yami/shop/api/security/WebAuthenticationToken.java b/yami-shop-api/src/main/java/com/yami/shop/api/security/WebAuthenticationToken.java index 64f4738d..5c9bef43 100644 --- a/yami-shop-api/src/main/java/com/yami/shop/api/security/WebAuthenticationToken.java +++ b/yami-shop-api/src/main/java/com/yami/shop/api/security/WebAuthenticationToken.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-api/src/main/java/com/yami/shop/api/security/WebLoginAuthenticationFilter.java b/yami-shop-api/src/main/java/com/yami/shop/api/security/WebLoginAuthenticationFilter.java index e9f2a53d..0717541c 100644 --- a/yami-shop-api/src/main/java/com/yami/shop/api/security/WebLoginAuthenticationFilter.java +++ b/yami-shop-api/src/main/java/com/yami/shop/api/security/WebLoginAuthenticationFilter.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * @@ -11,21 +11,35 @@ package com.yami.shop.api.security; import cn.binarywang.wx.miniapp.api.WxMaService; +import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult; +import cn.hutool.core.util.BooleanUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.extra.servlet.ServletUtil; import com.yami.shop.common.util.Json; +import com.yami.shop.common.util.RedisUtil; +import com.yami.shop.security.constants.SecurityConstants; import com.yami.shop.security.enums.App; +import com.yami.shop.security.exception.BadCredentialsExceptionBase; +import com.yami.shop.security.exception.ImageCodeNotMatchExceptionBase; +import com.yami.shop.security.exception.UsernameNotFoundExceptionBase; +import com.yami.shop.security.exception.WxErrorExceptionBase; import com.yami.shop.security.model.AppConnect; import com.yami.shop.security.service.YamiUser; import com.yami.shop.security.service.YamiUserDetailsService; +import com.yami.shop.security.token.MyAuthenticationToken; +import lombok.AllArgsConstructor; +import me.chanjar.weixin.common.error.WxErrorException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.authentication.AuthenticationManager; import org.springframework.security.authentication.AuthenticationServiceException; import org.springframework.security.core.Authentication; import org.springframework.security.core.AuthenticationException; +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.security.web.authentication.AbstractAuthenticationProcessingFilter; import org.springframework.security.web.authentication.AuthenticationFailureHandler; import org.springframework.security.web.authentication.AuthenticationSuccessHandler; +import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; import org.springframework.stereotype.Component; import javax.servlet.ServletInputStream; diff --git a/yami-shop-api/src/main/java/com/yami/shop/api/security/YamiAuthenticationProcessingFilter.java b/yami-shop-api/src/main/java/com/yami/shop/api/security/YamiAuthenticationProcessingFilter.java index ba0a9f29..85763c28 100644 --- a/yami-shop-api/src/main/java/com/yami/shop/api/security/YamiAuthenticationProcessingFilter.java +++ b/yami-shop-api/src/main/java/com/yami/shop/api/security/YamiAuthenticationProcessingFilter.java @@ -72,7 +72,7 @@ public void setAuthenticationFailureHandler(AuthenticationFailureHandler failure } @Override - public Authentication attemptAuthentication(HttpServletRequest request, HttpServletResponse response) throws AuthenticationException, ServletException { + public Authentication attemptAuthentication(HttpServletRequest request, HttpServletResponse response) throws AuthenticationException, ServletException{ if (!ServletUtil.METHOD_POST.equals(request.getMethod())) { throw new HttpRequestMethodNotSupportedException(request.getMethod(), new String[] { "POST" }); } diff --git a/yami-shop-api/src/main/java/com/yami/shop/api/security/YamiUserServiceImpl.java b/yami-shop-api/src/main/java/com/yami/shop/api/security/YamiUserServiceImpl.java index 72a47a65..f7608217 100644 --- a/yami-shop-api/src/main/java/com/yami/shop/api/security/YamiUserServiceImpl.java +++ b/yami-shop-api/src/main/java/com/yami/shop/api/security/YamiUserServiceImpl.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * @@ -13,13 +13,16 @@ import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.extra.emoji.EmojiUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.yami.shop.bean.model.User; import com.yami.shop.common.annotation.RedisLock; import com.yami.shop.common.exception.YamiShopBindException; import com.yami.shop.common.util.CacheManagerUtil; +import com.yami.shop.common.util.PrincipalUtil; import com.yami.shop.dao.UserMapper; import com.yami.shop.security.dao.AppConnectMapper; import com.yami.shop.security.enums.App; +import com.yami.shop.security.exception.UsernameNotFoundException; import com.yami.shop.security.exception.UsernameNotFoundExceptionBase; import com.yami.shop.security.model.AppConnect; import com.yami.shop.security.service.YamiUser; @@ -133,12 +136,12 @@ public void insertUserIfNecessary(AppConnect appConnect) { public YamiUser loadUserByUserMail(String userMail, String loginPassword) { User user = userMapper.getUserByUserMail(userMail); if (user == null) { - throw new YamiShopBindException("用户不存在"); + throw new UsernameNotFoundException("用户不存在"); } - String paramPassword = passwordEncoder.encode(loginPassword); + if (!passwordEncoder.matches(loginPassword, user.getLoginPassword())) { // 原密码不正确 - throw new YamiShopBindException("密码不正确"); + throw new UsernameNotFoundException("密码不正确"); } String name = StrUtil.isBlank(user.getRealName()) ? user.getNickName() : user.getRealName(); YamiUser yamiUser = new YamiUser(user.getUserId(), loginPassword, user.getStatus() == 1); @@ -146,4 +149,28 @@ public YamiUser loadUserByUserMail(String userMail, String loginPassword) { yamiUser.setPic(user.getPic()); return yamiUser; } + + @Override + public User loadUserByMobileOrUserName(String mobileOrUserName, Integer loginType) { + User user = null; + // 手机验证码登陆，或传过来的账号很像手机号 + if (Objects.equals(loginType, 1) || PrincipalUtil.isMobile(mobileOrUserName)) { + user = userMapper.selectOne(new LambdaQueryWrapper().eq(User::getUserMobile, mobileOrUserName)); + } + return user; + } + + @Override + public YamiUser getYamiUser(Integer appId, User user, String bizUserId) { + String name = StrUtil.isBlank(user.getRealName()) ? user.getNickName() : user.getRealName(); + YamiUser yamiUser = new YamiUser(); + yamiUser.setEnabled(user.getStatus() == 1); + yamiUser.setUserId(user.getUserId()); + yamiUser.setBizUserId(bizUserId); + yamiUser.setAppType(appId); + yamiUser.setName(name); + yamiUser.setPic(user.getPic()); + yamiUser.setPassword(user.getLoginPassword()); + return yamiUser; + } } diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/SmsInfoContext.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/SmsInfoContext.java index 27701dc1..ae1c36a1 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/SmsInfoContext.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/SmsInfoContext.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/BasketItemDto.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/BasketItemDto.java index b1263fd5..e0de736e 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/BasketItemDto.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/BasketItemDto.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/CategoryDto.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/CategoryDto.java index 9c05ff7c..05a1feec 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/CategoryDto.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/CategoryDto.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ChooseDiscountItemDto.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ChooseDiscountItemDto.java index 7a5049a5..6a335f44 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ChooseDiscountItemDto.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ChooseDiscountItemDto.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/CouponOrderDto.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/CouponOrderDto.java index 2b334ba4..6c36315b 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/CouponOrderDto.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/CouponOrderDto.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/DeliveryDto.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/DeliveryDto.java index 7b8918f9..88ed3990 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/DeliveryDto.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/DeliveryDto.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/DeliveryInfoDto.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/DeliveryInfoDto.java index 49536ceb..16d5c071 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/DeliveryInfoDto.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/DeliveryInfoDto.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/DiscountDto.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/DiscountDto.java index b41a044a..8ca1d485 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/DiscountDto.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/DiscountDto.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/IndexImgDto.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/IndexImgDto.java index 8614ddb6..6d4d8742 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/IndexImgDto.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/IndexImgDto.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/MyOrderDto.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/MyOrderDto.java index 64a8833b..c95e264e 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/MyOrderDto.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/MyOrderDto.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/MyOrderItemDto.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/MyOrderItemDto.java index cd18e743..32d58c54 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/MyOrderItemDto.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/MyOrderItemDto.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/NoticeDto.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/NoticeDto.java index d4066f97..b7ffbc11 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/NoticeDto.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/NoticeDto.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/OrderCountData.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/OrderCountData.java index dead41cf..4c784525 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/OrderCountData.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/OrderCountData.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/OrderItemDto.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/OrderItemDto.java index 1fdd5ba9..a90891db 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/OrderItemDto.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/OrderItemDto.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/OrderNumbersDto.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/OrderNumbersDto.java index c14266fa..eb4e5193 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/OrderNumbersDto.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/OrderNumbersDto.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/OrderShopDto.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/OrderShopDto.java index 94f2063e..5ef49700 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/OrderShopDto.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/OrderShopDto.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ProdCommDataDto.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ProdCommDataDto.java index b69937d1..8c766fa4 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ProdCommDataDto.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ProdCommDataDto.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ProdCommDto.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ProdCommDto.java index 70d48013..85b124a5 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ProdCommDto.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ProdCommDto.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ProdTagDto.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ProdTagDto.java index a618003b..c57de98d 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ProdTagDto.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ProdTagDto.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ProductDto.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ProductDto.java index 8a9fa087..bdd164ed 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ProductDto.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ProductDto.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ProductItemDto.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ProductItemDto.java index 7fedc0f1..029c5434 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ProductItemDto.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ProductItemDto.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ShopCartAmountDto.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ShopCartAmountDto.java index 52c24dbb..3f23ac59 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ShopCartAmountDto.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ShopCartAmountDto.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ShopCartDto.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ShopCartDto.java index ea5ddea3..86130589 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ShopCartDto.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ShopCartDto.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ShopCartExpiryItemDto.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ShopCartExpiryItemDto.java index 4f5a2b7a..5d08c4c4 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ShopCartExpiryItemDto.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ShopCartExpiryItemDto.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ShopCartItemDiscountDto.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ShopCartItemDiscountDto.java index 76380a64..a1163286 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ShopCartItemDiscountDto.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ShopCartItemDiscountDto.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ShopCartItemDto.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ShopCartItemDto.java index 56e992fc..8437e13f 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ShopCartItemDto.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ShopCartItemDto.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ShopCartOrderDto.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ShopCartOrderDto.java index fcb10a34..636bfd7a 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ShopCartOrderDto.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ShopCartOrderDto.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ShopCartOrderMergerDto.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ShopCartOrderMergerDto.java index 69a3d559..13a1e6f5 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ShopCartOrderMergerDto.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ShopCartOrderMergerDto.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/SkuDto.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/SkuDto.java index 48c8aec4..aa14d908 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/SkuDto.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/SkuDto.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/TagProductDto.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/TagProductDto.java index 346c5704..f3625851 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/TagProductDto.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/TagProductDto.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/UserAddrDto.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/UserAddrDto.java index d3cc349b..d2cc3402 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/UserAddrDto.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/UserAddrDto.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/UserCollectionDto.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/UserCollectionDto.java index d719b69b..21fa2a0f 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/UserCollectionDto.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/UserCollectionDto.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/UserDto.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/UserDto.java index ecfc06be..b1e1f4cc 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/UserDto.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/UserDto.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/AddrParam.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/AddrParam.java index 30cba060..2fdf94c1 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/AddrParam.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/AddrParam.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/ChangeShopCartParam.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/ChangeShopCartParam.java index ec165df1..982df08d 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/ChangeShopCartParam.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/ChangeShopCartParam.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/LoginParam.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/LoginParam.java index b82d67ff..a21bd148 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/LoginParam.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/LoginParam.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/OrderItemParam.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/OrderItemParam.java index 444c51ea..398f8cfc 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/OrderItemParam.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/OrderItemParam.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/OrderParam.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/OrderParam.java index a97d621f..123a0daf 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/OrderParam.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/OrderParam.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/OrderShopParam.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/OrderShopParam.java index f68b5c4e..0b0ac2ca 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/OrderShopParam.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/OrderShopParam.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/PayParam.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/PayParam.java index 5c21c2c8..f3cefa11 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/PayParam.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/PayParam.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/ProdCommParam.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/ProdCommParam.java index 8c487657..2afcc6f4 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/ProdCommParam.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/ProdCommParam.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/SendSmsParam.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/SendSmsParam.java index 4038c10a..dcb484b2 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/SendSmsParam.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/SendSmsParam.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/ShopCartParam.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/ShopCartParam.java index cafc53a1..e0b212ed 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/ShopCartParam.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/ShopCartParam.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/ShopCartParams.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/ShopCartParams.java index fe1b2d63..c6207acd 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/ShopCartParams.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/ShopCartParams.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/SubmitOrderParam.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/SubmitOrderParam.java index 62cd2eb9..8a5b25d9 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/SubmitOrderParam.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/SubmitOrderParam.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/UserInfoParam.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/UserInfoParam.java index ae57a053..0c6a796e 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/UserInfoParam.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/UserInfoParam.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/bo/SmsInfoBo.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/bo/SmsInfoBo.java index a071d407..a2c0b085 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/bo/SmsInfoBo.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/bo/SmsInfoBo.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/distribution/UserShoppingDataDto.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/distribution/UserShoppingDataDto.java index 4372626d..006892e1 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/distribution/UserShoppingDataDto.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/distribution/UserShoppingDataDto.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/dto/HotSearchDto.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/dto/HotSearchDto.java index 1ef8b9bc..490ed434 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/dto/HotSearchDto.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/dto/HotSearchDto.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/dto/ProductDto.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/dto/ProductDto.java index 8af87dd5..e3de016e 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/dto/ProductDto.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/dto/ProductDto.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/dto/SearchProdDto.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/dto/SearchProdDto.java index b2adece0..b84351c4 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/dto/SearchProdDto.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/dto/SearchProdDto.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/dto/TinymceEditorDto.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/dto/TinymceEditorDto.java index 4d8c8c55..accb2b56 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/dto/TinymceEditorDto.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/dto/TinymceEditorDto.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/enums/MessageStatus.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/enums/MessageStatus.java index 37113b38..0ffb2356 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/enums/MessageStatus.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/enums/MessageStatus.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/enums/OrderEntry.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/enums/OrderEntry.java index 6b0fb71c..3bdda5f6 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/enums/OrderEntry.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/enums/OrderEntry.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/enums/OrderStatus.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/enums/OrderStatus.java index b9ecccf7..6e2c6ffa 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/enums/OrderStatus.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/enums/OrderStatus.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/enums/PayType.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/enums/PayType.java index 92d86374..3fcecc21 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/enums/PayType.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/enums/PayType.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/enums/ProdPropRule.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/enums/ProdPropRule.java index 21a96dee..9d9655d1 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/enums/ProdPropRule.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/enums/ProdPropRule.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/enums/SmsType.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/enums/SmsType.java index 4df0c127..5b7347ae 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/enums/SmsType.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/enums/SmsType.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/enums/TransportChargeType.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/enums/TransportChargeType.java index 3435821c..ce38a44d 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/enums/TransportChargeType.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/enums/TransportChargeType.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/event/CancelOrderEvent.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/event/CancelOrderEvent.java index 573b807f..50bab039 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/event/CancelOrderEvent.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/event/CancelOrderEvent.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/event/ConfirmOrderEvent.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/event/ConfirmOrderEvent.java index 68c564a6..5fbedf78 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/event/ConfirmOrderEvent.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/event/ConfirmOrderEvent.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/event/PaySuccessOrderEvent.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/event/PaySuccessOrderEvent.java index aaa8c8b2..370cf036 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/event/PaySuccessOrderEvent.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/event/PaySuccessOrderEvent.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/event/ReceiptOrderEvent.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/event/ReceiptOrderEvent.java index ce80b0c5..1249e80b 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/event/ReceiptOrderEvent.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/event/ReceiptOrderEvent.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/event/ShopCartEvent.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/event/ShopCartEvent.java index 742a54dc..fb6946eb 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/event/ShopCartEvent.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/event/ShopCartEvent.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/event/SubmitOrderEvent.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/event/SubmitOrderEvent.java index bf72c9e5..8e7840ad 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/event/SubmitOrderEvent.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/event/SubmitOrderEvent.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/Area.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/Area.java index 8780187a..3a6ce8b9 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/Area.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/Area.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/AttachFile.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/AttachFile.java index 7912cfe1..09f82f15 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/AttachFile.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/AttachFile.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/Basket.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/Basket.java index a7c0ee33..763ea02b 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/Basket.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/Basket.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/Brand.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/Brand.java index 61d03bd0..6feec039 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/Brand.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/Brand.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/Category.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/Category.java index b6b2317c..bbe04853 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/Category.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/Category.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/CategoryBrand.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/CategoryBrand.java index 57b21920..de7eb868 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/CategoryBrand.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/CategoryBrand.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/CategoryProp.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/CategoryProp.java index eee57abc..69648882 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/CategoryProp.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/CategoryProp.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/Delivery.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/Delivery.java index 36524421..e19dd927 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/Delivery.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/Delivery.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/HotSearch.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/HotSearch.java index 3928a8c2..9a87b73a 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/HotSearch.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/HotSearch.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/IndexImg.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/IndexImg.java index 2847efb9..2a383d53 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/IndexImg.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/IndexImg.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/LoginHist.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/LoginHist.java index 1083185c..6f8037ac 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/LoginHist.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/LoginHist.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/Message.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/Message.java index e4362335..d4ee9819 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/Message.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/Message.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/Notice.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/Notice.java index b4026e91..dbb4a1ac 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/Notice.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/Notice.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/Order.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/Order.java index 859dc70a..7e09fad0 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/Order.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/Order.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/OrderItem.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/OrderItem.java index 0f152f71..42b25cde 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/OrderItem.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/OrderItem.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/OrderRefund.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/OrderRefund.java index 150e5f0f..513fd792 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/OrderRefund.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/OrderRefund.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/OrderSettlement.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/OrderSettlement.java index 3e067b2f..e1fe76f3 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/OrderSettlement.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/OrderSettlement.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/PickAddr.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/PickAddr.java index 71ca959a..2fffa977 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/PickAddr.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/PickAddr.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/ProdComm.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/ProdComm.java index 096165bd..14470515 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/ProdComm.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/ProdComm.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/ProdImg.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/ProdImg.java index e9fc2e82..e5b80c80 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/ProdImg.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/ProdImg.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/ProdProp.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/ProdProp.java index 7e508c50..4bde5ab6 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/ProdProp.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/ProdProp.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/ProdPropValue.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/ProdPropValue.java index bef03598..0b0a2be2 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/ProdPropValue.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/ProdPropValue.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/ProdTag.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/ProdTag.java index c46a903b..a0b93ecb 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/ProdTag.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/ProdTag.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/ProdTagReference.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/ProdTagReference.java index 7e2133ca..4cb1ad0a 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/ProdTagReference.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/ProdTagReference.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/Product.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/Product.java index 9dce48c0..425d9b16 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/Product.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/Product.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/ShopDetail.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/ShopDetail.java index 5a8c1168..4e051065 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/ShopDetail.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/ShopDetail.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/Sku.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/Sku.java index 4b461f4f..08c055ab 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/Sku.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/Sku.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/SmsLog.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/SmsLog.java index 679dc87e..29e09204 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/SmsLog.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/SmsLog.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/Transcity.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/Transcity.java index a9cc96ae..402b19bf 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/Transcity.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/Transcity.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/TranscityFree.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/TranscityFree.java index 0cc606a9..4088d690 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/TranscityFree.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/TranscityFree.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/Transfee.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/Transfee.java index 2d358a03..9bc481ca 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/Transfee.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/Transfee.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/TransfeeFree.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/TransfeeFree.java index 59301f51..bfae8b8b 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/TransfeeFree.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/TransfeeFree.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/Transport.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/Transport.java index afd4739c..b6dbcf3e 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/Transport.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/Transport.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/User.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/User.java index db1b02cc..60bba252 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/User.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/User.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/UserAddr.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/UserAddr.java index 46c0d4dc..63a89e99 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/UserAddr.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/UserAddr.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/UserAddrOrder.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/UserAddrOrder.java index 72f28248..536b974f 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/UserAddrOrder.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/UserAddrOrder.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/UserCollection.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/UserCollection.java index d72ae474..2ac0a172 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/UserCollection.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/UserCollection.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/order/ConfirmOrderOrder.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/order/ConfirmOrderOrder.java index 3c4a548a..290f3d45 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/order/ConfirmOrderOrder.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/order/ConfirmOrderOrder.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/order/ShopCartEventOrder.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/order/ShopCartEventOrder.java index dd9d2747..36b3fda6 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/order/ShopCartEventOrder.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/order/ShopCartEventOrder.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/order/SubmitOrderOrder.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/order/SubmitOrderOrder.java index d91ed59f..d4ef4f5b 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/order/SubmitOrderOrder.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/order/SubmitOrderOrder.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/param/DeliveryOrderParam.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/param/DeliveryOrderParam.java index c9c85fbf..a111f745 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/param/DeliveryOrderParam.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/param/DeliveryOrderParam.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/param/OrderParam.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/param/OrderParam.java index a311fe3f..3ba9a8a5 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/param/OrderParam.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/param/OrderParam.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/param/ProductParam.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/param/ProductParam.java index a1734760..4d7688ba 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/param/ProductParam.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/param/ProductParam.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/param/ShopDetailParam.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/param/ShopDetailParam.java index a4842838..a3a262e8 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/param/ShopDetailParam.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/param/ShopDetailParam.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/param/UserRegisterParam.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/param/UserRegisterParam.java index faa9210c..a13a1e81 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/param/UserRegisterParam.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/param/UserRegisterParam.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * @@ -32,4 +32,28 @@ public class UserRegisterParam { @ApiModelProperty(value = "应用类型 1小程序 2微信公众号 3 PC 4 h5") private Integer appType; + + @ApiModelProperty(value = "手机号") + private String mobile; + + @ApiModelProperty(value = "验证码") + private String validCode; + + @ApiModelProperty(value = "微信小程序的encryptedData") + private String encryptedData; + + @ApiModelProperty(value = "微信小程序的ivStr") + private String ivStr; + + @ApiModelProperty(value = "头像") + private String img; + + @ApiModelProperty(value = "校验登陆注册验证码成功的标识") + private String checkRegisterSmsFlag; + + @ApiModelProperty(value = "验证类型 1验证码验证 2 小程序encryptedData验证 3 密码验证 ") + private Integer validateType; + + @ApiModelProperty(value = "验证类型 1注册 2绑定 ") + private Integer registerOrBind; } diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/pay/PayInfoDto.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/pay/PayInfoDto.java index 9a396597..f792bfea 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/pay/PayInfoDto.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/pay/PayInfoDto.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/vo/SysUserVO.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/vo/SysUserVO.java index eb8a8b82..7c4dc819 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/vo/SysUserVO.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/vo/SysUserVO.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/vo/UserVO.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/vo/UserVO.java index df8f658f..8948bbda 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/vo/UserVO.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/vo/UserVO.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-common/src/main/java/com/yami/shop/common/annotation/RedisLock.java b/yami-shop-common/src/main/java/com/yami/shop/common/annotation/RedisLock.java index 14200606..4058530a 100644 --- a/yami-shop-common/src/main/java/com/yami/shop/common/annotation/RedisLock.java +++ b/yami-shop-common/src/main/java/com/yami/shop/common/annotation/RedisLock.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-common/src/main/java/com/yami/shop/common/annotation/SysLog.java b/yami-shop-common/src/main/java/com/yami/shop/common/annotation/SysLog.java index c354dd71..a506e141 100644 --- a/yami-shop-common/src/main/java/com/yami/shop/common/annotation/SysLog.java +++ b/yami-shop-common/src/main/java/com/yami/shop/common/annotation/SysLog.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-common/src/main/java/com/yami/shop/common/aspect/RedisLockAspect.java b/yami-shop-common/src/main/java/com/yami/shop/common/aspect/RedisLockAspect.java index e813bd8b..e47cee76 100644 --- a/yami-shop-common/src/main/java/com/yami/shop/common/aspect/RedisLockAspect.java +++ b/yami-shop-common/src/main/java/com/yami/shop/common/aspect/RedisLockAspect.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-common/src/main/java/com/yami/shop/common/bean/ALiDaYu.java b/yami-shop-common/src/main/java/com/yami/shop/common/bean/ALiDaYu.java index 7142462d..78142985 100644 --- a/yami-shop-common/src/main/java/com/yami/shop/common/bean/ALiDaYu.java +++ b/yami-shop-common/src/main/java/com/yami/shop/common/bean/ALiDaYu.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-common/src/main/java/com/yami/shop/common/bean/Qiniu.java b/yami-shop-common/src/main/java/com/yami/shop/common/bean/Qiniu.java index 5b50bf7d..c112bab0 100644 --- a/yami-shop-common/src/main/java/com/yami/shop/common/bean/Qiniu.java +++ b/yami-shop-common/src/main/java/com/yami/shop/common/bean/Qiniu.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-common/src/main/java/com/yami/shop/common/config/DefaultExceptionHandlerConfig.java b/yami-shop-common/src/main/java/com/yami/shop/common/config/DefaultExceptionHandlerConfig.java index 46ac3020..cc27d86d 100644 --- a/yami-shop-common/src/main/java/com/yami/shop/common/config/DefaultExceptionHandlerConfig.java +++ b/yami-shop-common/src/main/java/com/yami/shop/common/config/DefaultExceptionHandlerConfig.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-common/src/main/java/com/yami/shop/common/config/FileUploadConfig.java b/yami-shop-common/src/main/java/com/yami/shop/common/config/FileUploadConfig.java index cee436c5..086ced73 100644 --- a/yami-shop-common/src/main/java/com/yami/shop/common/config/FileUploadConfig.java +++ b/yami-shop-common/src/main/java/com/yami/shop/common/config/FileUploadConfig.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-common/src/main/java/com/yami/shop/common/config/MybatisPlusConfig.java b/yami-shop-common/src/main/java/com/yami/shop/common/config/MybatisPlusConfig.java index 3bba6b48..727516b9 100644 --- a/yami-shop-common/src/main/java/com/yami/shop/common/config/MybatisPlusConfig.java +++ b/yami-shop-common/src/main/java/com/yami/shop/common/config/MybatisPlusConfig.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-common/src/main/java/com/yami/shop/common/config/OrikaConfig.java b/yami-shop-common/src/main/java/com/yami/shop/common/config/OrikaConfig.java index dc7a010d..76ffc04c 100644 --- a/yami-shop-common/src/main/java/com/yami/shop/common/config/OrikaConfig.java +++ b/yami-shop-common/src/main/java/com/yami/shop/common/config/OrikaConfig.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-common/src/main/java/com/yami/shop/common/config/RedisCacheConfig.java b/yami-shop-common/src/main/java/com/yami/shop/common/config/RedisCacheConfig.java index db8cdc90..8526f299 100644 --- a/yami-shop-common/src/main/java/com/yami/shop/common/config/RedisCacheConfig.java +++ b/yami-shop-common/src/main/java/com/yami/shop/common/config/RedisCacheConfig.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-common/src/main/java/com/yami/shop/common/config/ShopBasicConfig.java b/yami-shop-common/src/main/java/com/yami/shop/common/config/ShopBasicConfig.java index 2f603f81..503f894b 100644 --- a/yami-shop-common/src/main/java/com/yami/shop/common/config/ShopBasicConfig.java +++ b/yami-shop-common/src/main/java/com/yami/shop/common/config/ShopBasicConfig.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-common/src/main/java/com/yami/shop/common/config/ShopBeanConfig.java b/yami-shop-common/src/main/java/com/yami/shop/common/config/ShopBeanConfig.java index 656b9b45..4d975b4c 100644 --- a/yami-shop-common/src/main/java/com/yami/shop/common/config/ShopBeanConfig.java +++ b/yami-shop-common/src/main/java/com/yami/shop/common/config/ShopBeanConfig.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-common/src/main/java/com/yami/shop/common/enums/YamiHttpStatus.java b/yami-shop-common/src/main/java/com/yami/shop/common/enums/YamiHttpStatus.java index cae0cb0f..4bc06921 100644 --- a/yami-shop-common/src/main/java/com/yami/shop/common/enums/YamiHttpStatus.java +++ b/yami-shop-common/src/main/java/com/yami/shop/common/enums/YamiHttpStatus.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-common/src/main/java/com/yami/shop/common/exception/YamiShopBindException.java b/yami-shop-common/src/main/java/com/yami/shop/common/exception/YamiShopBindException.java index 1cb20e17..3aef8417 100644 --- a/yami-shop-common/src/main/java/com/yami/shop/common/exception/YamiShopBindException.java +++ b/yami-shop-common/src/main/java/com/yami/shop/common/exception/YamiShopBindException.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-common/src/main/java/com/yami/shop/common/filter/FilterConfig.java b/yami-shop-common/src/main/java/com/yami/shop/common/filter/FilterConfig.java index 11a55d14..1ba995cf 100644 --- a/yami-shop-common/src/main/java/com/yami/shop/common/filter/FilterConfig.java +++ b/yami-shop-common/src/main/java/com/yami/shop/common/filter/FilterConfig.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-common/src/main/java/com/yami/shop/common/filter/XssFilter.java b/yami-shop-common/src/main/java/com/yami/shop/common/filter/XssFilter.java index 81e09765..0109b43e 100644 --- a/yami-shop-common/src/main/java/com/yami/shop/common/filter/XssFilter.java +++ b/yami-shop-common/src/main/java/com/yami/shop/common/filter/XssFilter.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-common/src/main/java/com/yami/shop/common/response/ResponseCode.java b/yami-shop-common/src/main/java/com/yami/shop/common/response/ResponseCode.java index 8866a4d4..2aa5f537 100644 --- a/yami-shop-common/src/main/java/com/yami/shop/common/response/ResponseCode.java +++ b/yami-shop-common/src/main/java/com/yami/shop/common/response/ResponseCode.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-common/src/main/java/com/yami/shop/common/response/ServerResponse.java b/yami-shop-common/src/main/java/com/yami/shop/common/response/ServerResponse.java index 49e833c0..3865203d 100644 --- a/yami-shop-common/src/main/java/com/yami/shop/common/response/ServerResponse.java +++ b/yami-shop-common/src/main/java/com/yami/shop/common/response/ServerResponse.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-common/src/main/java/com/yami/shop/common/response/ServerResponseEntity.java b/yami-shop-common/src/main/java/com/yami/shop/common/response/ServerResponseEntity.java index 1e3843ea..ee2495d3 100644 --- a/yami-shop-common/src/main/java/com/yami/shop/common/response/ServerResponseEntity.java +++ b/yami-shop-common/src/main/java/com/yami/shop/common/response/ServerResponseEntity.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-common/src/main/java/com/yami/shop/common/serializer/FSTSerializer.java b/yami-shop-common/src/main/java/com/yami/shop/common/serializer/FSTSerializer.java index 265e3a9f..12d616e5 100644 --- a/yami-shop-common/src/main/java/com/yami/shop/common/serializer/FSTSerializer.java +++ b/yami-shop-common/src/main/java/com/yami/shop/common/serializer/FSTSerializer.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-common/src/main/java/com/yami/shop/common/serializer/json/EmojiJsonSerializer.java b/yami-shop-common/src/main/java/com/yami/shop/common/serializer/json/EmojiJsonSerializer.java index c5ae6b21..b23e36d3 100644 --- a/yami-shop-common/src/main/java/com/yami/shop/common/serializer/json/EmojiJsonSerializer.java +++ b/yami-shop-common/src/main/java/com/yami/shop/common/serializer/json/EmojiJsonSerializer.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-common/src/main/java/com/yami/shop/common/serializer/json/ImgJsonSerializer.java b/yami-shop-common/src/main/java/com/yami/shop/common/serializer/json/ImgJsonSerializer.java index 3d4c922e..52ad4d97 100644 --- a/yami-shop-common/src/main/java/com/yami/shop/common/serializer/json/ImgJsonSerializer.java +++ b/yami-shop-common/src/main/java/com/yami/shop/common/serializer/json/ImgJsonSerializer.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-common/src/main/java/com/yami/shop/common/serializer/redis/FstRedisSerializer.java b/yami-shop-common/src/main/java/com/yami/shop/common/serializer/redis/FstRedisSerializer.java index 37b6ad86..aa55cae2 100644 --- a/yami-shop-common/src/main/java/com/yami/shop/common/serializer/redis/FstRedisSerializer.java +++ b/yami-shop-common/src/main/java/com/yami/shop/common/serializer/redis/FstRedisSerializer.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-common/src/main/java/com/yami/shop/common/serializer/redisson/FstCodec.java b/yami-shop-common/src/main/java/com/yami/shop/common/serializer/redisson/FstCodec.java index 526b13fb..d2f9e958 100644 --- a/yami-shop-common/src/main/java/com/yami/shop/common/serializer/redisson/FstCodec.java +++ b/yami-shop-common/src/main/java/com/yami/shop/common/serializer/redisson/FstCodec.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-common/src/main/java/com/yami/shop/common/serializer/springfox/SpringFoxJsonSerializerConfig.java b/yami-shop-common/src/main/java/com/yami/shop/common/serializer/springfox/SpringFoxJsonSerializerConfig.java index a5122ec5..019fe49e 100644 --- a/yami-shop-common/src/main/java/com/yami/shop/common/serializer/springfox/SpringFoxJsonSerializerConfig.java +++ b/yami-shop-common/src/main/java/com/yami/shop/common/serializer/springfox/SpringFoxJsonSerializerConfig.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-common/src/main/java/com/yami/shop/common/serializer/springfox/SpringfoxJsonSerializer.java b/yami-shop-common/src/main/java/com/yami/shop/common/serializer/springfox/SpringfoxJsonSerializer.java index 1ce03ce7..cf3af6c2 100644 --- a/yami-shop-common/src/main/java/com/yami/shop/common/serializer/springfox/SpringfoxJsonSerializer.java +++ b/yami-shop-common/src/main/java/com/yami/shop/common/serializer/springfox/SpringfoxJsonSerializer.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-common/src/main/java/com/yami/shop/common/util/Arith.java b/yami-shop-common/src/main/java/com/yami/shop/common/util/Arith.java index 242c73dc..4e161411 100644 --- a/yami-shop-common/src/main/java/com/yami/shop/common/util/Arith.java +++ b/yami-shop-common/src/main/java/com/yami/shop/common/util/Arith.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-common/src/main/java/com/yami/shop/common/util/CacheManagerUtil.java b/yami-shop-common/src/main/java/com/yami/shop/common/util/CacheManagerUtil.java index f8ba0fb9..743b4687 100644 --- a/yami-shop-common/src/main/java/com/yami/shop/common/util/CacheManagerUtil.java +++ b/yami-shop-common/src/main/java/com/yami/shop/common/util/CacheManagerUtil.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-common/src/main/java/com/yami/shop/common/util/HttpContextUtils.java b/yami-shop-common/src/main/java/com/yami/shop/common/util/HttpContextUtils.java index 08d491e6..18e8d585 100644 --- a/yami-shop-common/src/main/java/com/yami/shop/common/util/HttpContextUtils.java +++ b/yami-shop-common/src/main/java/com/yami/shop/common/util/HttpContextUtils.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-common/src/main/java/com/yami/shop/common/util/IPHelper.java b/yami-shop-common/src/main/java/com/yami/shop/common/util/IPHelper.java index 88260976..9edd1613 100644 --- a/yami-shop-common/src/main/java/com/yami/shop/common/util/IPHelper.java +++ b/yami-shop-common/src/main/java/com/yami/shop/common/util/IPHelper.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-common/src/main/java/com/yami/shop/common/util/IdUtil.java b/yami-shop-common/src/main/java/com/yami/shop/common/util/IdUtil.java index 3dc94f0f..85ab58cf 100644 --- a/yami-shop-common/src/main/java/com/yami/shop/common/util/IdUtil.java +++ b/yami-shop-common/src/main/java/com/yami/shop/common/util/IdUtil.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-common/src/main/java/com/yami/shop/common/util/Json.java b/yami-shop-common/src/main/java/com/yami/shop/common/util/Json.java index 143a2196..2cdaa7aa 100644 --- a/yami-shop-common/src/main/java/com/yami/shop/common/util/Json.java +++ b/yami-shop-common/src/main/java/com/yami/shop/common/util/Json.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-common/src/main/java/com/yami/shop/common/util/PageAdapter.java b/yami-shop-common/src/main/java/com/yami/shop/common/util/PageAdapter.java index 0fdc900e..53a7a28d 100644 --- a/yami-shop-common/src/main/java/com/yami/shop/common/util/PageAdapter.java +++ b/yami-shop-common/src/main/java/com/yami/shop/common/util/PageAdapter.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-common/src/main/java/com/yami/shop/common/util/PageParam.java b/yami-shop-common/src/main/java/com/yami/shop/common/util/PageParam.java index 475ae9a2..e91d19fa 100644 --- a/yami-shop-common/src/main/java/com/yami/shop/common/util/PageParam.java +++ b/yami-shop-common/src/main/java/com/yami/shop/common/util/PageParam.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-common/src/main/java/com/yami/shop/common/util/RedisUtil.java b/yami-shop-common/src/main/java/com/yami/shop/common/util/RedisUtil.java index e6c7a6e4..fb71ecbd 100644 --- a/yami-shop-common/src/main/java/com/yami/shop/common/util/RedisUtil.java +++ b/yami-shop-common/src/main/java/com/yami/shop/common/util/RedisUtil.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-common/src/main/java/com/yami/shop/common/util/SimpleCaptcha.java b/yami-shop-common/src/main/java/com/yami/shop/common/util/SimpleCaptcha.java index 876703e1..0e0c7bd9 100644 --- a/yami-shop-common/src/main/java/com/yami/shop/common/util/SimpleCaptcha.java +++ b/yami-shop-common/src/main/java/com/yami/shop/common/util/SimpleCaptcha.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-common/src/main/java/com/yami/shop/common/util/SpelUtil.java b/yami-shop-common/src/main/java/com/yami/shop/common/util/SpelUtil.java index 7b7ef3c0..6a25e201 100644 --- a/yami-shop-common/src/main/java/com/yami/shop/common/util/SpelUtil.java +++ b/yami-shop-common/src/main/java/com/yami/shop/common/util/SpelUtil.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-common/src/main/java/com/yami/shop/common/util/SpringContextUtils.java b/yami-shop-common/src/main/java/com/yami/shop/common/util/SpringContextUtils.java index 2629dcde..e034b3d6 100644 --- a/yami-shop-common/src/main/java/com/yami/shop/common/util/SpringContextUtils.java +++ b/yami-shop-common/src/main/java/com/yami/shop/common/util/SpringContextUtils.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-common/src/main/java/com/yami/shop/common/xss/XssUtil.java b/yami-shop-common/src/main/java/com/yami/shop/common/xss/XssUtil.java index cc421040..969e3a2f 100644 --- a/yami-shop-common/src/main/java/com/yami/shop/common/xss/XssUtil.java +++ b/yami-shop-common/src/main/java/com/yami/shop/common/xss/XssUtil.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-common/src/main/java/com/yami/shop/common/xss/XssWrapper.java b/yami-shop-common/src/main/java/com/yami/shop/common/xss/XssWrapper.java index 10013c5d..ea941546 100644 --- a/yami-shop-common/src/main/java/com/yami/shop/common/xss/XssWrapper.java +++ b/yami-shop-common/src/main/java/com/yami/shop/common/xss/XssWrapper.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-common/src/main/resources/shop.properties b/yami-shop-common/src/main/resources/shop.properties index 0fa1caa9..db5638f9 100644 --- a/yami-shop-common/src/main/resources/shop.properties +++ b/yami-shop-common/src/main/resources/shop.properties @@ -1,4 +1,4 @@ -shop.qiniu.resourcesUrl=http://img-test.gz-yami.com/ +shop.qiniu.resourcesUrl=https://img.mall4j.com/ shop.qiniu.accessKey=**** shop.qiniu.secretKey=**** shop.qiniu.bucket=**** diff --git a/yami-shop-mp/src/main/java/com/yami/shop/mp/builder/AbstractBuilder.java b/yami-shop-mp/src/main/java/com/yami/shop/mp/builder/AbstractBuilder.java index e32195d8..ccc7a016 100644 --- a/yami-shop-mp/src/main/java/com/yami/shop/mp/builder/AbstractBuilder.java +++ b/yami-shop-mp/src/main/java/com/yami/shop/mp/builder/AbstractBuilder.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-mp/src/main/java/com/yami/shop/mp/builder/ImageBuilder.java b/yami-shop-mp/src/main/java/com/yami/shop/mp/builder/ImageBuilder.java index f17e717a..e718a385 100644 --- a/yami-shop-mp/src/main/java/com/yami/shop/mp/builder/ImageBuilder.java +++ b/yami-shop-mp/src/main/java/com/yami/shop/mp/builder/ImageBuilder.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-mp/src/main/java/com/yami/shop/mp/builder/TextBuilder.java b/yami-shop-mp/src/main/java/com/yami/shop/mp/builder/TextBuilder.java index 78644fe0..d68939ea 100644 --- a/yami-shop-mp/src/main/java/com/yami/shop/mp/builder/TextBuilder.java +++ b/yami-shop-mp/src/main/java/com/yami/shop/mp/builder/TextBuilder.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-mp/src/main/java/com/yami/shop/mp/component/WxMaInRedisConfig.java b/yami-shop-mp/src/main/java/com/yami/shop/mp/component/WxMaInRedisConfig.java index 236f96ad..f5730afe 100644 --- a/yami-shop-mp/src/main/java/com/yami/shop/mp/component/WxMaInRedisConfig.java +++ b/yami-shop-mp/src/main/java/com/yami/shop/mp/component/WxMaInRedisConfig.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-mp/src/main/java/com/yami/shop/mp/component/WxMpInRedisConfigStorage.java b/yami-shop-mp/src/main/java/com/yami/shop/mp/component/WxMpInRedisConfigStorage.java index 481cba70..fb6e9ac4 100644 --- a/yami-shop-mp/src/main/java/com/yami/shop/mp/component/WxMpInRedisConfigStorage.java +++ b/yami-shop-mp/src/main/java/com/yami/shop/mp/component/WxMpInRedisConfigStorage.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-mp/src/main/java/com/yami/shop/mp/config/WxMaConfiguration.java b/yami-shop-mp/src/main/java/com/yami/shop/mp/config/WxMaConfiguration.java index 1e84194a..6670f376 100644 --- a/yami-shop-mp/src/main/java/com/yami/shop/mp/config/WxMaConfiguration.java +++ b/yami-shop-mp/src/main/java/com/yami/shop/mp/config/WxMaConfiguration.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-mp/src/main/java/com/yami/shop/mp/config/WxMpConfiguration.java b/yami-shop-mp/src/main/java/com/yami/shop/mp/config/WxMpConfiguration.java index e9b76271..44d5c615 100644 --- a/yami-shop-mp/src/main/java/com/yami/shop/mp/config/WxMpConfiguration.java +++ b/yami-shop-mp/src/main/java/com/yami/shop/mp/config/WxMpConfiguration.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-mp/src/main/java/com/yami/shop/mp/config/WxPayConfiguration.java b/yami-shop-mp/src/main/java/com/yami/shop/mp/config/WxPayConfiguration.java index 9e57e1f9..260c3fdc 100644 --- a/yami-shop-mp/src/main/java/com/yami/shop/mp/config/WxPayConfiguration.java +++ b/yami-shop-mp/src/main/java/com/yami/shop/mp/config/WxPayConfiguration.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-mp/src/main/java/com/yami/shop/mp/config/bean/WxMiniApp.java b/yami-shop-mp/src/main/java/com/yami/shop/mp/config/bean/WxMiniApp.java index 6d820511..5c268c60 100644 --- a/yami-shop-mp/src/main/java/com/yami/shop/mp/config/bean/WxMiniApp.java +++ b/yami-shop-mp/src/main/java/com/yami/shop/mp/config/bean/WxMiniApp.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-mp/src/main/java/com/yami/shop/mp/config/bean/WxMp.java b/yami-shop-mp/src/main/java/com/yami/shop/mp/config/bean/WxMp.java index 05c6a321..e372019c 100644 --- a/yami-shop-mp/src/main/java/com/yami/shop/mp/config/bean/WxMp.java +++ b/yami-shop-mp/src/main/java/com/yami/shop/mp/config/bean/WxMp.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-mp/src/main/java/com/yami/shop/mp/config/bean/WxPay.java b/yami-shop-mp/src/main/java/com/yami/shop/mp/config/bean/WxPay.java index cafa0823..8dc1541a 100644 --- a/yami-shop-mp/src/main/java/com/yami/shop/mp/config/bean/WxPay.java +++ b/yami-shop-mp/src/main/java/com/yami/shop/mp/config/bean/WxPay.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-mp/src/main/java/com/yami/shop/mp/controller/api/WxPortalController.java b/yami-shop-mp/src/main/java/com/yami/shop/mp/controller/api/WxPortalController.java index 6aca6b94..f38633d0 100644 --- a/yami-shop-mp/src/main/java/com/yami/shop/mp/controller/api/WxPortalController.java +++ b/yami-shop-mp/src/main/java/com/yami/shop/mp/controller/api/WxPortalController.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-mp/src/main/java/com/yami/shop/mp/handler/AbstractHandler.java b/yami-shop-mp/src/main/java/com/yami/shop/mp/handler/AbstractHandler.java index 8cf60172..b9415f11 100644 --- a/yami-shop-mp/src/main/java/com/yami/shop/mp/handler/AbstractHandler.java +++ b/yami-shop-mp/src/main/java/com/yami/shop/mp/handler/AbstractHandler.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-mp/src/main/java/com/yami/shop/mp/handler/MenuHandler.java b/yami-shop-mp/src/main/java/com/yami/shop/mp/handler/MenuHandler.java index db1d7f06..465a1c30 100644 --- a/yami-shop-mp/src/main/java/com/yami/shop/mp/handler/MenuHandler.java +++ b/yami-shop-mp/src/main/java/com/yami/shop/mp/handler/MenuHandler.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-quartz/src/main/java/com/yami/shop/quartz/config/QuartzCustomizerConfig.java b/yami-shop-quartz/src/main/java/com/yami/shop/quartz/config/QuartzCustomizerConfig.java index 34097c56..0cc10263 100644 --- a/yami-shop-quartz/src/main/java/com/yami/shop/quartz/config/QuartzCustomizerConfig.java +++ b/yami-shop-quartz/src/main/java/com/yami/shop/quartz/config/QuartzCustomizerConfig.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-quartz/src/main/java/com/yami/shop/quartz/config/QuartzJob.java b/yami-shop-quartz/src/main/java/com/yami/shop/quartz/config/QuartzJob.java index 2fd3cf11..999ae0e4 100644 --- a/yami-shop-quartz/src/main/java/com/yami/shop/quartz/config/QuartzJob.java +++ b/yami-shop-quartz/src/main/java/com/yami/shop/quartz/config/QuartzJob.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-quartz/src/main/java/com/yami/shop/quartz/config/ScheduleManager.java b/yami-shop-quartz/src/main/java/com/yami/shop/quartz/config/ScheduleManager.java index c7580a79..d0c82259 100644 --- a/yami-shop-quartz/src/main/java/com/yami/shop/quartz/config/ScheduleManager.java +++ b/yami-shop-quartz/src/main/java/com/yami/shop/quartz/config/ScheduleManager.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-quartz/src/main/java/com/yami/shop/quartz/controller/ScheduleJobController.java b/yami-shop-quartz/src/main/java/com/yami/shop/quartz/controller/ScheduleJobController.java index c333cc8c..d231ccea 100644 --- a/yami-shop-quartz/src/main/java/com/yami/shop/quartz/controller/ScheduleJobController.java +++ b/yami-shop-quartz/src/main/java/com/yami/shop/quartz/controller/ScheduleJobController.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-quartz/src/main/java/com/yami/shop/quartz/controller/ScheduleJobLogController.java b/yami-shop-quartz/src/main/java/com/yami/shop/quartz/controller/ScheduleJobLogController.java index ae952e34..f61d23f9 100644 --- a/yami-shop-quartz/src/main/java/com/yami/shop/quartz/controller/ScheduleJobLogController.java +++ b/yami-shop-quartz/src/main/java/com/yami/shop/quartz/controller/ScheduleJobLogController.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-quartz/src/main/java/com/yami/shop/quartz/dao/ScheduleJobLogMapper.java b/yami-shop-quartz/src/main/java/com/yami/shop/quartz/dao/ScheduleJobLogMapper.java index 15ce1606..1ad4a15d 100644 --- a/yami-shop-quartz/src/main/java/com/yami/shop/quartz/dao/ScheduleJobLogMapper.java +++ b/yami-shop-quartz/src/main/java/com/yami/shop/quartz/dao/ScheduleJobLogMapper.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-quartz/src/main/java/com/yami/shop/quartz/dao/ScheduleJobMapper.java b/yami-shop-quartz/src/main/java/com/yami/shop/quartz/dao/ScheduleJobMapper.java index b5c62593..0e911a96 100644 --- a/yami-shop-quartz/src/main/java/com/yami/shop/quartz/dao/ScheduleJobMapper.java +++ b/yami-shop-quartz/src/main/java/com/yami/shop/quartz/dao/ScheduleJobMapper.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-quartz/src/main/java/com/yami/shop/quartz/enums/ScheduleStatus.java b/yami-shop-quartz/src/main/java/com/yami/shop/quartz/enums/ScheduleStatus.java index 1c9150fb..a3a147f9 100644 --- a/yami-shop-quartz/src/main/java/com/yami/shop/quartz/enums/ScheduleStatus.java +++ b/yami-shop-quartz/src/main/java/com/yami/shop/quartz/enums/ScheduleStatus.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-quartz/src/main/java/com/yami/shop/quartz/event/ScheduleJobEvent.java b/yami-shop-quartz/src/main/java/com/yami/shop/quartz/event/ScheduleJobEvent.java index 147f7b72..4a650d67 100644 --- a/yami-shop-quartz/src/main/java/com/yami/shop/quartz/event/ScheduleJobEvent.java +++ b/yami-shop-quartz/src/main/java/com/yami/shop/quartz/event/ScheduleJobEvent.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-quartz/src/main/java/com/yami/shop/quartz/listener/SysJobListener.java b/yami-shop-quartz/src/main/java/com/yami/shop/quartz/listener/SysJobListener.java index d56bd938..35668f43 100644 --- a/yami-shop-quartz/src/main/java/com/yami/shop/quartz/listener/SysJobListener.java +++ b/yami-shop-quartz/src/main/java/com/yami/shop/quartz/listener/SysJobListener.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-quartz/src/main/java/com/yami/shop/quartz/model/ScheduleJob.java b/yami-shop-quartz/src/main/java/com/yami/shop/quartz/model/ScheduleJob.java index 74b9bc4b..e895f475 100644 --- a/yami-shop-quartz/src/main/java/com/yami/shop/quartz/model/ScheduleJob.java +++ b/yami-shop-quartz/src/main/java/com/yami/shop/quartz/model/ScheduleJob.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-quartz/src/main/java/com/yami/shop/quartz/model/ScheduleJobLog.java b/yami-shop-quartz/src/main/java/com/yami/shop/quartz/model/ScheduleJobLog.java index f643c34e..e4e388bb 100644 --- a/yami-shop-quartz/src/main/java/com/yami/shop/quartz/model/ScheduleJobLog.java +++ b/yami-shop-quartz/src/main/java/com/yami/shop/quartz/model/ScheduleJobLog.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-quartz/src/main/java/com/yami/shop/quartz/service/ScheduleJobLogService.java b/yami-shop-quartz/src/main/java/com/yami/shop/quartz/service/ScheduleJobLogService.java index 8d34c4c5..58ddfb21 100644 --- a/yami-shop-quartz/src/main/java/com/yami/shop/quartz/service/ScheduleJobLogService.java +++ b/yami-shop-quartz/src/main/java/com/yami/shop/quartz/service/ScheduleJobLogService.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-quartz/src/main/java/com/yami/shop/quartz/service/ScheduleJobService.java b/yami-shop-quartz/src/main/java/com/yami/shop/quartz/service/ScheduleJobService.java index e07a2d5c..726dc15d 100644 --- a/yami-shop-quartz/src/main/java/com/yami/shop/quartz/service/ScheduleJobService.java +++ b/yami-shop-quartz/src/main/java/com/yami/shop/quartz/service/ScheduleJobService.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-quartz/src/main/java/com/yami/shop/quartz/service/impl/ScheduleJobLogServiceImpl.java b/yami-shop-quartz/src/main/java/com/yami/shop/quartz/service/impl/ScheduleJobLogServiceImpl.java index 0e600c18..79e90fe4 100644 --- a/yami-shop-quartz/src/main/java/com/yami/shop/quartz/service/impl/ScheduleJobLogServiceImpl.java +++ b/yami-shop-quartz/src/main/java/com/yami/shop/quartz/service/impl/ScheduleJobLogServiceImpl.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-quartz/src/main/java/com/yami/shop/quartz/service/impl/ScheduleJobServiceImpl.java b/yami-shop-quartz/src/main/java/com/yami/shop/quartz/service/impl/ScheduleJobServiceImpl.java index ec614d1d..d04dd0c4 100644 --- a/yami-shop-quartz/src/main/java/com/yami/shop/quartz/service/impl/ScheduleJobServiceImpl.java +++ b/yami-shop-quartz/src/main/java/com/yami/shop/quartz/service/impl/ScheduleJobServiceImpl.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-quartz/src/main/java/com/yami/shop/quartz/util/SpringBeanTaskUtil.java b/yami-shop-quartz/src/main/java/com/yami/shop/quartz/util/SpringBeanTaskUtil.java index c92a3723..f80e9a36 100644 --- a/yami-shop-quartz/src/main/java/com/yami/shop/quartz/util/SpringBeanTaskUtil.java +++ b/yami-shop-quartz/src/main/java/com/yami/shop/quartz/util/SpringBeanTaskUtil.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-security/pom.xml b/yami-shop-security/pom.xml index d87dfcb5..a5c1db0a 100644 --- a/yami-shop-security/pom.xml +++ b/yami-shop-security/pom.xml @@ -14,7 +14,7 @@ com.yami.shop - yami-shop-common + yami-shop-service ${yami.shop.version} diff --git a/yami-shop-security/src/main/java/com/yami/shop/security/config/AuthorizationServerConfig.java b/yami-shop-security/src/main/java/com/yami/shop/security/config/AuthorizationServerConfig.java index 64e6e80b..87a179a0 100644 --- a/yami-shop-security/src/main/java/com/yami/shop/security/config/AuthorizationServerConfig.java +++ b/yami-shop-security/src/main/java/com/yami/shop/security/config/AuthorizationServerConfig.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-security/src/main/java/com/yami/shop/security/config/WebSecurityConfig.java b/yami-shop-security/src/main/java/com/yami/shop/security/config/WebSecurityConfig.java index 7bffe1a6..93f35ec8 100644 --- a/yami-shop-security/src/main/java/com/yami/shop/security/config/WebSecurityConfig.java +++ b/yami-shop-security/src/main/java/com/yami/shop/security/config/WebSecurityConfig.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-security/src/main/java/com/yami/shop/security/constants/SecurityConstants.java b/yami-shop-security/src/main/java/com/yami/shop/security/constants/SecurityConstants.java index c8f3a4dd..b6560c88 100644 --- a/yami-shop-security/src/main/java/com/yami/shop/security/constants/SecurityConstants.java +++ b/yami-shop-security/src/main/java/com/yami/shop/security/constants/SecurityConstants.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-security/src/main/java/com/yami/shop/security/controller/SysLoginController.java b/yami-shop-security/src/main/java/com/yami/shop/security/controller/SysLoginController.java index 2ae577da..e5ee1d31 100644 --- a/yami-shop-security/src/main/java/com/yami/shop/security/controller/SysLoginController.java +++ b/yami-shop-security/src/main/java/com/yami/shop/security/controller/SysLoginController.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-security/src/main/java/com/yami/shop/security/dao/AppConnectMapper.java b/yami-shop-security/src/main/java/com/yami/shop/security/dao/AppConnectMapper.java index d84c6f41..b77fbe3c 100644 --- a/yami-shop-security/src/main/java/com/yami/shop/security/dao/AppConnectMapper.java +++ b/yami-shop-security/src/main/java/com/yami/shop/security/dao/AppConnectMapper.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-security/src/main/java/com/yami/shop/security/enums/App.java b/yami-shop-security/src/main/java/com/yami/shop/security/enums/App.java index 124e6b1d..ad1e1828 100644 --- a/yami-shop-security/src/main/java/com/yami/shop/security/enums/App.java +++ b/yami-shop-security/src/main/java/com/yami/shop/security/enums/App.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-security/src/main/java/com/yami/shop/security/exception/BadCredentialsException.java b/yami-shop-security/src/main/java/com/yami/shop/security/exception/BadCredentialsException.java index 6f6257cf..b485b98e 100644 --- a/yami-shop-security/src/main/java/com/yami/shop/security/exception/BadCredentialsException.java +++ b/yami-shop-security/src/main/java/com/yami/shop/security/exception/BadCredentialsException.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-security/src/main/java/com/yami/shop/security/exception/BadCredentialsExceptionBase.java b/yami-shop-security/src/main/java/com/yami/shop/security/exception/BadCredentialsExceptionBase.java index e3d9f267..325cc7aa 100644 --- a/yami-shop-security/src/main/java/com/yami/shop/security/exception/BadCredentialsExceptionBase.java +++ b/yami-shop-security/src/main/java/com/yami/shop/security/exception/BadCredentialsExceptionBase.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-security/src/main/java/com/yami/shop/security/exception/BaseYamiAuth2Exception.java b/yami-shop-security/src/main/java/com/yami/shop/security/exception/BaseYamiAuth2Exception.java index ac655d3c..aa72e23b 100644 --- a/yami-shop-security/src/main/java/com/yami/shop/security/exception/BaseYamiAuth2Exception.java +++ b/yami-shop-security/src/main/java/com/yami/shop/security/exception/BaseYamiAuth2Exception.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-security/src/main/java/com/yami/shop/security/exception/ImageCodeNotMatchException.java b/yami-shop-security/src/main/java/com/yami/shop/security/exception/ImageCodeNotMatchException.java index 074e75e3..b3716d24 100644 --- a/yami-shop-security/src/main/java/com/yami/shop/security/exception/ImageCodeNotMatchException.java +++ b/yami-shop-security/src/main/java/com/yami/shop/security/exception/ImageCodeNotMatchException.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-security/src/main/java/com/yami/shop/security/exception/ImageCodeNotMatchExceptionBase.java b/yami-shop-security/src/main/java/com/yami/shop/security/exception/ImageCodeNotMatchExceptionBase.java index a11a6610..7d66a452 100644 --- a/yami-shop-security/src/main/java/com/yami/shop/security/exception/ImageCodeNotMatchExceptionBase.java +++ b/yami-shop-security/src/main/java/com/yami/shop/security/exception/ImageCodeNotMatchExceptionBase.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-security/src/main/java/com/yami/shop/security/exception/UnauthorizedException.java b/yami-shop-security/src/main/java/com/yami/shop/security/exception/UnauthorizedException.java index 9592c7aa..0765a8cf 100644 --- a/yami-shop-security/src/main/java/com/yami/shop/security/exception/UnauthorizedException.java +++ b/yami-shop-security/src/main/java/com/yami/shop/security/exception/UnauthorizedException.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-security/src/main/java/com/yami/shop/security/exception/UnauthorizedExceptionBase.java b/yami-shop-security/src/main/java/com/yami/shop/security/exception/UnauthorizedExceptionBase.java index d782a59a..ae56ecc2 100644 --- a/yami-shop-security/src/main/java/com/yami/shop/security/exception/UnauthorizedExceptionBase.java +++ b/yami-shop-security/src/main/java/com/yami/shop/security/exception/UnauthorizedExceptionBase.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-security/src/main/java/com/yami/shop/security/exception/UnknownGrantTypeException.java b/yami-shop-security/src/main/java/com/yami/shop/security/exception/UnknownGrantTypeException.java index 69c00c1d..415e819e 100644 --- a/yami-shop-security/src/main/java/com/yami/shop/security/exception/UnknownGrantTypeException.java +++ b/yami-shop-security/src/main/java/com/yami/shop/security/exception/UnknownGrantTypeException.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-security/src/main/java/com/yami/shop/security/exception/UnknownGrantTypeExceptionBase.java b/yami-shop-security/src/main/java/com/yami/shop/security/exception/UnknownGrantTypeExceptionBase.java index 54843821..9a57a52f 100644 --- a/yami-shop-security/src/main/java/com/yami/shop/security/exception/UnknownGrantTypeExceptionBase.java +++ b/yami-shop-security/src/main/java/com/yami/shop/security/exception/UnknownGrantTypeExceptionBase.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-security/src/main/java/com/yami/shop/security/exception/UsernameNotFoundException.java b/yami-shop-security/src/main/java/com/yami/shop/security/exception/UsernameNotFoundException.java index 1920729a..5eb6afac 100644 --- a/yami-shop-security/src/main/java/com/yami/shop/security/exception/UsernameNotFoundException.java +++ b/yami-shop-security/src/main/java/com/yami/shop/security/exception/UsernameNotFoundException.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * @@ -10,7 +10,7 @@ package com.yami.shop.security.exception; -public class UsernameNotFoundException extends YamiAuth2Exception { +public class UsernameNotFoundException extends BaseYamiAuth2Exception { public UsernameNotFoundException(String msg) { super(msg); diff --git a/yami-shop-security/src/main/java/com/yami/shop/security/exception/UsernameNotFoundExceptionBase.java b/yami-shop-security/src/main/java/com/yami/shop/security/exception/UsernameNotFoundExceptionBase.java index a4c8225d..1ebcad7d 100644 --- a/yami-shop-security/src/main/java/com/yami/shop/security/exception/UsernameNotFoundExceptionBase.java +++ b/yami-shop-security/src/main/java/com/yami/shop/security/exception/UsernameNotFoundExceptionBase.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-security/src/main/java/com/yami/shop/security/exception/WxErrorException.java b/yami-shop-security/src/main/java/com/yami/shop/security/exception/WxErrorException.java index 1fa37496..22817f78 100644 --- a/yami-shop-security/src/main/java/com/yami/shop/security/exception/WxErrorException.java +++ b/yami-shop-security/src/main/java/com/yami/shop/security/exception/WxErrorException.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-security/src/main/java/com/yami/shop/security/exception/WxErrorExceptionBase.java b/yami-shop-security/src/main/java/com/yami/shop/security/exception/WxErrorExceptionBase.java index 36b7fe0d..ad2aa763 100644 --- a/yami-shop-security/src/main/java/com/yami/shop/security/exception/WxErrorExceptionBase.java +++ b/yami-shop-security/src/main/java/com/yami/shop/security/exception/WxErrorExceptionBase.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-security/src/main/java/com/yami/shop/security/exception/YamiAuth2Exception.java b/yami-shop-security/src/main/java/com/yami/shop/security/exception/YamiAuth2Exception.java index e3b97cb0..a513e93b 100644 --- a/yami-shop-security/src/main/java/com/yami/shop/security/exception/YamiAuth2Exception.java +++ b/yami-shop-security/src/main/java/com/yami/shop/security/exception/YamiAuth2Exception.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-security/src/main/java/com/yami/shop/security/handler/LoginAuthFailedHandler.java b/yami-shop-security/src/main/java/com/yami/shop/security/handler/LoginAuthFailedHandler.java index 943f0965..fed60b41 100644 --- a/yami-shop-security/src/main/java/com/yami/shop/security/handler/LoginAuthFailedHandler.java +++ b/yami-shop-security/src/main/java/com/yami/shop/security/handler/LoginAuthFailedHandler.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * @@ -45,10 +45,10 @@ public void onAuthenticationFailure(HttpServletRequest request, BaseYamiAuth2Exception auth2Exception = (BaseYamiAuth2Exception) exception; response.setCharacterEncoding(CharsetUtil.UTF_8); - response.setContentType(MediaType.APPLICATION_JSON_UTF8_VALUE); + response.setContentType(MediaType.APPLICATION_JSON_VALUE); response.setStatus(auth2Exception.getHttpErrorCode()); PrintWriter printWriter = response.getWriter(); printWriter.append(auth2Exception.getMessage()); } -} \ No newline at end of file +} diff --git a/yami-shop-security/src/main/java/com/yami/shop/security/handler/LoginAuthSuccessHandler.java b/yami-shop-security/src/main/java/com/yami/shop/security/handler/LoginAuthSuccessHandler.java index cfa0ecc0..a1993a45 100644 --- a/yami-shop-security/src/main/java/com/yami/shop/security/handler/LoginAuthSuccessHandler.java +++ b/yami-shop-security/src/main/java/com/yami/shop/security/handler/LoginAuthSuccessHandler.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-security/src/main/java/com/yami/shop/security/model/AppConnect.java b/yami-shop-security/src/main/java/com/yami/shop/security/model/AppConnect.java index 463799b2..13d011e5 100644 --- a/yami-shop-security/src/main/java/com/yami/shop/security/model/AppConnect.java +++ b/yami-shop-security/src/main/java/com/yami/shop/security/model/AppConnect.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-security/src/main/java/com/yami/shop/security/permission/PermissionService.java b/yami-shop-security/src/main/java/com/yami/shop/security/permission/PermissionService.java index c86ea15b..15cd26b7 100644 --- a/yami-shop-security/src/main/java/com/yami/shop/security/permission/PermissionService.java +++ b/yami-shop-security/src/main/java/com/yami/shop/security/permission/PermissionService.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-security/src/main/java/com/yami/shop/security/provider/AbstractUserDetailsAuthenticationProvider.java b/yami-shop-security/src/main/java/com/yami/shop/security/provider/AbstractUserDetailsAuthenticationProvider.java index 64c44632..f9c284ee 100644 --- a/yami-shop-security/src/main/java/com/yami/shop/security/provider/AbstractUserDetailsAuthenticationProvider.java +++ b/yami-shop-security/src/main/java/com/yami/shop/security/provider/AbstractUserDetailsAuthenticationProvider.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-security/src/main/java/com/yami/shop/security/provider/MpAuthenticationProvider.java b/yami-shop-security/src/main/java/com/yami/shop/security/provider/MpAuthenticationProvider.java index c7a4d389..0e54efc0 100644 --- a/yami-shop-security/src/main/java/com/yami/shop/security/provider/MpAuthenticationProvider.java +++ b/yami-shop-security/src/main/java/com/yami/shop/security/provider/MpAuthenticationProvider.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-security/src/main/java/com/yami/shop/security/service/AppConnectService.java b/yami-shop-security/src/main/java/com/yami/shop/security/service/AppConnectService.java index 6c75a553..6c0e58fc 100644 --- a/yami-shop-security/src/main/java/com/yami/shop/security/service/AppConnectService.java +++ b/yami-shop-security/src/main/java/com/yami/shop/security/service/AppConnectService.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * @@ -12,6 +12,7 @@ import com.baomidou.mybatisplus.extension.service.IService; +import com.yami.shop.bean.model.User; import com.yami.shop.security.enums.App; import com.yami.shop.security.model.AppConnect; @@ -22,4 +23,7 @@ public interface AppConnectService extends IService { AppConnect getByBizUserId(String bizUserId, App app); + + User registerOrBindUser(User user, AppConnect appConnect, Integer appId); + } diff --git a/yami-shop-security/src/main/java/com/yami/shop/security/service/YamiClientDetailsService.java b/yami-shop-security/src/main/java/com/yami/shop/security/service/YamiClientDetailsService.java index 1c89df13..da1402b2 100644 --- a/yami-shop-security/src/main/java/com/yami/shop/security/service/YamiClientDetailsService.java +++ b/yami-shop-security/src/main/java/com/yami/shop/security/service/YamiClientDetailsService.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-security/src/main/java/com/yami/shop/security/service/YamiSysUser.java b/yami-shop-security/src/main/java/com/yami/shop/security/service/YamiSysUser.java index 0db5214b..62bfe512 100644 --- a/yami-shop-security/src/main/java/com/yami/shop/security/service/YamiSysUser.java +++ b/yami-shop-security/src/main/java/com/yami/shop/security/service/YamiSysUser.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-security/src/main/java/com/yami/shop/security/service/YamiUser.java b/yami-shop-security/src/main/java/com/yami/shop/security/service/YamiUser.java index b2f6fda6..85f967c0 100644 --- a/yami-shop-security/src/main/java/com/yami/shop/security/service/YamiUser.java +++ b/yami-shop-security/src/main/java/com/yami/shop/security/service/YamiUser.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * @@ -11,10 +11,12 @@ package com.yami.shop.security.service; import cn.hutool.core.util.StrUtil; +import lombok.Data; import lombok.Getter; import lombok.Setter; import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.userdetails.User; +import org.springframework.security.core.userdetails.UserDetails; import java.util.Collection; import java.util.Collections; @@ -22,39 +24,91 @@ /** * 用户详细信息 */ -@Getter -public class YamiUser extends User { +@Data +public class YamiUser implements UserDetails { /** * 用户ID */ - @Setter private String userId; - @Setter private String bizUserId; - @Setter private String pic; - @Setter private String name; - @Setter private boolean debugger; - @Setter private String password; + private Integer appType; + + private boolean enabled; + + /** + * 自提点Id + */ + private Long stationId; + + /** + * 店铺Id + */ + private Long shopId; + /** + * 小程序session_key + */ + private String sessionKey; + + public YamiUser() { + + } + + public YamiUser(String userId, String bizUserId, Integer appType, boolean enabled) { + this.userId = userId; + this.bizUserId = bizUserId; + this.appType = appType; + this.enabled = enabled; + } + public YamiUser(String userId, String password, boolean enabled) { - super(userId, password, enabled,true, true, true , Collections.emptyList()); this.userId = userId; this.password = password; + this.enabled = enabled; } - public YamiUser(String userId, String bizUserId, Integer appId, boolean enabled) { - super(appId + StrUtil.COLON + bizUserId, "", enabled,true, true, true , Collections.emptyList()); - this.userId = userId; - this.bizUserId = bizUserId; + @Override + public Collection getAuthorities() { + return Collections.emptyList(); + } + + @Override + public String getPassword() { + return this.password; + } + + @Override + public String getUsername() { + return StrUtil.isBlank(userId)? bizUserId: userId; + } + + @Override + public boolean isAccountNonExpired() { + return true; + } + + @Override + public boolean isAccountNonLocked() { + return true; + } + + @Override + public boolean isCredentialsNonExpired() { + return true; + } + + @Override + public boolean isEnabled() { + return this.enabled; } } diff --git a/yami-shop-security/src/main/java/com/yami/shop/security/service/YamiUserDetailsService.java b/yami-shop-security/src/main/java/com/yami/shop/security/service/YamiUserDetailsService.java index c45ec839..ff08abfc 100644 --- a/yami-shop-security/src/main/java/com/yami/shop/security/service/YamiUserDetailsService.java +++ b/yami-shop-security/src/main/java/com/yami/shop/security/service/YamiUserDetailsService.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * @@ -10,6 +10,7 @@ package com.yami.shop.security.service; +import com.yami.shop.bean.model.User; import com.yami.shop.security.enums.App; import com.yami.shop.security.exception.UsernameNotFoundExceptionBase; import com.yami.shop.security.model.AppConnect; @@ -45,4 +46,8 @@ public interface YamiUserDetailsService extends UserDetailsService { * @return */ YamiUser loadUserByUserMail(String userMail, String loginPassword); + + User loadUserByMobileOrUserName(String mobileOrUserName, Integer loginType); + + YamiUser getYamiUser(Integer appId, User user, String bizUserId); } diff --git a/yami-shop-security/src/main/java/com/yami/shop/security/service/impl/AppConnectServiceImpl.java b/yami-shop-security/src/main/java/com/yami/shop/security/service/impl/AppConnectServiceImpl.java index 3406d9aa..32e01e40 100644 --- a/yami-shop-security/src/main/java/com/yami/shop/security/service/impl/AppConnectServiceImpl.java +++ b/yami-shop-security/src/main/java/com/yami/shop/security/service/impl/AppConnectServiceImpl.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * @@ -10,16 +10,26 @@ package com.yami.shop.security.service.impl; +import cn.hutool.core.util.IdUtil; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.yami.shop.bean.model.User; +import com.yami.shop.common.exception.YamiShopBindException; +import com.yami.shop.dao.UserMapper; import com.yami.shop.security.dao.AppConnectMapper; import com.yami.shop.security.enums.App; import com.yami.shop.security.model.AppConnect; import com.yami.shop.security.service.AppConnectService; +import com.yami.shop.service.UserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import java.util.Date; +import java.util.Objects; /** @@ -32,6 +42,12 @@ public class AppConnectServiceImpl extends ServiceImpl().eq(User::getUserMobile, user.getUserMobile())) > 0) { + // 该电话号码已存在 + throw new YamiShopBindException("该电话号码已存在"); + } + String userId = IdUtil.simpleUUID(); + user.setUserId(userId); + userMapper.insert(user); + } else { + if (appConnect != null&& StrUtil.isBlank(user.getPic())) { + User userParam = new User(); + userParam.setUserId(user.getUserId()); + userParam.setModifyTime(new Date()); + userParam.setPic(appConnect.getImageUrl()); + userService.updateById(userParam); + } + } + if (appConnect == null) { + // 避免重复插入数据 + if (appConnectMapper.getByBizUserId(user.getUserId(), appId) != null) { + return user; + } + appConnect = new AppConnect(); + appConnect.setUserId(user.getUserId()); + appConnect.setNickName(user.getNickName()); + appConnect.setImageUrl(user.getPic()); + + // 0表示是系统的用户，不是第三方的 + appConnect.setAppId(appId); + appConnectMapper.insert(appConnect); + } else if (StrUtil.isBlank(appConnect.getUserId()) || Objects.isNull(appId)) { + appConnect.setAppId(appId); + appConnect.setUserId(user.getUserId()); + appConnect.setUserId(user.getUserId()); + appConnectMapper.updateById(appConnect); + } + + return user; + } } diff --git a/yami-shop-security/src/main/java/com/yami/shop/security/token/MpAuthenticationToken.java b/yami-shop-security/src/main/java/com/yami/shop/security/token/MpAuthenticationToken.java index 4237eaa1..011e90fb 100644 --- a/yami-shop-security/src/main/java/com/yami/shop/security/token/MpAuthenticationToken.java +++ b/yami-shop-security/src/main/java/com/yami/shop/security/token/MpAuthenticationToken.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-security/src/main/java/com/yami/shop/security/token/MyAuthenticationToken.java b/yami-shop-security/src/main/java/com/yami/shop/security/token/MyAuthenticationToken.java index 4087d67b..e15b6764 100644 --- a/yami-shop-security/src/main/java/com/yami/shop/security/token/MyAuthenticationToken.java +++ b/yami-shop-security/src/main/java/com/yami/shop/security/token/MyAuthenticationToken.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-security/src/main/java/com/yami/shop/security/util/SecurityUtils.java b/yami-shop-security/src/main/java/com/yami/shop/security/util/SecurityUtils.java index c5e484c5..b1bbbe56 100644 --- a/yami-shop-security/src/main/java/com/yami/shop/security/util/SecurityUtils.java +++ b/yami-shop-security/src/main/java/com/yami/shop/security/util/SecurityUtils.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-security/src/main/java/com/yami/shop/security/util/YamiTokenServices.java b/yami-shop-security/src/main/java/com/yami/shop/security/util/YamiTokenServices.java index f4e17b9b..acf6bfab 100644 --- a/yami-shop-security/src/main/java/com/yami/shop/security/util/YamiTokenServices.java +++ b/yami-shop-security/src/main/java/com/yami/shop/security/util/YamiTokenServices.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-service/src/main/java/com/yami/shop/dao/AreaMapper.java b/yami-shop-service/src/main/java/com/yami/shop/dao/AreaMapper.java index 0c786553..9ee9ccc3 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/dao/AreaMapper.java +++ b/yami-shop-service/src/main/java/com/yami/shop/dao/AreaMapper.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-service/src/main/java/com/yami/shop/dao/AttachFileMapper.java b/yami-shop-service/src/main/java/com/yami/shop/dao/AttachFileMapper.java index 0d311107..503b3251 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/dao/AttachFileMapper.java +++ b/yami-shop-service/src/main/java/com/yami/shop/dao/AttachFileMapper.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-service/src/main/java/com/yami/shop/dao/BasketMapper.java b/yami-shop-service/src/main/java/com/yami/shop/dao/BasketMapper.java index 69697a0e..02cc9526 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/dao/BasketMapper.java +++ b/yami-shop-service/src/main/java/com/yami/shop/dao/BasketMapper.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-service/src/main/java/com/yami/shop/dao/BrandMapper.java b/yami-shop-service/src/main/java/com/yami/shop/dao/BrandMapper.java index c0f66111..9847eb58 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/dao/BrandMapper.java +++ b/yami-shop-service/src/main/java/com/yami/shop/dao/BrandMapper.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-service/src/main/java/com/yami/shop/dao/CategoryBrandMapper.java b/yami-shop-service/src/main/java/com/yami/shop/dao/CategoryBrandMapper.java index 408152bc..84fc8c17 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/dao/CategoryBrandMapper.java +++ b/yami-shop-service/src/main/java/com/yami/shop/dao/CategoryBrandMapper.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-service/src/main/java/com/yami/shop/dao/CategoryMapper.java b/yami-shop-service/src/main/java/com/yami/shop/dao/CategoryMapper.java index 56574bab..ec7f0f15 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/dao/CategoryMapper.java +++ b/yami-shop-service/src/main/java/com/yami/shop/dao/CategoryMapper.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-service/src/main/java/com/yami/shop/dao/CategoryPropMapper.java b/yami-shop-service/src/main/java/com/yami/shop/dao/CategoryPropMapper.java index 51d09b11..d6c2a7d0 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/dao/CategoryPropMapper.java +++ b/yami-shop-service/src/main/java/com/yami/shop/dao/CategoryPropMapper.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-service/src/main/java/com/yami/shop/dao/DeliveryMapper.java b/yami-shop-service/src/main/java/com/yami/shop/dao/DeliveryMapper.java index c3c2a4bf..04b361f7 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/dao/DeliveryMapper.java +++ b/yami-shop-service/src/main/java/com/yami/shop/dao/DeliveryMapper.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-service/src/main/java/com/yami/shop/dao/HotSearchMapper.java b/yami-shop-service/src/main/java/com/yami/shop/dao/HotSearchMapper.java index abea398a..faa8ec74 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/dao/HotSearchMapper.java +++ b/yami-shop-service/src/main/java/com/yami/shop/dao/HotSearchMapper.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-service/src/main/java/com/yami/shop/dao/IndexImgMapper.java b/yami-shop-service/src/main/java/com/yami/shop/dao/IndexImgMapper.java index 662e5be7..4be0334f 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/dao/IndexImgMapper.java +++ b/yami-shop-service/src/main/java/com/yami/shop/dao/IndexImgMapper.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-service/src/main/java/com/yami/shop/dao/LoginHistMapper.java b/yami-shop-service/src/main/java/com/yami/shop/dao/LoginHistMapper.java index 5e61b606..b04c8491 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/dao/LoginHistMapper.java +++ b/yami-shop-service/src/main/java/com/yami/shop/dao/LoginHistMapper.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-service/src/main/java/com/yami/shop/dao/MessageMapper.java b/yami-shop-service/src/main/java/com/yami/shop/dao/MessageMapper.java index 353d2ea7..0b7bd7d8 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/dao/MessageMapper.java +++ b/yami-shop-service/src/main/java/com/yami/shop/dao/MessageMapper.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-service/src/main/java/com/yami/shop/dao/NoticeMapper.java b/yami-shop-service/src/main/java/com/yami/shop/dao/NoticeMapper.java index 7344bc0a..98de80f7 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/dao/NoticeMapper.java +++ b/yami-shop-service/src/main/java/com/yami/shop/dao/NoticeMapper.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-service/src/main/java/com/yami/shop/dao/OrderItemMapper.java b/yami-shop-service/src/main/java/com/yami/shop/dao/OrderItemMapper.java index 99ca989a..22a2aca8 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/dao/OrderItemMapper.java +++ b/yami-shop-service/src/main/java/com/yami/shop/dao/OrderItemMapper.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-service/src/main/java/com/yami/shop/dao/OrderMapper.java b/yami-shop-service/src/main/java/com/yami/shop/dao/OrderMapper.java index 8e310060..e815d8cf 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/dao/OrderMapper.java +++ b/yami-shop-service/src/main/java/com/yami/shop/dao/OrderMapper.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-service/src/main/java/com/yami/shop/dao/OrderRefundMapper.java b/yami-shop-service/src/main/java/com/yami/shop/dao/OrderRefundMapper.java index d2f3d2b4..28eb7a1b 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/dao/OrderRefundMapper.java +++ b/yami-shop-service/src/main/java/com/yami/shop/dao/OrderRefundMapper.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-service/src/main/java/com/yami/shop/dao/OrderSettlementMapper.java b/yami-shop-service/src/main/java/com/yami/shop/dao/OrderSettlementMapper.java index 0c139942..a70606ec 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/dao/OrderSettlementMapper.java +++ b/yami-shop-service/src/main/java/com/yami/shop/dao/OrderSettlementMapper.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-service/src/main/java/com/yami/shop/dao/PickAddrMapper.java b/yami-shop-service/src/main/java/com/yami/shop/dao/PickAddrMapper.java index 9dbcbfb7..2faeddde 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/dao/PickAddrMapper.java +++ b/yami-shop-service/src/main/java/com/yami/shop/dao/PickAddrMapper.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-service/src/main/java/com/yami/shop/dao/ProdCommMapper.java b/yami-shop-service/src/main/java/com/yami/shop/dao/ProdCommMapper.java index 90519516..de8730e9 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/dao/ProdCommMapper.java +++ b/yami-shop-service/src/main/java/com/yami/shop/dao/ProdCommMapper.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * @@ -20,11 +20,11 @@ import org.apache.ibatis.annotations.Param; public interface ProdCommMapper extends BaseMapper { - ProdCommDataDto getProdCommDataByProdId(@Param("prodId") Long prodId, @Param("userId") String userId); + ProdCommDataDto getProdCommDataByProdId(@Param("prodId") Long prodId); - IPage getProdCommDtoPageByProdId(@Param("page") Page page, @Param("prodId") Long prodId, @Param("evaluate") Integer evaluate, @Param("userId") String userId); + IPage getProdCommDtoPageByProdId(@Param("page") Page page, @Param("prodId") Long prodId, @Param("evaluate") Integer evaluate); IPage getProdCommDtoPageByUserId(Page page, @Param("userId") String userId); IPage getProdCommPage(Page page, @Param("prodComm") ProdComm prodComm); -} \ No newline at end of file +} diff --git a/yami-shop-service/src/main/java/com/yami/shop/dao/ProdImgMapper.java b/yami-shop-service/src/main/java/com/yami/shop/dao/ProdImgMapper.java index 05d4caf8..f3de3c4d 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/dao/ProdImgMapper.java +++ b/yami-shop-service/src/main/java/com/yami/shop/dao/ProdImgMapper.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-service/src/main/java/com/yami/shop/dao/ProdPropMapper.java b/yami-shop-service/src/main/java/com/yami/shop/dao/ProdPropMapper.java index 87bb88bf..85aeec5a 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/dao/ProdPropMapper.java +++ b/yami-shop-service/src/main/java/com/yami/shop/dao/ProdPropMapper.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-service/src/main/java/com/yami/shop/dao/ProdPropValueMapper.java b/yami-shop-service/src/main/java/com/yami/shop/dao/ProdPropValueMapper.java index 13b4e16b..1aae5fb5 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/dao/ProdPropValueMapper.java +++ b/yami-shop-service/src/main/java/com/yami/shop/dao/ProdPropValueMapper.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-service/src/main/java/com/yami/shop/dao/ProdTagMapper.java b/yami-shop-service/src/main/java/com/yami/shop/dao/ProdTagMapper.java index 14dfbe55..02692e12 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/dao/ProdTagMapper.java +++ b/yami-shop-service/src/main/java/com/yami/shop/dao/ProdTagMapper.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-service/src/main/java/com/yami/shop/dao/ProdTagReferenceMapper.java b/yami-shop-service/src/main/java/com/yami/shop/dao/ProdTagReferenceMapper.java index 2510cf08..8391f060 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/dao/ProdTagReferenceMapper.java +++ b/yami-shop-service/src/main/java/com/yami/shop/dao/ProdTagReferenceMapper.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-service/src/main/java/com/yami/shop/dao/ProductMapper.java b/yami-shop-service/src/main/java/com/yami/shop/dao/ProductMapper.java index 8592196a..9ea8b4e4 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/dao/ProductMapper.java +++ b/yami-shop-service/src/main/java/com/yami/shop/dao/ProductMapper.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-service/src/main/java/com/yami/shop/dao/ShopDetailMapper.java b/yami-shop-service/src/main/java/com/yami/shop/dao/ShopDetailMapper.java index 1b44eb23..b589f0c8 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/dao/ShopDetailMapper.java +++ b/yami-shop-service/src/main/java/com/yami/shop/dao/ShopDetailMapper.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-service/src/main/java/com/yami/shop/dao/SkuMapper.java b/yami-shop-service/src/main/java/com/yami/shop/dao/SkuMapper.java index 95cfb95e..c30526cc 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/dao/SkuMapper.java +++ b/yami-shop-service/src/main/java/com/yami/shop/dao/SkuMapper.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-service/src/main/java/com/yami/shop/dao/SmsLogMapper.java b/yami-shop-service/src/main/java/com/yami/shop/dao/SmsLogMapper.java index b6f39de6..1c0df736 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/dao/SmsLogMapper.java +++ b/yami-shop-service/src/main/java/com/yami/shop/dao/SmsLogMapper.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-service/src/main/java/com/yami/shop/dao/TranscityFreeMapper.java b/yami-shop-service/src/main/java/com/yami/shop/dao/TranscityFreeMapper.java index 0f0741f9..b61b50e2 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/dao/TranscityFreeMapper.java +++ b/yami-shop-service/src/main/java/com/yami/shop/dao/TranscityFreeMapper.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-service/src/main/java/com/yami/shop/dao/TranscityMapper.java b/yami-shop-service/src/main/java/com/yami/shop/dao/TranscityMapper.java index 97c8ac69..efb54a44 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/dao/TranscityMapper.java +++ b/yami-shop-service/src/main/java/com/yami/shop/dao/TranscityMapper.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-service/src/main/java/com/yami/shop/dao/TransfeeFreeMapper.java b/yami-shop-service/src/main/java/com/yami/shop/dao/TransfeeFreeMapper.java index 466955e6..11efcdd5 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/dao/TransfeeFreeMapper.java +++ b/yami-shop-service/src/main/java/com/yami/shop/dao/TransfeeFreeMapper.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-service/src/main/java/com/yami/shop/dao/TransfeeMapper.java b/yami-shop-service/src/main/java/com/yami/shop/dao/TransfeeMapper.java index 66dae934..a0b8b4f0 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/dao/TransfeeMapper.java +++ b/yami-shop-service/src/main/java/com/yami/shop/dao/TransfeeMapper.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-service/src/main/java/com/yami/shop/dao/TransportMapper.java b/yami-shop-service/src/main/java/com/yami/shop/dao/TransportMapper.java index 8e2d56eb..81fba53c 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/dao/TransportMapper.java +++ b/yami-shop-service/src/main/java/com/yami/shop/dao/TransportMapper.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-service/src/main/java/com/yami/shop/dao/UserAddrMapper.java b/yami-shop-service/src/main/java/com/yami/shop/dao/UserAddrMapper.java index ac726f21..abd815a3 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/dao/UserAddrMapper.java +++ b/yami-shop-service/src/main/java/com/yami/shop/dao/UserAddrMapper.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-service/src/main/java/com/yami/shop/dao/UserAddrOrderMapper.java b/yami-shop-service/src/main/java/com/yami/shop/dao/UserAddrOrderMapper.java index 3f7f05b7..2dd7a0cf 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/dao/UserAddrOrderMapper.java +++ b/yami-shop-service/src/main/java/com/yami/shop/dao/UserAddrOrderMapper.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-service/src/main/java/com/yami/shop/dao/UserCollectionMapper.java b/yami-shop-service/src/main/java/com/yami/shop/dao/UserCollectionMapper.java index d447d82d..48e6ccf5 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/dao/UserCollectionMapper.java +++ b/yami-shop-service/src/main/java/com/yami/shop/dao/UserCollectionMapper.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-service/src/main/java/com/yami/shop/dao/UserMapper.java b/yami-shop-service/src/main/java/com/yami/shop/dao/UserMapper.java index 90ff2aab..9447e363 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/dao/UserMapper.java +++ b/yami-shop-service/src/main/java/com/yami/shop/dao/UserMapper.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/AreaService.java b/yami-shop-service/src/main/java/com/yami/shop/service/AreaService.java index 217991de..29ced92d 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/AreaService.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/AreaService.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/AttachFileService.java b/yami-shop-service/src/main/java/com/yami/shop/service/AttachFileService.java index 8097c2c8..ff5d2ed1 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/AttachFileService.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/AttachFileService.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/BasketService.java b/yami-shop-service/src/main/java/com/yami/shop/service/BasketService.java index 921aceb4..c94d66c0 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/BasketService.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/BasketService.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/BrandService.java b/yami-shop-service/src/main/java/com/yami/shop/service/BrandService.java index 6695c190..6f658c7f 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/BrandService.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/BrandService.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/CategoryBrandService.java b/yami-shop-service/src/main/java/com/yami/shop/service/CategoryBrandService.java index a6a79b31..696aaf74 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/CategoryBrandService.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/CategoryBrandService.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/CategoryPropService.java b/yami-shop-service/src/main/java/com/yami/shop/service/CategoryPropService.java index ff473383..86d59d0b 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/CategoryPropService.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/CategoryPropService.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/CategoryService.java b/yami-shop-service/src/main/java/com/yami/shop/service/CategoryService.java index be0c49dd..290e76d4 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/CategoryService.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/CategoryService.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/DeliveryService.java b/yami-shop-service/src/main/java/com/yami/shop/service/DeliveryService.java index da73c62c..4e74ba64 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/DeliveryService.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/DeliveryService.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/HotSearchService.java b/yami-shop-service/src/main/java/com/yami/shop/service/HotSearchService.java index 169f2f87..35c9e52a 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/HotSearchService.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/HotSearchService.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/IndexImgService.java b/yami-shop-service/src/main/java/com/yami/shop/service/IndexImgService.java index 5bbe6010..31781679 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/IndexImgService.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/IndexImgService.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/MessageService.java b/yami-shop-service/src/main/java/com/yami/shop/service/MessageService.java index 601e8788..a93a9d8b 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/MessageService.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/MessageService.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/MyOrderService.java b/yami-shop-service/src/main/java/com/yami/shop/service/MyOrderService.java index cb2304dc..7782a3a1 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/MyOrderService.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/MyOrderService.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/NoticeService.java b/yami-shop-service/src/main/java/com/yami/shop/service/NoticeService.java index f8d28b83..49dd5633 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/NoticeService.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/NoticeService.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/OrderItemService.java b/yami-shop-service/src/main/java/com/yami/shop/service/OrderItemService.java index 9348f368..c948c123 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/OrderItemService.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/OrderItemService.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/OrderService.java b/yami-shop-service/src/main/java/com/yami/shop/service/OrderService.java index 80b08059..2efaab15 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/OrderService.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/OrderService.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/OrderSettlementService.java b/yami-shop-service/src/main/java/com/yami/shop/service/OrderSettlementService.java index 57223a18..25ed81fb 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/OrderSettlementService.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/OrderSettlementService.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/PayService.java b/yami-shop-service/src/main/java/com/yami/shop/service/PayService.java index dcf3c9bb..f4231634 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/PayService.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/PayService.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/PickAddrService.java b/yami-shop-service/src/main/java/com/yami/shop/service/PickAddrService.java index 813d1b75..720a38ac 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/PickAddrService.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/PickAddrService.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/ProdCommService.java b/yami-shop-service/src/main/java/com/yami/shop/service/ProdCommService.java index ee4e4c10..ca5f26b2 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/ProdCommService.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/ProdCommService.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * @@ -28,11 +28,11 @@ * @date 2019-04-19 10:43:57 */ public interface ProdCommService extends IService { - ProdCommDataDto getProdCommDataByProdId(Long prodId, String userId); + ProdCommDataDto getProdCommDataByProdId(Long prodId); IPage getProdCommDtoPageByUserId(Page page,String userId); - IPage getProdCommDtoPageByProdId(Page page, Long prodId, Integer evaluate, String userId); + IPage getProdCommDtoPageByProdId(Page page, Long prodId, Integer evaluate); IPage getProdCommPage(Page page,ProdComm prodComm); diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/ProdPropService.java b/yami-shop-service/src/main/java/com/yami/shop/service/ProdPropService.java index 88522f27..4fa5473c 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/ProdPropService.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/ProdPropService.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/ProdPropValueService.java b/yami-shop-service/src/main/java/com/yami/shop/service/ProdPropValueService.java index 6dcaeff5..39fa3f85 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/ProdPropValueService.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/ProdPropValueService.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/ProdTagReferenceService.java b/yami-shop-service/src/main/java/com/yami/shop/service/ProdTagReferenceService.java index 30fa1ba3..bfae5fd4 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/ProdTagReferenceService.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/ProdTagReferenceService.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/ProdTagService.java b/yami-shop-service/src/main/java/com/yami/shop/service/ProdTagService.java index 85384c46..a6b23048 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/ProdTagService.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/ProdTagService.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/ProductService.java b/yami-shop-service/src/main/java/com/yami/shop/service/ProductService.java index d79f7eab..189e65e9 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/ProductService.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/ProductService.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/ShopDetailService.java b/yami-shop-service/src/main/java/com/yami/shop/service/ShopDetailService.java index d4ea41af..8da539aa 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/ShopDetailService.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/ShopDetailService.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/SkuService.java b/yami-shop-service/src/main/java/com/yami/shop/service/SkuService.java index 22e1c7e5..4bd1b1d4 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/SkuService.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/SkuService.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/SmsLogService.java b/yami-shop-service/src/main/java/com/yami/shop/service/SmsLogService.java index 421d1537..e67593d3 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/SmsLogService.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/SmsLogService.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/TranscityFreeService.java b/yami-shop-service/src/main/java/com/yami/shop/service/TranscityFreeService.java index d41084b4..8e854621 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/TranscityFreeService.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/TranscityFreeService.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/TranscityService.java b/yami-shop-service/src/main/java/com/yami/shop/service/TranscityService.java index 8a187f46..da3129dc 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/TranscityService.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/TranscityService.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/TransfeeFreeService.java b/yami-shop-service/src/main/java/com/yami/shop/service/TransfeeFreeService.java index 1220067b..4392623c 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/TransfeeFreeService.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/TransfeeFreeService.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/TransfeeService.java b/yami-shop-service/src/main/java/com/yami/shop/service/TransfeeService.java index b2e04eda..bdc9a886 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/TransfeeService.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/TransfeeService.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/TransportManagerService.java b/yami-shop-service/src/main/java/com/yami/shop/service/TransportManagerService.java index 04ebf5b8..368b6e7e 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/TransportManagerService.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/TransportManagerService.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/TransportService.java b/yami-shop-service/src/main/java/com/yami/shop/service/TransportService.java index d77aeb77..14f256dd 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/TransportService.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/TransportService.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/UserAddrOrderService.java b/yami-shop-service/src/main/java/com/yami/shop/service/UserAddrOrderService.java index a8ba1c3c..3b729443 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/UserAddrOrderService.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/UserAddrOrderService.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/UserAddrService.java b/yami-shop-service/src/main/java/com/yami/shop/service/UserAddrService.java index 168af344..8cf25cd3 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/UserAddrService.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/UserAddrService.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/UserCollectionService.java b/yami-shop-service/src/main/java/com/yami/shop/service/UserCollectionService.java index c4c93104..b6893a6c 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/UserCollectionService.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/UserCollectionService.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/UserService.java b/yami-shop-service/src/main/java/com/yami/shop/service/UserService.java index 61e3d095..4643c43e 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/UserService.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/UserService.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * @@ -24,4 +24,6 @@ public interface UserService extends IService { User getUserByUserId(String userId); Boolean insertUser(UserRegisterParam userRegisterParam); + + void validate(UserRegisterParam userRegisterParam, String checkRegisterSmsFlag); } diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/impl/AreaServiceImpl.java b/yami-shop-service/src/main/java/com/yami/shop/service/impl/AreaServiceImpl.java index 0f07c78f..23daf5f5 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/impl/AreaServiceImpl.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/impl/AreaServiceImpl.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/impl/AttachFileServiceImpl.java b/yami-shop-service/src/main/java/com/yami/shop/service/impl/AttachFileServiceImpl.java index c2303a0d..a411d3fb 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/impl/AttachFileServiceImpl.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/impl/AttachFileServiceImpl.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/impl/BasketServiceImpl.java b/yami-shop-service/src/main/java/com/yami/shop/service/impl/BasketServiceImpl.java index 0f20a55c..fee6b8dd 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/impl/BasketServiceImpl.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/impl/BasketServiceImpl.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/impl/BrandServiceImpl.java b/yami-shop-service/src/main/java/com/yami/shop/service/impl/BrandServiceImpl.java index a33ac7c3..49c6d7a3 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/impl/BrandServiceImpl.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/impl/BrandServiceImpl.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/impl/CategoryBrandServiceImpl.java b/yami-shop-service/src/main/java/com/yami/shop/service/impl/CategoryBrandServiceImpl.java index 680c94f4..f837026a 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/impl/CategoryBrandServiceImpl.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/impl/CategoryBrandServiceImpl.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/impl/CategoryPropServiceImpl.java b/yami-shop-service/src/main/java/com/yami/shop/service/impl/CategoryPropServiceImpl.java index 7d7acb42..60023fe9 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/impl/CategoryPropServiceImpl.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/impl/CategoryPropServiceImpl.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/impl/CategoryServiceImpl.java b/yami-shop-service/src/main/java/com/yami/shop/service/impl/CategoryServiceImpl.java index 5c53934c..c07a3e4e 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/impl/CategoryServiceImpl.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/impl/CategoryServiceImpl.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/impl/DeliveryServiceImpl.java b/yami-shop-service/src/main/java/com/yami/shop/service/impl/DeliveryServiceImpl.java index d0047886..757fdf98 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/impl/DeliveryServiceImpl.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/impl/DeliveryServiceImpl.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/impl/HotSearchServiceImpl.java b/yami-shop-service/src/main/java/com/yami/shop/service/impl/HotSearchServiceImpl.java index 84b5e01c..92737a0c 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/impl/HotSearchServiceImpl.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/impl/HotSearchServiceImpl.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/impl/IndexImgServiceImpl.java b/yami-shop-service/src/main/java/com/yami/shop/service/impl/IndexImgServiceImpl.java index 7d507f3d..d571fab2 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/impl/IndexImgServiceImpl.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/impl/IndexImgServiceImpl.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/impl/MessageServiceImpl.java b/yami-shop-service/src/main/java/com/yami/shop/service/impl/MessageServiceImpl.java index 9f8557db..f2816d2c 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/impl/MessageServiceImpl.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/impl/MessageServiceImpl.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/impl/MyOrderServiceImpl.java b/yami-shop-service/src/main/java/com/yami/shop/service/impl/MyOrderServiceImpl.java index b000b2ba..965b6763 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/impl/MyOrderServiceImpl.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/impl/MyOrderServiceImpl.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/impl/NoticeServiceImpl.java b/yami-shop-service/src/main/java/com/yami/shop/service/impl/NoticeServiceImpl.java index a2675f68..6eb6243d 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/impl/NoticeServiceImpl.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/impl/NoticeServiceImpl.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/impl/OrderItemServiceImpl.java b/yami-shop-service/src/main/java/com/yami/shop/service/impl/OrderItemServiceImpl.java index 19da0a82..b260f2e4 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/impl/OrderItemServiceImpl.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/impl/OrderItemServiceImpl.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/impl/OrderServiceImpl.java b/yami-shop-service/src/main/java/com/yami/shop/service/impl/OrderServiceImpl.java index 46815d53..b548dcdb 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/impl/OrderServiceImpl.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/impl/OrderServiceImpl.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/impl/OrderSettlementServiceImpl.java b/yami-shop-service/src/main/java/com/yami/shop/service/impl/OrderSettlementServiceImpl.java index 85131934..54478433 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/impl/OrderSettlementServiceImpl.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/impl/OrderSettlementServiceImpl.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/impl/PayServiceImpl.java b/yami-shop-service/src/main/java/com/yami/shop/service/impl/PayServiceImpl.java index c8622320..f292d4b9 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/impl/PayServiceImpl.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/impl/PayServiceImpl.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/impl/PickAddrServiceImpl.java b/yami-shop-service/src/main/java/com/yami/shop/service/impl/PickAddrServiceImpl.java index 70b9cfcd..0e4d7eef 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/impl/PickAddrServiceImpl.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/impl/PickAddrServiceImpl.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/impl/ProdCommServiceImpl.java b/yami-shop-service/src/main/java/com/yami/shop/service/impl/ProdCommServiceImpl.java index 9c314e3f..87380180 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/impl/ProdCommServiceImpl.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/impl/ProdCommServiceImpl.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * @@ -36,8 +36,8 @@ public class ProdCommServiceImpl extends ServiceImpl i private ProdCommMapper prodCommMapper; @Override - public ProdCommDataDto getProdCommDataByProdId(Long prodId, String userId) { - ProdCommDataDto prodCommDataDto=prodCommMapper.getProdCommDataByProdId(prodId, userId); + public ProdCommDataDto getProdCommDataByProdId(Long prodId) { + ProdCommDataDto prodCommDataDto=prodCommMapper.getProdCommDataByProdId(prodId); //计算出好评率 if(prodCommDataDto.getPraiseNumber() == 0||prodCommDataDto.getNumber() == 0){ prodCommDataDto.setPositiveRating(0.0); @@ -53,9 +53,9 @@ public IPage getProdCommDtoPageByUserId(Page page, String userId) { } @Override - public IPage getProdCommDtoPageByProdId(Page page, Long prodId, Integer evaluate, String userId) { + public IPage getProdCommDtoPageByProdId(Page page, Long prodId, Integer evaluate) { - IPage prodCommDtos = prodCommMapper.getProdCommDtoPageByProdId(page, prodId, evaluate, userId); + IPage prodCommDtos = prodCommMapper.getProdCommDtoPageByProdId(page, prodId, evaluate); prodCommDtos.getRecords().forEach(prodCommDto -> { // 匿名评价 if (prodCommDto.getIsAnonymous() == 1) { diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/impl/ProdPropServiceImpl.java b/yami-shop-service/src/main/java/com/yami/shop/service/impl/ProdPropServiceImpl.java index 9fc4de03..fd9330be 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/impl/ProdPropServiceImpl.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/impl/ProdPropServiceImpl.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/impl/ProdPropValueServiceImpl.java b/yami-shop-service/src/main/java/com/yami/shop/service/impl/ProdPropValueServiceImpl.java index e6ab99ec..fbae2e07 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/impl/ProdPropValueServiceImpl.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/impl/ProdPropValueServiceImpl.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/impl/ProdTagReferenceServiceImpl.java b/yami-shop-service/src/main/java/com/yami/shop/service/impl/ProdTagReferenceServiceImpl.java index 3052ef9f..a059fac7 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/impl/ProdTagReferenceServiceImpl.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/impl/ProdTagReferenceServiceImpl.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/impl/ProdTagServiceImpl.java b/yami-shop-service/src/main/java/com/yami/shop/service/impl/ProdTagServiceImpl.java index 4fd07b75..71f45722 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/impl/ProdTagServiceImpl.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/impl/ProdTagServiceImpl.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/impl/ProductServiceImpl.java b/yami-shop-service/src/main/java/com/yami/shop/service/impl/ProductServiceImpl.java index 6058d52e..b2b5b5fa 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/impl/ProductServiceImpl.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/impl/ProductServiceImpl.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/impl/ShopDetailServiceImpl.java b/yami-shop-service/src/main/java/com/yami/shop/service/impl/ShopDetailServiceImpl.java index 0378a047..feb6a600 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/impl/ShopDetailServiceImpl.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/impl/ShopDetailServiceImpl.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/impl/SkuServiceImpl.java b/yami-shop-service/src/main/java/com/yami/shop/service/impl/SkuServiceImpl.java index 75df194e..5c039ff2 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/impl/SkuServiceImpl.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/impl/SkuServiceImpl.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/impl/SmsLogServiceImpl.java b/yami-shop-service/src/main/java/com/yami/shop/service/impl/SmsLogServiceImpl.java index e569d47a..28af4b06 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/impl/SmsLogServiceImpl.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/impl/SmsLogServiceImpl.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/impl/TranscityFreeServiceImpl.java b/yami-shop-service/src/main/java/com/yami/shop/service/impl/TranscityFreeServiceImpl.java index 0e45492d..8594d876 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/impl/TranscityFreeServiceImpl.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/impl/TranscityFreeServiceImpl.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/impl/TranscityServiceImpl.java b/yami-shop-service/src/main/java/com/yami/shop/service/impl/TranscityServiceImpl.java index eae3bf94..0c0de2cc 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/impl/TranscityServiceImpl.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/impl/TranscityServiceImpl.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/impl/TransfeeFreeServiceImpl.java b/yami-shop-service/src/main/java/com/yami/shop/service/impl/TransfeeFreeServiceImpl.java index 5c2c1404..55a75711 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/impl/TransfeeFreeServiceImpl.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/impl/TransfeeFreeServiceImpl.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/impl/TransfeeServiceImpl.java b/yami-shop-service/src/main/java/com/yami/shop/service/impl/TransfeeServiceImpl.java index c5537386..a9fe2697 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/impl/TransfeeServiceImpl.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/impl/TransfeeServiceImpl.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/impl/TransportManagerServiceImpl.java b/yami-shop-service/src/main/java/com/yami/shop/service/impl/TransportManagerServiceImpl.java index d8680d50..172f59d8 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/impl/TransportManagerServiceImpl.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/impl/TransportManagerServiceImpl.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/impl/TransportServiceImpl.java b/yami-shop-service/src/main/java/com/yami/shop/service/impl/TransportServiceImpl.java index 5229bf67..48d14105 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/impl/TransportServiceImpl.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/impl/TransportServiceImpl.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/impl/UserAddrOrderServiceImpl.java b/yami-shop-service/src/main/java/com/yami/shop/service/impl/UserAddrOrderServiceImpl.java index 2d0b7de4..b1d09707 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/impl/UserAddrOrderServiceImpl.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/impl/UserAddrOrderServiceImpl.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/impl/UserAddrServiceImpl.java b/yami-shop-service/src/main/java/com/yami/shop/service/impl/UserAddrServiceImpl.java index f6edb0aa..1b0df92f 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/impl/UserAddrServiceImpl.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/impl/UserAddrServiceImpl.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/impl/UserCollectionServiceImpl.java b/yami-shop-service/src/main/java/com/yami/shop/service/impl/UserCollectionServiceImpl.java index 41d9bc8e..1e09f071 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/impl/UserCollectionServiceImpl.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/impl/UserCollectionServiceImpl.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/impl/UserServiceImpl.java b/yami-shop-service/src/main/java/com/yami/shop/service/impl/UserServiceImpl.java index 7fc7c72d..3c0ee50c 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/impl/UserServiceImpl.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/impl/UserServiceImpl.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * @@ -11,11 +11,14 @@ package com.yami.shop.service.impl; import cn.hutool.core.util.IdUtil; +import cn.hutool.core.util.StrUtil; +import cn.hutool.extra.emoji.EmojiUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.yami.shop.bean.model.User; import com.yami.shop.bean.param.UserRegisterParam; import com.yami.shop.bean.vo.UserVO; import com.yami.shop.common.exception.YamiShopBindException; +import com.yami.shop.common.util.RedisUtil; import com.yami.shop.dao.UserMapper; import com.yami.shop.service.UserService; import org.springframework.beans.factory.annotation.Autowired; @@ -24,6 +27,7 @@ import org.springframework.stereotype.Service; import java.util.Date; +import java.util.Objects; import java.util.UUID; /** @@ -37,7 +41,7 @@ public class UserServiceImpl extends ServiceImpl implements Us @Override - @Cacheable(cacheNames="user",key="#userId") + @Cacheable(cacheNames = "user", key = "#userId") public User getUserByUserId(String userId) { return userMapper.selectById(userId); } @@ -59,4 +63,22 @@ public Boolean insertUser(UserRegisterParam uParam) { user.setLoginPassword(uParam.getPassword()); return userMapper.insert(user) == 1; } + /** + * 看看有没有校验验证码成功的标识 + * @param userRegisterParam + * @param checkRegisterSmsFlag + */ + @Override + public void validate(UserRegisterParam userRegisterParam, String checkRegisterSmsFlag) { + if (StrUtil.isBlank(userRegisterParam.getCheckRegisterSmsFlag())) { + // 验证码已过期，请重新发送验证码校验 + throw new YamiShopBindException("验证码已过期，请重新发送验证码校验"); + } else { + String checkRegisterSmsFlagMobile = RedisUtil.get(checkRegisterSmsFlag); + if (!Objects.equals(checkRegisterSmsFlagMobile, userRegisterParam.getMobile())) { + // 验证码已过期，请重新发送验证码校验 + throw new YamiShopBindException("验证码已过期，请重新发送验证码校验"); + } + } + } } diff --git a/yami-shop-service/src/main/resources/mapper/IndexImgMapper.xml b/yami-shop-service/src/main/resources/mapper/IndexImgMapper.xml index 362511cd..164f4b83 100644 --- a/yami-shop-service/src/main/resources/mapper/IndexImgMapper.xml +++ b/yami-shop-service/src/main/resources/mapper/IndexImgMapper.xml @@ -27,6 +27,7 @@ diff --git a/yami-shop-service/src/main/resources/mapper/ProdCommMapper.xml b/yami-shop-service/src/main/resources/mapper/ProdCommMapper.xml index 4e97666a..c6621942 100644 --- a/yami-shop-service/src/main/resources/mapper/ProdCommMapper.xml +++ b/yami-shop-service/src/main/resources/mapper/ProdCommMapper.xml @@ -37,8 +37,7 @@ count(CASE WHEN evaluate = 2 THEN 1 ELSE null END) AS negative_number, count(CASE WHEN pics is not null THEN 1 ELSE null END) AS pic_number FROM tz_prod_comm - WHERE prod_id = #{prodId} - and (status = 1 or user_id = #{userId}) + WHERE prod_id = #{prodId} and status = 1 @@ -78,13 +77,14 @@ from tz_prod_comm pc left join tz_user u on u.user_id=pc.user_id - where pc.prod_id = #{prodId} and (pc.status = 1 or pc.user_id = #{userId} ) + where pc.prod_id = #{prodId} and pc.status = 1 and pc.evaluate = #{evaluate} and pc.pics is not null + order by pc.rec_time desc - \ No newline at end of file + diff --git a/yami-shop-sys/src/main/java/com/yami/shop/sys/aspect/SysLogAspect.java b/yami-shop-sys/src/main/java/com/yami/shop/sys/aspect/SysLogAspect.java index e508902e..386b888d 100644 --- a/yami-shop-sys/src/main/java/com/yami/shop/sys/aspect/SysLogAspect.java +++ b/yami-shop-sys/src/main/java/com/yami/shop/sys/aspect/SysLogAspect.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-sys/src/main/java/com/yami/shop/sys/constant/Constant.java b/yami-shop-sys/src/main/java/com/yami/shop/sys/constant/Constant.java index 1dd120ca..7dcf68d7 100644 --- a/yami-shop-sys/src/main/java/com/yami/shop/sys/constant/Constant.java +++ b/yami-shop-sys/src/main/java/com/yami/shop/sys/constant/Constant.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-sys/src/main/java/com/yami/shop/sys/controller/SysConfigController.java b/yami-shop-sys/src/main/java/com/yami/shop/sys/controller/SysConfigController.java index f4079e44..6796f367 100644 --- a/yami-shop-sys/src/main/java/com/yami/shop/sys/controller/SysConfigController.java +++ b/yami-shop-sys/src/main/java/com/yami/shop/sys/controller/SysConfigController.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-sys/src/main/java/com/yami/shop/sys/controller/SysLogController.java b/yami-shop-sys/src/main/java/com/yami/shop/sys/controller/SysLogController.java index c2c1137b..d4a7d5e0 100644 --- a/yami-shop-sys/src/main/java/com/yami/shop/sys/controller/SysLogController.java +++ b/yami-shop-sys/src/main/java/com/yami/shop/sys/controller/SysLogController.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-sys/src/main/java/com/yami/shop/sys/controller/SysMenuController.java b/yami-shop-sys/src/main/java/com/yami/shop/sys/controller/SysMenuController.java index 5fd43924..46301326 100644 --- a/yami-shop-sys/src/main/java/com/yami/shop/sys/controller/SysMenuController.java +++ b/yami-shop-sys/src/main/java/com/yami/shop/sys/controller/SysMenuController.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-sys/src/main/java/com/yami/shop/sys/controller/SysRoleController.java b/yami-shop-sys/src/main/java/com/yami/shop/sys/controller/SysRoleController.java index 75d8ffef..6a1be4e3 100644 --- a/yami-shop-sys/src/main/java/com/yami/shop/sys/controller/SysRoleController.java +++ b/yami-shop-sys/src/main/java/com/yami/shop/sys/controller/SysRoleController.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-sys/src/main/java/com/yami/shop/sys/controller/SysUserController.java b/yami-shop-sys/src/main/java/com/yami/shop/sys/controller/SysUserController.java index 8385198b..780b4339 100644 --- a/yami-shop-sys/src/main/java/com/yami/shop/sys/controller/SysUserController.java +++ b/yami-shop-sys/src/main/java/com/yami/shop/sys/controller/SysUserController.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * @@ -93,6 +93,11 @@ public ResponseEntity info(){ public ResponseEntity password(@RequestBody @Valid UpdatePasswordDto param){ Long userId = SecurityUtils.getSysUser().getUserId(); + // 开源版代码，禁止用户修改admin 的账号密码 + // 正式使用时，删除此部分代码即可 + if (Objects.equals(1L,userId) && StrUtil.isNotBlank(param.getNewPassword())) { + throw new YamiShopBindException("禁止修改admin的账号密码"); + } SysUser dbUser = sysUserService.getSysUserById(userId); if (!passwordEncoder.matches(param.getPassword(), dbUser.getPassword())) { return ResponseEntity.badRequest().body("原密码不正确"); @@ -148,7 +153,6 @@ public ResponseEntity save(@Valid @RequestBody SysUser user){ @PreAuthorize("@pms.hasPermission('sys:user:update')") public ResponseEntity update(@Valid @RequestBody SysUser user){ String password = user.getPassword(); - SysUser dbUser = sysUserService.getSysUserById(user.getUserId()); if (!Objects.equals(dbUser.getShopId(), SecurityUtils.getSysUser().getShopId())) { @@ -164,6 +168,16 @@ public ResponseEntity update(@Valid @RequestBody SysUser user){ }else { user.setPassword(passwordEncoder.encode(user.getPassword())); } + // 开源版代码，禁止用户修改admin 的账号密码密码 + // 正式使用时，删除此部分代码即可 + boolean is = Objects.equals(1L,dbUser.getUserId()) && (StrUtil.isNotBlank(password) || !StrUtil.equals("admin",user.getUsername())); + if (is) { + throw new YamiShopBindException("禁止修改admin的账号密码"); + } + + if (Objects.equals(1L,user.getUserId()) && user.getStatus()==0) { + throw new YamiShopBindException("admin用户不可以被禁用"); + } sysUserService.updateUserAndUserRole(user); return ResponseEntity.ok().build(); } diff --git a/yami-shop-sys/src/main/java/com/yami/shop/sys/dao/SysConfigMapper.java b/yami-shop-sys/src/main/java/com/yami/shop/sys/dao/SysConfigMapper.java index 003bc85e..889b7c84 100644 --- a/yami-shop-sys/src/main/java/com/yami/shop/sys/dao/SysConfigMapper.java +++ b/yami-shop-sys/src/main/java/com/yami/shop/sys/dao/SysConfigMapper.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-sys/src/main/java/com/yami/shop/sys/dao/SysLogMapper.java b/yami-shop-sys/src/main/java/com/yami/shop/sys/dao/SysLogMapper.java index 430e67c0..674bb4c0 100644 --- a/yami-shop-sys/src/main/java/com/yami/shop/sys/dao/SysLogMapper.java +++ b/yami-shop-sys/src/main/java/com/yami/shop/sys/dao/SysLogMapper.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-sys/src/main/java/com/yami/shop/sys/dao/SysMenuMapper.java b/yami-shop-sys/src/main/java/com/yami/shop/sys/dao/SysMenuMapper.java index 3fcaf623..853ab782 100644 --- a/yami-shop-sys/src/main/java/com/yami/shop/sys/dao/SysMenuMapper.java +++ b/yami-shop-sys/src/main/java/com/yami/shop/sys/dao/SysMenuMapper.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-sys/src/main/java/com/yami/shop/sys/dao/SysRoleMapper.java b/yami-shop-sys/src/main/java/com/yami/shop/sys/dao/SysRoleMapper.java index 7adac1e4..febb06e7 100644 --- a/yami-shop-sys/src/main/java/com/yami/shop/sys/dao/SysRoleMapper.java +++ b/yami-shop-sys/src/main/java/com/yami/shop/sys/dao/SysRoleMapper.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-sys/src/main/java/com/yami/shop/sys/dao/SysRoleMenuMapper.java b/yami-shop-sys/src/main/java/com/yami/shop/sys/dao/SysRoleMenuMapper.java index 74322104..d182c41f 100644 --- a/yami-shop-sys/src/main/java/com/yami/shop/sys/dao/SysRoleMenuMapper.java +++ b/yami-shop-sys/src/main/java/com/yami/shop/sys/dao/SysRoleMenuMapper.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-sys/src/main/java/com/yami/shop/sys/dao/SysUserMapper.java b/yami-shop-sys/src/main/java/com/yami/shop/sys/dao/SysUserMapper.java index f4cdf454..e32351cc 100644 --- a/yami-shop-sys/src/main/java/com/yami/shop/sys/dao/SysUserMapper.java +++ b/yami-shop-sys/src/main/java/com/yami/shop/sys/dao/SysUserMapper.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-sys/src/main/java/com/yami/shop/sys/dao/SysUserRoleMapper.java b/yami-shop-sys/src/main/java/com/yami/shop/sys/dao/SysUserRoleMapper.java index 29ccafd5..e0303795 100644 --- a/yami-shop-sys/src/main/java/com/yami/shop/sys/dao/SysUserRoleMapper.java +++ b/yami-shop-sys/src/main/java/com/yami/shop/sys/dao/SysUserRoleMapper.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-sys/src/main/java/com/yami/shop/sys/dto/UpdatePasswordDto.java b/yami-shop-sys/src/main/java/com/yami/shop/sys/dto/UpdatePasswordDto.java index ea5bc4dc..0c4fe74c 100644 --- a/yami-shop-sys/src/main/java/com/yami/shop/sys/dto/UpdatePasswordDto.java +++ b/yami-shop-sys/src/main/java/com/yami/shop/sys/dto/UpdatePasswordDto.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-sys/src/main/java/com/yami/shop/sys/model/SysConfig.java b/yami-shop-sys/src/main/java/com/yami/shop/sys/model/SysConfig.java index a93263e9..f2e2c905 100644 --- a/yami-shop-sys/src/main/java/com/yami/shop/sys/model/SysConfig.java +++ b/yami-shop-sys/src/main/java/com/yami/shop/sys/model/SysConfig.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-sys/src/main/java/com/yami/shop/sys/model/SysLog.java b/yami-shop-sys/src/main/java/com/yami/shop/sys/model/SysLog.java index e19a0a60..c2886cdb 100644 --- a/yami-shop-sys/src/main/java/com/yami/shop/sys/model/SysLog.java +++ b/yami-shop-sys/src/main/java/com/yami/shop/sys/model/SysLog.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-sys/src/main/java/com/yami/shop/sys/model/SysMenu.java b/yami-shop-sys/src/main/java/com/yami/shop/sys/model/SysMenu.java index d0e4d14b..723f586b 100644 --- a/yami-shop-sys/src/main/java/com/yami/shop/sys/model/SysMenu.java +++ b/yami-shop-sys/src/main/java/com/yami/shop/sys/model/SysMenu.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-sys/src/main/java/com/yami/shop/sys/model/SysRole.java b/yami-shop-sys/src/main/java/com/yami/shop/sys/model/SysRole.java index c725caea..bce3de48 100644 --- a/yami-shop-sys/src/main/java/com/yami/shop/sys/model/SysRole.java +++ b/yami-shop-sys/src/main/java/com/yami/shop/sys/model/SysRole.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-sys/src/main/java/com/yami/shop/sys/model/SysRoleMenu.java b/yami-shop-sys/src/main/java/com/yami/shop/sys/model/SysRoleMenu.java index e0b34421..e046f537 100644 --- a/yami-shop-sys/src/main/java/com/yami/shop/sys/model/SysRoleMenu.java +++ b/yami-shop-sys/src/main/java/com/yami/shop/sys/model/SysRoleMenu.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-sys/src/main/java/com/yami/shop/sys/model/SysUser.java b/yami-shop-sys/src/main/java/com/yami/shop/sys/model/SysUser.java index e802d9d6..9abed9a6 100644 --- a/yami-shop-sys/src/main/java/com/yami/shop/sys/model/SysUser.java +++ b/yami-shop-sys/src/main/java/com/yami/shop/sys/model/SysUser.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-sys/src/main/java/com/yami/shop/sys/model/SysUserRole.java b/yami-shop-sys/src/main/java/com/yami/shop/sys/model/SysUserRole.java index a9d68bdb..00906272 100644 --- a/yami-shop-sys/src/main/java/com/yami/shop/sys/model/SysUserRole.java +++ b/yami-shop-sys/src/main/java/com/yami/shop/sys/model/SysUserRole.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-sys/src/main/java/com/yami/shop/sys/service/SysConfigService.java b/yami-shop-sys/src/main/java/com/yami/shop/sys/service/SysConfigService.java index b401aa72..aeacec9a 100644 --- a/yami-shop-sys/src/main/java/com/yami/shop/sys/service/SysConfigService.java +++ b/yami-shop-sys/src/main/java/com/yami/shop/sys/service/SysConfigService.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-sys/src/main/java/com/yami/shop/sys/service/SysLogService.java b/yami-shop-sys/src/main/java/com/yami/shop/sys/service/SysLogService.java index 0bda99bb..5c8b53a5 100644 --- a/yami-shop-sys/src/main/java/com/yami/shop/sys/service/SysLogService.java +++ b/yami-shop-sys/src/main/java/com/yami/shop/sys/service/SysLogService.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-sys/src/main/java/com/yami/shop/sys/service/SysMenuService.java b/yami-shop-sys/src/main/java/com/yami/shop/sys/service/SysMenuService.java index e697127f..57de2be0 100644 --- a/yami-shop-sys/src/main/java/com/yami/shop/sys/service/SysMenuService.java +++ b/yami-shop-sys/src/main/java/com/yami/shop/sys/service/SysMenuService.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-sys/src/main/java/com/yami/shop/sys/service/SysRoleService.java b/yami-shop-sys/src/main/java/com/yami/shop/sys/service/SysRoleService.java index 55cfee90..b02ce513 100644 --- a/yami-shop-sys/src/main/java/com/yami/shop/sys/service/SysRoleService.java +++ b/yami-shop-sys/src/main/java/com/yami/shop/sys/service/SysRoleService.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-sys/src/main/java/com/yami/shop/sys/service/SysUserService.java b/yami-shop-sys/src/main/java/com/yami/shop/sys/service/SysUserService.java index 1b1b267b..3a21c0c3 100644 --- a/yami-shop-sys/src/main/java/com/yami/shop/sys/service/SysUserService.java +++ b/yami-shop-sys/src/main/java/com/yami/shop/sys/service/SysUserService.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-sys/src/main/java/com/yami/shop/sys/service/impl/SysConfigServiceImpl.java b/yami-shop-sys/src/main/java/com/yami/shop/sys/service/impl/SysConfigServiceImpl.java index b33b300c..31a359f7 100644 --- a/yami-shop-sys/src/main/java/com/yami/shop/sys/service/impl/SysConfigServiceImpl.java +++ b/yami-shop-sys/src/main/java/com/yami/shop/sys/service/impl/SysConfigServiceImpl.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-sys/src/main/java/com/yami/shop/sys/service/impl/SysLogServiceImpl.java b/yami-shop-sys/src/main/java/com/yami/shop/sys/service/impl/SysLogServiceImpl.java index 7034e6bf..6cf5b688 100644 --- a/yami-shop-sys/src/main/java/com/yami/shop/sys/service/impl/SysLogServiceImpl.java +++ b/yami-shop-sys/src/main/java/com/yami/shop/sys/service/impl/SysLogServiceImpl.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-sys/src/main/java/com/yami/shop/sys/service/impl/SysMenuServiceImpl.java b/yami-shop-sys/src/main/java/com/yami/shop/sys/service/impl/SysMenuServiceImpl.java index ae47b0da..154b9519 100644 --- a/yami-shop-sys/src/main/java/com/yami/shop/sys/service/impl/SysMenuServiceImpl.java +++ b/yami-shop-sys/src/main/java/com/yami/shop/sys/service/impl/SysMenuServiceImpl.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-sys/src/main/java/com/yami/shop/sys/service/impl/SysRoleServiceImpl.java b/yami-shop-sys/src/main/java/com/yami/shop/sys/service/impl/SysRoleServiceImpl.java index 91c278d9..dbdd8cef 100644 --- a/yami-shop-sys/src/main/java/com/yami/shop/sys/service/impl/SysRoleServiceImpl.java +++ b/yami-shop-sys/src/main/java/com/yami/shop/sys/service/impl/SysRoleServiceImpl.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ * diff --git a/yami-shop-sys/src/main/java/com/yami/shop/sys/service/impl/SysUserServiceImpl.java b/yami-shop-sys/src/main/java/com/yami/shop/sys/service/impl/SysUserServiceImpl.java index 69d9c057..92dfb6c4 100644 --- a/yami-shop-sys/src/main/java/com/yami/shop/sys/service/impl/SysUserServiceImpl.java +++ b/yami-shop-sys/src/main/java/com/yami/shop/sys/service/impl/SysUserServiceImpl.java @@ -1,7 +1,7 @@ /* - * Copyright (c) 2018-2999 广州亚米信息科技有限公司 All rights reserved. + * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved. * - * https://www.gz-yami.com/ + * https://www.mall4j.com/ * * 未经允许，不可做商业用途！ *