- 更新文档

docs/setup/quick-start.md

+> 艿艿：本文暂时会写的比较简洁，如果有不懂的地方，请来[「交流群」](http://www.iocoder.cn/mall-user-group/?vip&gitee)，艿艿来帮你解决。
+>
+> 交流群，我们提供了我们自己在使用的开发环境，搭建调试环境会更简便。
+
 # 1. 概述
 
 > 艿艿：本文暂时会写的比较简洁，如果有不懂的地方，请来[「交流群」](http://www.iocoder.cn/mall-user-group/?vip&gitee)，艿艿来帮你解决。
@@ -149,15 +153,15 @@ spring:
 
 具体的启动顺序，是：
 
-* AdminApplication
+* SystemApplication
 * UserApplication
 * ProductApplication
 * PayApplication
     > 因为支付服务，涉及三方支付平台的配置。所以，需要艿艿后续提供简便的方案。TODO
 
 * PromotionApplication
-* SearchApplication
 * OrderApplication
+* SearchApplication
 
 # 9. 启动前端项目
 

docs/sql/mall_product.sql

@@ -3,15 +3,15 @@
 
  Source Server         : mall_mysql
  Source Server Type    : MySQL
- Source Server Version : 50643
+ Source Server Version : 50726
  Source Host           : 180.167.213.26:13306
  Source Schema         : mall_product
 
  Target Server Type    : MySQL
- Target Server Version : 50643
+ Target Server Version : 50726
  File Encoding         : 65001
 
- Date: 28/04/2019 18:05:35
+ Date: 05/06/2019 07:57:40
 */
 
 SET NAMES utf8mb4;
@@ -28,8 +28,8 @@ CREATE TABLE `product_attr` (
   `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
   `update_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后更新时间',
   `deleted` bit(1) DEFAULT b'0' COMMENT '是否删除',
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=8 DEFAULT CHARSET=utf8mb4 COMMENT='product_attr';
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB AUTO_INCREMENT=9 DEFAULT CHARSET=utf8mb4 COMMENT='product_attr';
 
 -- ----------------------------
 -- Table structure for product_attr_value
@@ -43,8 +43,24 @@ CREATE TABLE `product_attr_value` (
   `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
   `update_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后更新时间',
   `deleted` bit(1) DEFAULT b'0' COMMENT '是否删除',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB AUTO_INCREMENT=44 DEFAULT CHARSET=utf8mb4 COMMENT='product_attr';
+
+-- ----------------------------
+-- Table structure for product_brand
+-- ----------------------------
+DROP TABLE IF EXISTS `product_brand`;
+CREATE TABLE `product_brand` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '品牌编号（主键）',
+  `name` varchar(50) DEFAULT NULL COMMENT '品牌名称',
+  `description` varchar(255) DEFAULT NULL COMMENT '品牌描述',
+  `pic_url` varchar(1024) DEFAULT NULL COMMENT '品牌名图片',
+  `status` tinyint(4) DEFAULT NULL COMMENT '状态 1开启 2禁用',
+  `create_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  `update_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后更新时间',
+  `deleted` bit(1) DEFAULT b'0' COMMENT '是否删除 0正常1删除',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=11 DEFAULT CHARSET=utf8mb4 COMMENT='product_attr';
+) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8mb4;
 
 -- ----------------------------
 -- Table structure for product_category
@@ -61,8 +77,8 @@ CREATE TABLE `product_category` (
   `update_time` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后更新时间',
   `status` tinyint(4) DEFAULT NULL COMMENT '状态',
   `deleted` bit(1) DEFAULT b'1' COMMENT '是否删除',
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=793 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC;
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB AUTO_INCREMENT=796 DEFAULT CHARSET=utf8mb4;
 
 -- ----------------------------
 -- Table structure for product_sku
@@ -79,8 +95,8 @@ CREATE TABLE `product_sku` (
   `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
   `update_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后更新时间',
   `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=47 DEFAULT CHARSET=utf8mb4 COMMENT='product_sku';
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB AUTO_INCREMENT=57 DEFAULT CHARSET=utf8mb4 COMMENT='product_sku';
 
 -- ----------------------------
 -- Table structure for product_spu
@@ -100,7 +116,7 @@ CREATE TABLE `product_spu` (
   `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
   `update_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后更新时间',
   `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=39 DEFAULT CHARSET=utf8mb4 COMMENT='product_spu';
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB AUTO_INCREMENT=43 DEFAULT CHARSET=utf8mb4 COMMENT='product_spu';
 
 SET FOREIGN_KEY_CHECKS = 1;

docs/sql/mall_promotion.sql

@@ -3,15 +3,15 @@
 
  Source Server         : mall_mysql
  Source Server Type    : MySQL
- Source Server Version : 50643
+ Source Server Version : 50726
  Source Host           : 180.167.213.26:13306
  Source Schema         : mall_promotion
 
  Target Server Type    : MySQL
- Target Server Version : 50643
+ Target Server Version : 50726
  File Encoding         : 65001
 
- Date: 28/04/2019 18:05:45
+ Date: 05/06/2019 07:57:50
 */
 
 SET NAMES utf8mb4;
@@ -33,7 +33,7 @@ CREATE TABLE `banner` (
   `update_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后更新时间',
   `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8mb4 COMMENT='banner';
+) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8mb4 COMMENT='banner';
 
 -- ----------------------------
 -- Table structure for coupon_card
@@ -87,7 +87,7 @@ CREATE TABLE `coupon_template` (
   `stat_fetch_num` int(11) NOT NULL COMMENT '领取优惠券的次数',
   `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
   `update_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后更新时间',
-  PRIMARY KEY (`id`)
+  PRIMARY KEY (`id`) USING BTREE
 ) ENGINE=InnoDB AUTO_INCREMENT=8 DEFAULT CHARSET=utf8mb4 COMMENT='coupon_template';
 
 -- ----------------------------
@@ -104,8 +104,8 @@ CREATE TABLE `product_recommend` (
   `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
   `update_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后更新时间',
   `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=utf8mb4 COMMENT='product_recommend';
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB AUTO_INCREMENT=8 DEFAULT CHARSET=utf8mb4 COMMENT='product_recommend';
 
 -- ----------------------------
 -- Table structure for promotion_activity
@@ -124,7 +124,24 @@ CREATE TABLE `promotion_activity` (
   `full_privilege` varchar(2000) DEFAULT NULL COMMENT '限制折扣字符串，使用 JSON 序列化成字符串存储',
   `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
   `update_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后更新时间',
-  PRIMARY KEY (`id`)
+  PRIMARY KEY (`id`) USING BTREE
 ) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb4 COMMENT='promotion_activity';
 
+-- ----------------------------
+-- Table structure for undo_log
+-- ----------------------------
+DROP TABLE IF EXISTS `undo_log`;
+CREATE TABLE `undo_log` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `branch_id` bigint(20) NOT NULL,
+  `xid` varchar(100) NOT NULL,
+  `rollback_info` longblob NOT NULL,
+  `log_status` int(11) NOT NULL,
+  `log_created` datetime NOT NULL,
+  `log_modified` datetime NOT NULL,
+  `ext` varchar(100) DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `ux_undo_log` (`xid`,`branch_id`)
+) ENGINE=InnoDB AUTO_INCREMENT=27 DEFAULT CHARSET=utf8;
+
 SET FOREIGN_KEY_CHECKS = 1;

docs/sql/mall_user.sql

@@ -3,15 +3,15 @@
 
  Source Server         : mall_mysql
  Source Server Type    : MySQL
- Source Server Version : 50643
+ Source Server Version : 50726
  Source Host           : 180.167.213.26:13306
  Source Schema         : mall_user
 
  Target Server Type    : MySQL
- Target Server Version : 50643
+ Target Server Version : 50726
  File Encoding         : 65001
 
- Date: 28/04/2019 18:05:53
+ Date: 05/06/2019 07:58:03
 */
 
 SET NAMES utf8mb4;
@@ -27,12 +27,12 @@ CREATE TABLE `mobile_code` (
   `code` varchar(6) NOT NULL,
   `today_index` tinyint(4) NOT NULL,
   `used` tinyint(4) NOT NULL,
-  `userd_user_id` int(20) DEFAULT NULL,
+  `used_user_id` int(20) DEFAULT NULL,
   `used_time` datetime DEFAULT NULL,
   `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
   `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=135 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC;
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB AUTO_INCREMENT=236 DEFAULT CHARSET=utf8mb4;
 
 -- ----------------------------
 -- Table structure for oauth2_access_token
@@ -46,9 +46,9 @@ CREATE TABLE `oauth2_access_token` (
   `expires_time` datetime DEFAULT NULL,
   `create_time` datetime DEFAULT CURRENT_TIMESTAMP,
   `update_time` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP,
-  PRIMARY KEY (`id`),
-  KEY `idx_uid` (`user_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC;
+  PRIMARY KEY (`id`) USING BTREE,
+  KEY `idx_uid` (`user_id`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 -- ----------------------------
 -- Table structure for oauth2_refresh_token
@@ -61,9 +61,9 @@ CREATE TABLE `oauth2_refresh_token` (
   `expires_time` datetime DEFAULT NULL,
   `create_time` datetime DEFAULT CURRENT_TIMESTAMP,
   `update_time` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP,
-  PRIMARY KEY (`id`),
-  KEY `idx_uid` (`user_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC;
+  PRIMARY KEY (`id`) USING BTREE,
+  KEY `idx_uid` (`user_id`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 -- ----------------------------
 -- Table structure for user_access_log
@@ -80,8 +80,8 @@ CREATE TABLE `user_access_log` (
   `start_time` datetime NOT NULL COMMENT '请求时间',
   `response_time` int(11) NOT NULL COMMENT '响应时长 -- 毫秒级',
   `create_time` datetime NOT NULL COMMENT '创建时间',
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=7772 DEFAULT CHARSET=utf8mb4 COMMENT='admin_access_log';
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB AUTO_INCREMENT=10579 DEFAULT CHARSET=utf8mb4 COMMENT='admin_access_log';
 
 -- ----------------------------
 -- Table structure for user_address
@@ -98,8 +98,8 @@ CREATE TABLE `user_address` (
   `update_time` datetime DEFAULT NULL COMMENT '更新时间',
   `has_default` int(1) NOT NULL COMMENT '是否默认',
   `deleted` int(2) NOT NULL COMMENT '删除状态',
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=8 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB AUTO_INCREMENT=18 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
 
 -- ----------------------------
 -- Table structure for user_register
@@ -109,7 +109,7 @@ CREATE TABLE `user_register` (
   `id` int(20) NOT NULL,
   `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
   `udpate_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 -- ----------------------------
 -- Table structure for users
@@ -124,8 +124,8 @@ CREATE TABLE `users` (
   `create_time` datetime DEFAULT CURRENT_TIMESTAMP,
   `update_time` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   `deleted` bit(1) DEFAULT b'0' COMMENT '是否删除',
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `idx_uid` (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=43 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
+  PRIMARY KEY (`id`) USING BTREE,
+  UNIQUE KEY `idx_uid` (`id`) USING BTREE
+) ENGINE=InnoDB AUTO_INCREMENT=108 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
 
 SET FOREIGN_KEY_CHECKS = 1;