修改Merge产生的文件名覆盖问题

2020-05-19 12:51:53 +08:00
parent 5db1bd8b35 ef1f414339
commit f4e849fcbc
50 changed files with 3124 additions and 3 deletions
--- a/sql/yxshop2.2.sql
+++ b/sql/yxshop2.2.sql
--- a/yshop-mp/src/main/java/co/yixiang/mp/service/dto/YxWechatMenuDto.java
+++ b/yshop-mp/src/main/java/co/yixiang/mp/service/dto/YxWechatMenuDto.java
--- a/yshop-mp/src/main/java/co/yixiang/mp/service/dto/YxWechatReplyDto.java
+++ b/yshop-mp/src/main/java/co/yixiang/mp/service/dto/YxWechatReplyDto.java
--- a/yshop-mp/src/main/java/co/yixiang/mp/service/dto/YxWechatTemplateDto.java
+++ b/yshop-mp/src/main/java/co/yixiang/mp/service/dto/YxWechatTemplateDto.java
--- a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreBargainDto.java
+++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreBargainDto.java
--- a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCombinationDto.java
+++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCombinationDto.java
--- a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCouponDto.java
+++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCouponDto.java
--- a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCouponIssueDto.java
+++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCouponIssueDto.java
--- a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCouponIssueUserDto.java
+++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCouponIssueUserDto.java
--- a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCouponUserDto.java
+++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCouponUserDto.java
--- a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStorePinkDto.java
+++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStorePinkDto.java
--- a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreSeckillDto.java
+++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreSeckillDto.java
--- a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreVisitDto.java
+++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreVisitDto.java
--- a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxUserExtractDto.java
+++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxUserExtractDto.java
--- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/ChartDataDto.java
+++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/ChartDataDto.java
--- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/DetailDto.java
+++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/DetailDto.java
--- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/FromatDetailDto.java
+++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/FromatDetailDto.java
--- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/OrderTimeDataDto.java
+++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/OrderTimeDataDto.java
--- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/ProductFormatDto.java
+++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/ProductFormatDto.java
--- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/StoreOrderCartInfoDto.java
+++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/StoreOrderCartInfoDto.java
--- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/UserBillDto.java
+++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/UserBillDto.java
--- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/UserMoneyDto.java
+++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/UserMoneyDto.java
--- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxExpressDto.java
+++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxExpressDto.java
--- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreCategoryDto.java
+++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreCategoryDto.java
--- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreCategorySmallDto.java
+++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreCategorySmallDto.java
--- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreOrderDto.java
+++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreOrderDto.java
--- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreOrderStatusDto.java
+++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreOrderStatusDto.java
--- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreProductDto.java
+++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreProductDto.java
--- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreProductReplyDto.java
+++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreProductReplyDto.java
--- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreProductSmallDto.java
+++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreProductSmallDto.java
--- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemConfigDto.java
+++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemConfigDto.java
--- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemGroupDataDto.java
+++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemGroupDataDto.java
--- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemUserLevelDto.java
+++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemUserLevelDto.java
--- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemUserTaskDto.java
+++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemUserTaskDto.java
--- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxUserBillDto.java
+++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxUserBillDto.java
--- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxUserDto.java
+++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxUserDto.java
--- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxUserSmallDto.java
+++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxUserSmallDto.java
--- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxWechatUserDto.java
+++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxWechatUserDto.java
--- a/yshop-system/src/main/java/co/yixiang/modules/system/service/dto/DeptDto.java
+++ b/yshop-system/src/main/java/co/yixiang/modules/system/service/dto/DeptDto.java
--- a/yshop-system/src/main/java/co/yixiang/modules/system/service/dto/DeptSmallDto.java
+++ b/yshop-system/src/main/java/co/yixiang/modules/system/service/dto/DeptSmallDto.java
--- a/yshop-system/src/main/java/co/yixiang/modules/system/service/dto/DictDetailDto.java
+++ b/yshop-system/src/main/java/co/yixiang/modules/system/service/dto/DictDetailDto.java
--- a/yshop-system/src/main/java/co/yixiang/modules/system/service/dto/DictDto.java
+++ b/yshop-system/src/main/java/co/yixiang/modules/system/service/dto/DictDto.java
--- a/yshop-system/src/main/java/co/yixiang/modules/system/service/dto/JobDto.java
+++ b/yshop-system/src/main/java/co/yixiang/modules/system/service/dto/JobDto.java
--- a/yshop-system/src/main/java/co/yixiang/modules/system/service/dto/JobSmallDto.java
+++ b/yshop-system/src/main/java/co/yixiang/modules/system/service/dto/JobSmallDto.java
--- a/yshop-system/src/main/java/co/yixiang/modules/system/service/dto/MenuDto.java
+++ b/yshop-system/src/main/java/co/yixiang/modules/system/service/dto/MenuDto.java
--- a/yshop-system/src/main/java/co/yixiang/modules/system/service/dto/PermissionDto.java
+++ b/yshop-system/src/main/java/co/yixiang/modules/system/service/dto/PermissionDto.java
--- a/yshop-system/src/main/java/co/yixiang/modules/system/service/dto/RoleDto.java
+++ b/yshop-system/src/main/java/co/yixiang/modules/system/service/dto/RoleDto.java
--- a/yshop-system/src/main/java/co/yixiang/modules/system/service/dto/RoleSmallDto.java
+++ b/yshop-system/src/main/java/co/yixiang/modules/system/service/dto/RoleSmallDto.java
--- a/yshop-system/src/main/java/co/yixiang/modules/system/service/dto/UserDto.java
+++ b/yshop-system/src/main/java/co/yixiang/modules/system/service/dto/UserDto.java
--- a/yshop-system/src/main/resources/config/application-dev.yml
+++ b/yshop-system/src/main/resources/config/application-dev.yml
@ -51,7 +51,7 @@ spring:
    database: 0
    host: 127.0.0.1
    port: 6379
-    password:
+    password: root
    #连接超时时间
    timeout: 5000

@ -84,8 +84,8 @@ swagger:

 # 文件存储路径
 file:
-  path: E:\yshop\file\
-  avatar: E:\yshop\avatar\
+  path: D:\yshop\file\
+  avatar: D:\yshop\avatar\
  # 文件大小 /M
  maxSize: 100
  avatarMaxSize: 5