Преглед изворни кода

Merge remote-tracking branch 'origin/master'

Eratosici пре 3 година
родитељ
комит
5b4e579834
100 измењених фајлова са 213 додато и 225 уклоњено
  1. 5 17
      README.md
  2. 3 3
      db/yami_shop.sql
  3. 1 1
      doc/商城表设计/商品分组.md
  4. 3 3
      doc/基本框架设计/Swagger文档.md
  5. 3 3
      mall4v/README.md
  6. 2 2
      yami-shop-admin/src/main/java/com/yami/shop/admin/WebApplication.java
  7. 2 2
      yami-shop-admin/src/main/java/com/yami/shop/admin/config/AdminBeanConfig.java
  8. 2 2
      yami-shop-admin/src/main/java/com/yami/shop/admin/config/AdminConfig.java
  9. 6 6
      yami-shop-admin/src/main/java/com/yami/shop/admin/config/SwaggerConfiguration.java
  10. 2 2
      yami-shop-admin/src/main/java/com/yami/shop/admin/controller/AreaController.java
  11. 2 2
      yami-shop-admin/src/main/java/com/yami/shop/admin/controller/AttributeController.java
  12. 2 2
      yami-shop-admin/src/main/java/com/yami/shop/admin/controller/BrandController.java
  13. 2 2
      yami-shop-admin/src/main/java/com/yami/shop/admin/controller/CategoryController.java
  14. 2 2
      yami-shop-admin/src/main/java/com/yami/shop/admin/controller/DeliveryController.java
  15. 2 2
      yami-shop-admin/src/main/java/com/yami/shop/admin/controller/FileController.java
  16. 2 2
      yami-shop-admin/src/main/java/com/yami/shop/admin/controller/HotSearchController.java
  17. 2 2
      yami-shop-admin/src/main/java/com/yami/shop/admin/controller/IndexImgController.java
  18. 2 2
      yami-shop-admin/src/main/java/com/yami/shop/admin/controller/MessageController.java
  19. 2 2
      yami-shop-admin/src/main/java/com/yami/shop/admin/controller/NoticeController.java
  20. 2 2
      yami-shop-admin/src/main/java/com/yami/shop/admin/controller/OrderController.java
  21. 2 2
      yami-shop-admin/src/main/java/com/yami/shop/admin/controller/PickAddrController.java
  22. 2 2
      yami-shop-admin/src/main/java/com/yami/shop/admin/controller/ProdCommController.java
  23. 2 2
      yami-shop-admin/src/main/java/com/yami/shop/admin/controller/ProdTagController.java
  24. 2 2
      yami-shop-admin/src/main/java/com/yami/shop/admin/controller/ProdTagReferenceController.java
  25. 2 2
      yami-shop-admin/src/main/java/com/yami/shop/admin/controller/ProductController.java
  26. 2 2
      yami-shop-admin/src/main/java/com/yami/shop/admin/controller/ShopDetailController.java
  27. 2 2
      yami-shop-admin/src/main/java/com/yami/shop/admin/controller/SpecController.java
  28. 2 2
      yami-shop-admin/src/main/java/com/yami/shop/admin/controller/TransportController.java
  29. 2 2
      yami-shop-admin/src/main/java/com/yami/shop/admin/controller/UserAddrController.java
  30. 2 2
      yami-shop-admin/src/main/java/com/yami/shop/admin/controller/UserController.java
  31. 2 2
      yami-shop-admin/src/main/java/com/yami/shop/admin/security/AdminAuthenticationToken.java
  32. 2 2
      yami-shop-admin/src/main/java/com/yami/shop/admin/security/LoginAuthenticationFilter.java
  33. 2 2
      yami-shop-admin/src/main/java/com/yami/shop/admin/security/ResourceServerConfiguration.java
  34. 2 2
      yami-shop-admin/src/main/java/com/yami/shop/admin/security/YamiSysUserDetailsServiceImpl.java
  35. 2 2
      yami-shop-admin/src/main/java/com/yami/shop/admin/task/OrderTask.java
  36. 2 2
      yami-shop-admin/src/main/java/com/yami/shop/admin/task/TestTask.java
  37. 2 2
      yami-shop-api/src/main/java/com/yami/shop/api/ApiApplication.java
  38. 2 2
      yami-shop-api/src/main/java/com/yami/shop/api/config/ApiBeanConfig.java
  39. 2 2
      yami-shop-api/src/main/java/com/yami/shop/api/config/ApiConfig.java
  40. 6 6
      yami-shop-api/src/main/java/com/yami/shop/api/config/SwaggerConfiguration.java
  41. 2 2
      yami-shop-api/src/main/java/com/yami/shop/api/controller/AddrController.java
  42. 2 2
      yami-shop-api/src/main/java/com/yami/shop/api/controller/AreaController.java
  43. 2 2
      yami-shop-api/src/main/java/com/yami/shop/api/controller/CategoryController.java
  44. 2 2
      yami-shop-api/src/main/java/com/yami/shop/api/controller/DeliveryController.java
  45. 2 2
      yami-shop-api/src/main/java/com/yami/shop/api/controller/IndexImgController.java
  46. 2 2
      yami-shop-api/src/main/java/com/yami/shop/api/controller/MyOrderController.java
  47. 2 2
      yami-shop-api/src/main/java/com/yami/shop/api/controller/NoticeController.java
  48. 2 2
      yami-shop-api/src/main/java/com/yami/shop/api/controller/OrderController.java
  49. 2 2
      yami-shop-api/src/main/java/com/yami/shop/api/controller/PayController.java
  50. 2 2
      yami-shop-api/src/main/java/com/yami/shop/api/controller/PayNoticeController.java
  51. 2 2
      yami-shop-api/src/main/java/com/yami/shop/api/controller/ProdCommController.java
  52. 2 2
      yami-shop-api/src/main/java/com/yami/shop/api/controller/ProdController.java
  53. 2 2
      yami-shop-api/src/main/java/com/yami/shop/api/controller/ProdTagController.java
  54. 2 2
      yami-shop-api/src/main/java/com/yami/shop/api/controller/SearchController.java
  55. 2 2
      yami-shop-api/src/main/java/com/yami/shop/api/controller/ShopCartController.java
  56. 2 2
      yami-shop-api/src/main/java/com/yami/shop/api/controller/SkuController.java
  57. 2 2
      yami-shop-api/src/main/java/com/yami/shop/api/controller/SmsController.java
  58. 2 2
      yami-shop-api/src/main/java/com/yami/shop/api/controller/UserCollectionController.java
  59. 2 2
      yami-shop-api/src/main/java/com/yami/shop/api/controller/UserController.java
  60. 2 2
      yami-shop-api/src/main/java/com/yami/shop/api/listener/ConfirmOrderListener.java
  61. 2 2
      yami-shop-api/src/main/java/com/yami/shop/api/listener/ShopCartListener.java
  62. 2 2
      yami-shop-api/src/main/java/com/yami/shop/api/listener/SubmitOrderListener.java
  63. 2 2
      yami-shop-api/src/main/java/com/yami/shop/api/security/AuthenticationToken.java
  64. 2 2
      yami-shop-api/src/main/java/com/yami/shop/api/security/LoginAuthenticationFilter.java
  65. 2 2
      yami-shop-api/src/main/java/com/yami/shop/api/security/MiniAppAuthenticationToken.java
  66. 2 2
      yami-shop-api/src/main/java/com/yami/shop/api/security/ResourceServerConfiguration.java
  67. 2 2
      yami-shop-api/src/main/java/com/yami/shop/api/security/WebAuthenticationToken.java
  68. 2 2
      yami-shop-api/src/main/java/com/yami/shop/api/security/WebLoginAuthenticationFilter.java
  69. 2 2
      yami-shop-api/src/main/java/com/yami/shop/api/security/YamiUserServiceImpl.java
  70. 2 2
      yami-shop-bean/src/main/java/com/yami/shop/bean/SmsInfoContext.java
  71. 2 2
      yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/BasketItemDto.java
  72. 2 2
      yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/CategoryDto.java
  73. 2 2
      yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ChooseDiscountItemDto.java
  74. 2 2
      yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/CouponOrderDto.java
  75. 2 2
      yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/DeliveryDto.java
  76. 2 2
      yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/DeliveryInfoDto.java
  77. 2 2
      yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/DiscountDto.java
  78. 2 2
      yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/IndexImgDto.java
  79. 2 2
      yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/MyOrderDto.java
  80. 2 2
      yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/MyOrderItemDto.java
  81. 2 2
      yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/NoticeDto.java
  82. 2 2
      yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/OrderCountData.java
  83. 2 2
      yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/OrderItemDto.java
  84. 2 2
      yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/OrderNumbersDto.java
  85. 2 2
      yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/OrderShopDto.java
  86. 2 2
      yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ProdCommDataDto.java
  87. 2 2
      yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ProdCommDto.java
  88. 2 2
      yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ProdTagDto.java
  89. 2 2
      yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ProductDto.java
  90. 2 2
      yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ProductItemDto.java
  91. 2 2
      yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ShopCartAmountDto.java
  92. 2 2
      yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ShopCartDto.java
  93. 2 2
      yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ShopCartExpiryItemDto.java
  94. 2 2
      yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ShopCartItemDiscountDto.java
  95. 2 2
      yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ShopCartItemDto.java
  96. 2 2
      yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ShopCartOrderDto.java
  97. 2 2
      yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ShopCartOrderMergerDto.java
  98. 2 2
      yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/SkuDto.java
  99. 2 2
      yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/TagProductDto.java
  100. 2 2
      yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/UserAddrDto.java

+ 5 - 17
README.md

@@ -38,7 +38,7 @@ uni-app:https://gitee.com/gz-yami/mall4uni
 
  **由于我们并不希望小程序的数据被弄混乱,我们弄了两个数据库。因此,您修改了后台的商品信息,小程序并不能看到!** 
 
-后台:<http://mall4j-admin.gz-yami.com>  账号:admin/123456
+后台:<http://mall4j-admin.mall4j.com>  账号:admin/123456
 
 小程序:扫描二维码
 
@@ -79,29 +79,17 @@ 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)
+### 2. 移动端截图
 
-![运费模板](https://gitee.com/gz-yami/mall4j/raw/master/screenshot/transport.png)
+![输入图片说明](https://images.gitee.com/uploads/images/2021/1110/145209_2ec1ad04_5094767.png "开源移动端截图.png")
 
 
-
-### 2. 小程序截图
-
-![小程序截图](https://images.gitee.com/uploads/images/2019/0706/085234_4eb7509b_5094767.jpeg "小程序截图")
-
-
-### 3. uni-app截图
-
-![uni-app截图](https://gitee.com/gz-yami/mall4j/raw/master/screenshot/uniappInfo.png "uni-app截图")
-
-### 4. 软著截图
+### 3. 软著截图
 ![输入图片说明](https://images.gitee.com/uploads/images/2021/0703/110940_a9b72c43_5094767.png "Mall4j商城系统V1.0.png")
 
 

+ 3 - 3
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` */
 

+ 1 - 1
doc/商城表设计/商品分组.md

@@ -2,7 +2,7 @@
 
 #### 商城应用
 
-在亚米精选商城首页中,可以看到有`每日上新`、`商城热卖`、`更多商品`等标签栏,在每一栏位中用来展示特定的商品列表,如下图:。
+在mall4j精选商城首页中,可以看到有`每日上新`、`商城热卖`、`更多商品`等标签栏,在每一栏位中用来展示特定的商品列表,如下图:。
 
 ![1566266497255](.\img\小程序-分组商品.png)
 

+ 3 - 3
doc/基本框架设计/Swagger文档.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();
      }

+ 3 - 3
mall4v/README.md

@@ -26,7 +26,7 @@ vue中后台:https://gitee.com/gz-yami/mall4v
 
 ## 演示地址
 
- **由于我们并不希望小程序的数据被弄混乱,我们弄了两个数据库。因此,您修改了后台的商品信息,小程序并不能看到!** 
+ **由于我们并不希望小程序的数据被弄混乱,我们弄了两个数据库。因此,您修改了后台的商品信息,小程序并不能看到!**
 
 后台:<http://mall4j-admin.mall4j.com>  账号: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
 
 - 论坛:<http://bbs.mall4j.com>
 
-- 商务邮箱:yamitech@163.com
+- 商务邮箱:yamitech@163.com

+ 2 - 2
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/
  *
  * 未经允许,不可做商业用途!
  *

+ 2 - 2
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/
  *
  * 未经允许,不可做商业用途!
  *

+ 2 - 2
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/
  *
  * 未经允许,不可做商业用途!
  *

+ 6 - 6
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 class SwaggerConfiguration {
 	 @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();
 	 }

+ 2 - 2
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/
  *
  * 未经允许,不可做商业用途!
  *

+ 2 - 2
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/
  *
  * 未经允许,不可做商业用途!
  *

+ 2 - 2
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/
  *
  * 未经允许,不可做商业用途!
  *

+ 2 - 2
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/
  *
  * 未经允许,不可做商业用途!
  *

+ 2 - 2
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/
  *
  * 未经允许,不可做商业用途!
  *

+ 2 - 2
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/
  *
  * 未经允许,不可做商业用途!
  *

+ 2 - 2
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/
  *
  * 未经允许,不可做商业用途!
  *

+ 2 - 2
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/
  *
  * 未经允许,不可做商业用途!
  *

+ 2 - 2
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/
  *
  * 未经允许,不可做商业用途!
  *

+ 2 - 2
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/
  *
  * 未经允许,不可做商业用途!
  *

+ 2 - 2
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/
  *
  * 未经允许,不可做商业用途!
  *

+ 2 - 2
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/
  *
  * 未经允许,不可做商业用途!
  *

+ 2 - 2
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/
  *
  * 未经允许,不可做商业用途!
  *

+ 2 - 2
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/
  *
  * 未经允许,不可做商业用途!
  *

+ 2 - 2
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/
  *
  * 未经允许,不可做商业用途!
  *

+ 2 - 2
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/
  *
  * 未经允许,不可做商业用途!
  *

+ 2 - 2
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/
  *
  * 未经允许,不可做商业用途!
  *

+ 2 - 2
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/
  *
  * 未经允许,不可做商业用途!
  *

+ 2 - 2
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/
  *
  * 未经允许,不可做商业用途!
  *

+ 2 - 2
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/
  *
  * 未经允许,不可做商业用途!
  *

+ 2 - 2
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/
  *
  * 未经允许,不可做商业用途!
  *

+ 2 - 2
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/
  *
  * 未经允许,不可做商业用途!
  *

+ 2 - 2
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/
  *
  * 未经允许,不可做商业用途!
  *

+ 2 - 2
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/
  *
  * 未经允许,不可做商业用途!
  *

+ 2 - 2
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/
  *
  * 未经允许,不可做商业用途!
  *

+ 2 - 2
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/
  *
  * 未经允许,不可做商业用途!
  *

+ 2 - 2
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/
  *
  * 未经允许,不可做商业用途!
  *

+ 2 - 2
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/
  *
  * 未经允许,不可做商业用途!
  *

+ 2 - 2
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/
  *
  * 未经允许,不可做商业用途!
  *

+ 2 - 2
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/
  *
  * 未经允许,不可做商业用途!
  *

+ 6 - 6
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 class SwaggerConfiguration {
 	 @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();
 	 }

+ 2 - 2
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/
  *
  * 未经允许,不可做商业用途!
  *

+ 2 - 2
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/
  *
  * 未经允许,不可做商业用途!
  *

+ 2 - 2
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/
  *
  * 未经允许,不可做商业用途!
  *

+ 2 - 2
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/
  *
  * 未经允许,不可做商业用途!
  *

+ 2 - 2
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/
  *
  * 未经允许,不可做商业用途!
  *

+ 2 - 2
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/
  *
  * 未经允许,不可做商业用途!
  *

+ 2 - 2
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/
  *
  * 未经允许,不可做商业用途!
  *

+ 2 - 2
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/
  *
  * 未经允许,不可做商业用途!
  *

+ 2 - 2
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/
  *
  * 未经允许,不可做商业用途!
  *

+ 2 - 2
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/
  *
  * 未经允许,不可做商业用途!
  *

+ 2 - 2
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/
  *
  * 未经允许,不可做商业用途!
  *

+ 2 - 2
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/
  *
  * 未经允许,不可做商业用途!
  *

+ 2 - 2
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/
  *
  * 未经允许,不可做商业用途!
  *

+ 2 - 2
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/
  *
  * 未经允许,不可做商业用途!
  *

+ 2 - 2
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/
  *
  * 未经允许,不可做商业用途!
  *

+ 2 - 2
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/
  *
  * 未经允许,不可做商业用途!
  *

+ 2 - 2
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/
  *
  * 未经允许,不可做商业用途!
  *

+ 2 - 2
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/
  *
  * 未经允许,不可做商业用途!
  *

+ 2 - 2
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/
  *
  * 未经允许,不可做商业用途!
  *

+ 2 - 2
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/
  *
  * 未经允许,不可做商业用途!
  *

+ 2 - 2
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/
  *
  * 未经允许,不可做商业用途!
  *

+ 2 - 2
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/
  *
  * 未经允许,不可做商业用途!
  *

+ 2 - 2
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/
  *
  * 未经允许,不可做商业用途!
  *

+ 2 - 2
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/
  *
  * 未经允许,不可做商业用途!
  *

+ 2 - 2
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/
  *
  * 未经允许,不可做商业用途!
  *

+ 2 - 2
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/
  *
  * 未经允许,不可做商业用途!
  *

+ 2 - 2
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/
  *
  * 未经允许,不可做商业用途!
  *

+ 2 - 2
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/
  *
  * 未经允许,不可做商业用途!
  *

+ 2 - 2
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/
  *
  * 未经允许,不可做商业用途!
  *

+ 2 - 2
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/
  *
  * 未经允许,不可做商业用途!
  *

+ 2 - 2
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/
  *
  * 未经允许,不可做商业用途!
  *

+ 2 - 2
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/
  *
  * 未经允许,不可做商业用途!
  *

+ 2 - 2
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/
  *
  * 未经允许,不可做商业用途!
  *

+ 2 - 2
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/
  *
  * 未经允许,不可做商业用途!
  *

+ 2 - 2
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/
  *
  * 未经允许,不可做商业用途!
  *

+ 2 - 2
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/
  *
  * 未经允许,不可做商业用途!
  *

+ 2 - 2
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/
  *
  * 未经允许,不可做商业用途!
  *

+ 2 - 2
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/
  *
  * 未经允许,不可做商业用途!
  *

+ 2 - 2
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/
  *
  * 未经允许,不可做商业用途!
  *

+ 2 - 2
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/
  *
  * 未经允许,不可做商业用途!
  *

+ 2 - 2
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/
  *
  * 未经允许,不可做商业用途!
  *

+ 2 - 2
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/
  *
  * 未经允许,不可做商业用途!
  *

+ 2 - 2
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/
  *
  * 未经允许,不可做商业用途!
  *

+ 2 - 2
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/
  *
  * 未经允许,不可做商业用途!
  *

+ 2 - 2
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/
  *
  * 未经允许,不可做商业用途!
  *

+ 2 - 2
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/
  *
  * 未经允许,不可做商业用途!
  *

+ 2 - 2
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/
  *
  * 未经允许,不可做商业用途!
  *

+ 2 - 2
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/
  *
  * 未经允许,不可做商业用途!
  *

+ 2 - 2
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/
  *
  * 未经允许,不可做商业用途!
  *

+ 2 - 2
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/
  *
  * 未经允许,不可做商业用途!
  *

+ 2 - 2
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/
  *
  * 未经允许,不可做商业用途!
  *

+ 2 - 2
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/
  *
  * 未经允许,不可做商业用途!
  *

+ 2 - 2
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/
  *
  * 未经允许,不可做商业用途!
  *

+ 2 - 2
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/
  *
  * 未经允许,不可做商业用途!
  *

+ 2 - 2
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/
  *
  * 未经允许,不可做商业用途!
  *

+ 2 - 2
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/
  *
  * 未经允许,不可做商业用途!
  *

+ 2 - 2
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/
  *
  * 未经允许,不可做商业用途!
  *

+ 2 - 2
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/
  *
  * 未经允许,不可做商业用途!
  *

+ 2 - 2
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/
  *
  * 未经允许,不可做商业用途!
  *

+ 2 - 2
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/
  *
  * 未经允许,不可做商业用途!
  *

Неке датотеке нису приказане због велике количине промена