'代码合并'

JackPong · Mar 3, 2022 · 441cb6d · 441cb6d
2 parents f14efa2 + ae0c4ae
commit 441cb6d
Show file tree

Hide file tree

Showing 42 changed files with 1,357 additions and 39 deletions.
diff --git a/DB/version4.1to4.2.sql b/DB/version4.1to4.2.sql
@@ -6,7 +6,11 @@ ALTER TABLE li_distribution ADD settlement_bank_branch_name varchar ( 200 );
 /** 文章分类添加默认值**/
 ALTER TABLE li_article_category alter column sort set default 0;
 /** 添加分销提现菜单**/
+<<<<<<< HEAD
 INSERT INTO `rxshop`.`li_menu`(`id`, `create_by`, `create_time`, `delete_flag`, `update_by`, `update_time`, `description`, `front_route`, `icon`, `level`, `name`, `parent_id`, `path`, `sort_order`, `title`, `front_component`) VALUES (1410862675914764290, 'admin', '2021-07-02 15:27:29', b'0', 'admin', '2021-07-02 15:27:45', 'null', 'distribution/distributionCash', '', 2, 'distributionCash', '1374173575405109248', 'distributionCash', 5.00, '分销提现', 'null');
+=======
+INSERT INTO `lilishop`.`li_menu`(`id`, `create_by`, `create_time`, `delete_flag`, `update_by`, `update_time`, `description`, `front_route`, `icon`, `level`, `name`, `parent_id`, `path`, `sort_order`, `title`, `front_component`) VALUES (1410862675914764290, 'admin', '2021-07-02 15:27:29', b'0', 'admin', '2021-07-02 15:27:45', 'null', 'distribution/distributionCash', '', 2, 'distributionCash', '1374173575405109248', 'distributionCash', 5.00, '分销提现', 'null');
+>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
 
 /** 促销商品添加商品类型**/
 ALTER TABLE li_promotion_goods ADD goods_type varchar (200);
@@ -16,7 +20,11 @@ update li_member_points_history set point_type = 'INCREASE' where point_type=1;
 update li_member_points_history set point_type = 'REDUCE' where point_type=0;
 
 /** 添加分词管理菜单*/
+<<<<<<< HEAD
 INSERT INTO `rxshop`.`li_menu` (`id`, `create_by`, `create_time`, `delete_flag`, `update_by`, `update_time`, `description`, `front_route`, `icon`, `level`, `name`, `parent_id`, `path`, `sort_order`, `title`, `front_component`) VALUES (1349247640584085511, 'admin', '2021-01-13 14:51:20', b'0', 'admin', '2021-02-25 09:02:59', 'null', 'customWords/index', 'ios-american-football', 2, 'customWords', '1349237129847005184', 'customWords', 8.00, '分词管理', 'null');
+=======
+INSERT INTO `lilishop`.`li_menu` (`id`, `create_by`, `create_time`, `delete_flag`, `update_by`, `update_time`, `description`, `front_route`, `icon`, `level`, `name`, `parent_id`, `path`, `sort_order`, `title`, `front_component`) VALUES (1349247640584085511, 'admin', '2021-01-13 14:51:20', b'0', 'admin', '2021-02-25 09:02:59', 'null', 'customWords/index', 'ios-american-football', 2, 'customWords', '1349237129847005184', 'customWords', 8.00, '分词管理', 'null');
+>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
 
 /** 修改会员评价店铺图片字段类型 **/
 alter table li_member_evaluation modify column reply_image text;
@@ -25,4 +33,8 @@ alter table li_member_evaluation modify column reply_image text;
 alter table li_after_sale modify column after_sale_image text;
 
 /** 提现申请审核sql **/
-INSERT INTO `rxshop`.`li_menu`(`id`, `create_by`, `create_time`, `delete_flag`, `update_by`, `update_time`, `description`, `front_route`, `icon`, `level`, `name`, `parent_id`, `path`, `sort_order`, `title`, `front_component`) VALUES (1367042804944994305, 'admin', '2021-03-03 09:22:58', b'0', NULL, NULL, NULL, 'member/advance/withdrawApply', 'ios-alert', 2, 'withdrawApply', '1367042490443497472', 'withdrawApply', 1.00, '提现申请', NULL);
+<<<<<<< HEAD
+INSERT INTO `rxshop`.`li_menu`(`id`, `create_by`, `create_time`, `delete_flag`, `update_by`, `update_time`, `description`, `front_route`, `icon`, `level`, `name`, `parent_id`, `path`, `sort_order`, `title`, `front_component`) VALUES (1367042804944994305, 'admin', '2021-03-03 09:22:58', b'0', NULL, NULL, NULL, 'member/advance/withdrawApply', 'ios-alert', 2, 'withdrawApply', '1367042490443497472', 'withdrawApply', 1.00, '提现申请', NULL);
+=======
+INSERT INTO `lilishop`.`li_menu`(`id`, `create_by`, `create_time`, `delete_flag`, `update_by`, `update_time`, `description`, `front_route`, `icon`, `level`, `name`, `parent_id`, `path`, `sort_order`, `title`, `front_component`) VALUES (1367042804944994305, 'admin', '2021-03-03 09:22:58', b'0', NULL, NULL, NULL, 'member/advance/withdrawApply', 'ios-alert', 2, 'withdrawApply', '1367042490443497472', 'withdrawApply', 1.00, '提现申请', NULL);
+>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
diff --git a/LICENSE b/LICENSE
diff --git a/README.md b/README.md
@@ -6,10 +6,20 @@
 
 #### 欢迎交流需求，交流业务，交流技术（基础问题自行解决，进群先看文档后提问）
 
+<<<<<<< HEAD
 ##### 交流 qq 1群 961316482（已满）
 
 ##### 交流 qq 2群 875294241
 
+=======
+
+##### 交流 qq 1群 961316482（已满）
+<a target="_blank" href="https://qm.qq.com/cgi-bin/qm/qr?k=BAhURE3DG2YWhQk6kRxVapbLykqMoPS8&jump_from=webapi"><img border="0" src="https://pub.idqqimg.com/wpa/images/group.png" alt="Lilishop交流群" title="Lilishop交流群">点击快捷加群</a>
+
+##### 交流 qq 2群 875294241
+
+<a target="_blank" href="https://qm.qq.com/cgi-bin/qm/qr?k=_lrekOvr5k2p5uTn5GRidI-chKEmpCX3&jump_from=webapi"><img border="0" src="https://pub.idqqimg.com/wpa/images/group.png" alt="Lilishop交流群2群" title="Lilishop交流群2群">点击快捷加群</a>
+>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
 
 
 ##### 体验 公众号/小程序/APP 体验，扫描二维码

diff --git a/admin/pom.xml b/admin/pom.xml
@@ -32,10 +32,17 @@
             <artifactId>logstash-logback-encoder</artifactId>
             <version>${logstash-logback-encoder}</version>
         </dependency>
+<<<<<<< HEAD
         <!--        <dependency>-->
         <!--            <groupId>org.springframework.boot</groupId>-->
         <!--            <artifactId>spring-boot-starter-mail</artifactId>-->
         <!--        </dependency> -->
+=======
+<!--        <dependency>-->
+<!--            <groupId>org.springframework.boot</groupId>-->
+<!--            <artifactId>spring-boot-starter-mail</artifactId>-->
+<!--        </dependency> -->
+>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
     </dependencies>
 
     <build>
@@ -47,4 +54,8 @@
         </plugins>
     </build>
 
-</project>
+<<<<<<< HEAD
+</project>
+=======
+</project>
+>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
diff --git a/admin/src/main/resources/application.properties b/admin/src/main/resources/application.properties
@@ -16,6 +16,9 @@ [email protected]
 spring.mail.password=abcdefg123456!@#$%^
 # 日志文件路径
 logging.file.path=lili-logs/admin
+<<<<<<< HEAD
 lili.data.logstash.server=106.124.130.167:4560
+=======
+>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
 # 文件格式
 logging.pattern.file=%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(%5p) %clr(${PID}){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n%wEx
diff --git a/buyer-api/src/main/java/cn/lili/controller/other/PageBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/other/PageBuyerController.java
@@ -36,12 +36,15 @@ public class PageBuyerController {
     public ResultMessage<PageDataVO> getIndex(@RequestParam String clientType) {
         PageDataDTO pageDataDTO = new PageDataDTO(PageEnum.INDEX.name());
         pageDataDTO.setPageClientType(clientType);
-        return ResultUtil.data(pageService.getPageData(pageDataDTO));
+        PageDataVO pageDataVO=pageService.getPageData(pageDataDTO);
+        return ResultUtil.data(pageDataVO);
     }
 
     @ApiOperation(value = "获取页面数据")
     @GetMapping
     public ResultMessage<PageDataVO> get(PageDataDTO pageDataDTO) {
-        return ResultUtil.data(pageService.getPageData(pageDataDTO));
+
+        PageDataVO pageDataVO=pageService.getPageData(pageDataDTO);
+        return ResultUtil.data(pageDataVO);
     }
 }
diff --git a/buyer-api/src/main/resources/application.yml b/buyer-api/src/main/resources/application.yml
@@ -1,5 +1,10 @@
 server:
+<<<<<<< HEAD
   port: 8885
+=======
+  port: 8888
+
+>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
   servlet:
     context-path: /
 #
@@ -51,9 +56,15 @@ spring:
 
   # Redis
   redis:
+<<<<<<< HEAD
     host: 120.71.145.134
     port: 6379
     password: ekLhvPGraSj8DGO0
+=======
+    host: 127.0.0.1
+    port: 6379
+    password: lilishop
+>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
     lettuce:
       pool:
         # 连接池最大连接数（使用负值表示没有限制） 默认 8
@@ -72,9 +83,15 @@ spring:
       default-datasource:
         type: com.alibaba.druid.pool.DruidDataSource
         driverClassName: com.mysql.cj.jdbc.Driver
+<<<<<<< HEAD
         url: jdbc:mysql://120.71.183.195:3306/zyt_shop?useUnicode=true&characterEncoding=UTF-8&serverTimezone=UTC&allowPublicKeyRetrieval=true&verifyServerCertificate=false&useSSL=false
         username: zyt_shop
         password: Gb84505016@zytshop
+=======
+        url: jdbc:mysql://127.0.0.1:3306/lilishop?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+        username: root
+        password: lilishop
+>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
         maxActive: 50
         initialSize: 10
         maxWait: 60000
@@ -128,6 +145,10 @@ ignored:
     - /weixin/**
     - /source/**
     - /buyer/payment/cashier/**
+<<<<<<< HEAD
+=======
+    - /buyer/payment/cashierRefund/**
+>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
     - /buyer/other/pageData/**
     - /buyer/other/article/**
     - /buyer/goods/**
@@ -160,8 +181,13 @@ ignored:
 
 # Swagger界面内容配置
 swagger:
+<<<<<<< HEAD
   title: API接口文档
   description: Api Documentation
+=======
+  title: lili API接口文档
+  description: lili Api Documentation
+>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
   version: 1.0.0
   termsOfServiceUrl: https://pickmall.cn
   contact:
@@ -184,7 +210,11 @@ logging:
   # 输出级别
   level:
     root: info
+<<<<<<< HEAD
   #    org.springframework: debug
+=======
+#    org.springframework: debug
+>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
   file:
     # 指定路径
     path: lili-logs
@@ -201,7 +231,11 @@ jasypt:
 
 lili:
   system:
+<<<<<<< HEAD
     isDemoSite: false
+=======
+    isDemoSite: true
+>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
   statistics:
     # 在线人数统计 X 小时。这里设置48，即统计过去48小时每小时在线人数
     onlineMember: 48
@@ -219,10 +253,17 @@ lili:
     admin: https://admin-b2b2c.pickmall.cn
   #api地址
   api:
+<<<<<<< HEAD
     buyer: https://zshop-api.sx1788.cn/buyer-api
     common: https://zshop-api.sx1788.cn/common-api
     manager: https://zshop-api.sx1788.cn/manager-api
     store: https://zshop-api.sx1788.cn/seller-api
+=======
+    buyer: https://buyer-api.pickmall.cn
+    common: https://common-api.pickmall.cn
+    manager: https://admin-api.pickmall.cn
+    store: https://store-api.pickmall.cn
+>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
 
   # jwt 细节设定
   jwt-setting:
@@ -241,7 +282,11 @@ lili:
   data:
     elasticsearch:
       cluster-name: elasticsearch
+<<<<<<< HEAD
       cluster-nodes: 106.124.130.167:9200
+=======
+      cluster-nodes: 127.0.0.1:9200
+>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
       index:
         number-of-replicas: 0
         number-of-shards: 3
@@ -251,7 +296,11 @@ lili:
     #        username: elastic
     #        password: LiLiShopES
     logstash:
+<<<<<<< HEAD
       server: 106.124.130.167:4560
+=======
+      server: 192.168.0.116:4560
+>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
     rocketmq:
       promotion-topic: lili_promotion_topic
       promotion-group: lili_promotion_group
@@ -272,7 +321,11 @@ lili:
       after-sale-topic: lili_after_sale_topic
       after-sale-group: lili_after_sale_group
 rocketmq:
+<<<<<<< HEAD
   name-server: 106.124.130.167:9876
+=======
+  name-server: 127.0.0.1:9876
+>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
   producer:
     group: lili_group
     send-message-timeout: 30000