项目Spring cloud alibaba 组件升级2.2.1

.gitignore

@@ -16,7 +16,7 @@ shop-manage/src/main/resources/public
 *.nar
 *.ear
 *.zip
-# *.tar.gz
+*.tar.gz
 *.rar
 
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml

README.md

@@ -1,13 +1,12 @@
 # spring-cloud-shop
     spring cloud 版分布式电商项目，全力打造顶级多模块，高可用，高扩展电商项目。
     目前项目使用分库设计方案，不同的模块依赖不同的数据库实例
-    营销模块: pager_activity 
+    营销中心: pager_activity
+    授权中心: pager-auth
     商品中心: pager_goods 
     订单中心: pager_order 
     数据中心: pager_shop 
     风控中心: pager-risk 
-    授权中心: pager-auth
-    分布式定时任务采用xxl-job方式实现
     后台登陆采用oauth2.0授权，支持密码登陆，授权码登陆，短信验证码登陆
     注册中心与配置中心已使用alibaba nacos
 # 最近在深度学习ELK，项目更新会迟缓，月底将会集成ELK相关功能，尽情期待！    
@@ -16,25 +15,27 @@
 ```
     自2020年02月07日起，spring-cloud-shop项目提供脚本升级方案，基础脚本存放在doc/base目录中，升级脚本存放在doc/upgrade中。
 ```
-# 目前开发计划
-    1. 为了提高前端的开发效率，目前正在开发自定义表单系统，大约会在12月中旬开发完成
-    2. 2019年初提供在线体验Demo
-    3. 2019年春节过后将会把商品体系与订单体系完成
-    4. 商品体系与订单体系完成后，将会与营销活动集成，打通整体电商平台
+# 目前开发小结
+    1. spring cloud alibaba 版本已经升级到最新版本2.2.1，nacos 1.3.2，seata 1.3.0， Spring boot 2.2.9，Spring cloud 2.2.2。
+    2. spring-cloud-shop 即将迎来最终的版块（完结），将于2020年底全部开源（只用常见的商品->购物->下单->优惠->结算）流程，
+       其它扩展辅助流程将不再研发（小伙伴们可以自行扩展）。
+    3. 技术栈即将毕业，唯一的缺陷就是MQ的选择，开发过程中选择了rabbitMq以及Kafka，现在已经将MQ代码全部移除（移除原因暂时不公开）。
+    4. 后期主要是将各个模块串联一起，项目更新就会比较延缓，最终版将会包含目前所有主流的技术栈以及相关的解决方案。
+
 
 # 设计初衷
     设计此项目是为了进一步学习Spring Cloud 技术栈。从项目实战深入Spring Cloud 各个微服务的解决方案。因此采用最常见的电商业务作为
     练手项目。
-# 项目部署
-    1. 搭建各个服务的数据库服务，sql在doc文件中
+# 项目部署简介
+    1. 搭建各个服务的数据库服务，sql在doc文件中，请使用base里的全量脚本
     2. 搭建nacos 注册中心服务，可集群部署
-    3. 搭建redis 中间件缓存服务，可集群部署
-    4. 搭建rabbitMq 中间件队列服务
-    5. 搭建seata 分布式事务管理服务
-    6. 搭建xxl-job-admin 分布式定时任务管理平台，可集群搭建
+    3. 搭建seata 分布式事务管理服务
+    4. 搭建redis 中间件缓存服务，可集群部署
+    5. 搭建rabbitMq 中间件队列服务（暂放，消息队列已经全部移除了）
     7. 搭建shop-* 项目，可多实例部署
-    8. 安装node工具，将vue-shop-admin后台管理服务打包部署，并使用nginx做反向代理，转发到服务网关层
-
+    8. 安装node工具，将vue-shop-admin后台管理服务打包部署，并使用nginx做反向代理，转发到服务网关层  
+## 详细部署文档请移步Wiki 项目部署模块
+
 ## 部署平台管理系统
    前往[系统管理平台](https://github.com/SiGuiyang/vue-shop-admin.git)下载，下载之前请先安装node工具
 
@@ -53,5 +54,7 @@
 ![用户](https://github.com/SiGuiyang/spring-cloud-shop/blob/master/images/user.png "Pager分布式电商项目")
 ![角色](https://github.com/SiGuiyang/spring-cloud-shop/blob/master/images/role.png "Pager分布式电商项目")
 ![菜单](https://github.com/SiGuiyang/spring-cloud-shop/blob/master/images/menu.png "Pager分布式电商项目")
+![菜单](https://github.com/SiGuiyang/spring-cloud-shop/blob/master/images/nacos-1.png "Pager分布式电商项目")
+![菜单](https://github.com/SiGuiyang/spring-cloud-shop/blob/master/images/nacos-2.png "Pager分布式电商项目")
 
 #### 如有疑问，欢迎参与，如有更好的方案，可以邮件联系我本人**siguiyang1992@outlook.com**，谢谢！

doc/base/pager_activity.sql

@@ -11,7 +11,7 @@
  Target Server Version : 50646
  File Encoding         : utf-8
 
- Date: 05/05/2020 18:37:39 PM
+ Date: 09/04/2020 15:27:27 PM
 */
 
 SET NAMES utf8;
@@ -172,7 +172,7 @@ CREATE TABLE `t_banner` (
 --  Records of `t_banner`
 -- ----------------------------
 BEGIN;
-INSERT INTO `t_banner` VALUES ('1', '玩转圣诞', 'http://pk6b0a7n8.bkt.clouddn.com/banner1.jpg', 'fsdfsdfsdfsfsf', 'integralShop', null, 'eeee', '玩转圣诞', '玩转圣诞', 'http://pk6b0a7n8.bkt.clouddn.com/20190104/092c25c8558c419197fe3287f0a0165a.jpg', null, '', null, '2018-12-23 19:12:42', '2018-12-23 03:11:27', b'0'), ('2', 'rrrr', null, 'ffff', 'integralShop', null, 'ff', 'ff', 'ff', 'http://pk6b0a7n8.bkt.clouddn.com/20190104/092c25c8558c419197fe3287f0a0165a.jpg', null, 'admin', null, '2019-01-04 11:00:22', '2019-01-04 11:00:21', b'1'), ('3', 'iioi', null, 'yyy', 'home', null, 'yyy', 'yy', 'yy', 'http://pk6b0a7n8.bkt.clouddn.com/20190104/1e38caaafa5d41469252a35c3321a35a.jpg', null, 'admin', null, '2019-01-04 11:19:14', '2019-01-04 11:19:14', b'0'), ('4', '66666', 'http://pk6b0a7n8.bkt.clouddn.com/20190104/20a950c5384e4e42acf24733f85d43f3.jpg', 'rrewrwe', 'integralShop', null, 'rwerwer', 'rwerwer', 'rwerw', 'http://pk6b0a7n8.bkt.clouddn.com/20190104/715b98f69b1c44bfb9ee978b48b9af0e.jpg', null, 'admin', null, '2019-01-04 11:21:35', '2019-01-04 11:21:34', b'0'), ('5', 'fsdffsdf', 'http://pk6b0a7n8.bkt.clouddn.com/20190104/0331a2f8be34477e88681a2c6d8ca6c9.jpg', 'rrr', 'home', null, 'rrr', 'rrr', 'rrr', 'http://pk6b0a7n8.bkt.clouddn.com/20190104/715b98f69b1c44bfb9ee978b48b9af0e.jpg', null, '', null, '2019-01-04 11:25:48', '2019-01-04 11:25:47', b'0'), ('6', '44455rddtt', 'http://pk6b0a7n8.bkt.clouddn.com/20190104/715b98f69b1c44bfb9ee978b48b9af0e.jpg', 'fdsfs', 'home', null, 'fdsf', 'fsdf', 'fsdf', 'http://pk6b0a7n8.bkt.clouddn.com/20190104/858ba9b8b33145c288477c2b0f2d790e.jpg', 'wechatFriends,wechat,qq', '', null, '2019-01-04 11:34:47', '2019-01-04 11:34:47', b'0'), ('7', '玩转圣诞', 'http://pk6b0a7n8.bkt.clouddn.com/20190104/092c25c8558c419197fe3287f0a0165a.jpg', 'fdsfs', 'classification', null, 'fsdfs', 'fdsfs', 'fsdfs', 'http://pk6b0a7n8.bkt.clouddn.com/20190104/8cca633b0b884faea8d6a56a3c7eeb75.jpg', '', 'admin', null, '2019-01-04 11:36:51', '2019-01-04 11:36:50', b'1'), ('9', '玩转圣诞', null, null, 'classification', null, null, null, null, null, '', 'admin', null, '2019-04-22 17:11:20', '2019-04-22 17:11:19', b'0'), ('10', '玩转圣诞', null, null, 'classification', null, null, null, null, null, '', '', null, '2019-04-22 17:12:27', '2019-04-22 17:12:27', b'0'), ('11', '玩转圣诞', 'http://pp7x7b2mm.bkt.clouddn.com/static/20191102/95fd799cfadb47bda7b60ca11e5dae16 (1).jpg', 'e', 'classification', null, '3', '3', '3', 'http://pp7x7b2mm.bkt.clouddn.com/static/20191102/6b29b9a0c79c4a53aaf4e562afdce191.jpg', 'wechatFriends', 'admin', 'admin', '2019-04-22 17:14:50', '2019-04-22 17:14:49', b'0'), ('12', '玩转圣诞', null, null, 'classification', null, null, null, null, null, null, 'admin', 'admin', '2019-04-24 11:20:06', '2019-04-24 11:20:05', b'0'), ('13', '会计法', 'http://pp7x7b2mm.bkt.clouddn.com/static/20191102/95fd799cfadb47bda7b60ca11e5dae16 (1).jpg', null, 'integralShop', null, '空流泪了', '积极 iui', '一个个回家赶紧回归', 'http://pp7x7b2mm.bkt.clouddn.com/static/20191102/41f82e8b05744a6fbf20a9c008a9fd6d.jpg', 'wechatFriends,wechat,qq', 'admin', null, '2019-11-02 14:22:55', '2019-11-02 14:17:54', b'0'), ('14', 'fsfsdfsdfrwerwe', 'http://pp7x7b2mm.bkt.clouddn.com/static/20191102/25aa537d3745416b832634a22df57307.jpg', 'rrrr', 'home', null, 'rrr', 'rrr', 'rrr', 'http://pp7x7b2mm.bkt.clouddn.com/static/20191102/715b98f69b1c44bfb9ee978b48b9af0e.jpg', 'wechat,qq', 'admin', null, '2019-11-02 14:24:29', '2019-11-02 14:24:28', b'0');
+INSERT INTO `t_banner` VALUES ('1', '玩转圣诞', 'http://pk6b0a7n8.bkt.clouddn.com/banner1.jpg', 'fsdfsdfsdfsfsf', 'integralShop', null, 'eeee', '玩转圣诞', '玩转圣诞', 'http://pk6b0a7n8.bkt.clouddn.com/20190104/092c25c8558c419197fe3287f0a0165a.jpg', 'wechat,wechatFriends', '', 'admin', '2018-12-23 19:12:42', '2018-12-23 03:11:27', b'0');
 COMMIT;
 
 -- ----------------------------
@@ -227,7 +227,7 @@ CREATE TABLE `t_discount_coupon_template` (
 --  Records of `t_discount_coupon_template`
 -- ----------------------------
 BEGIN;
-INSERT INTO `t_discount_coupon_template` VALUES ('1', '新年活动', '2', '3000.00', '20.00', '0.97', b'1', '2019-11-03 14:38:49', '2019-11-03 14:38:54', 'hjhjhjhjh', 'admin', 'admin', '2019-01-04 14:37:21', '2019-01-04 14:38:40', b'1'), ('2', '1111111111222gjhghjgjh', '1', '221.00', '22.00', null, b'1', '2019-11-03 14:40:09', '2019-11-03 14:39:04', 'ihihhkjhkjh222gdfgdfgdg', 'admin', 'admin', '2019-01-06 17:52:51', '2019-01-06 17:52:50', b'0'), ('3', 'fsdfsdfsdf5566677', '2', '122.00', null, '0.88', b'1', '2019-11-03 14:40:13', '2019-11-03 14:39:08', 'dsfsfsfdfsfsf', 'admin', 'admin', '2019-01-06 18:54:20', '2019-01-06 18:54:20', b'0'), ('4', 'fsdfsfsfd', '1', '333.00', '40.00', null, b'1', '2019-11-03 14:40:05', '2019-11-03 14:40:16', 'fsdfsdfsdf', 'admin', 'admin', '2019-01-06 18:54:44', '2019-01-06 18:54:44', b'1'), ('5', 'fsdfs', '1', '322.00', '12.00', null, b'1', '2019-11-03 14:39:17', '2019-11-03 14:39:13', '22', 'admin', 'admin', '2019-01-06 19:37:18', '2019-01-06 19:37:18', b'0'), ('6', '', '2', '21.00', null, '0.22', b'0', '2019-11-03 14:39:21', '2019-11-03 14:39:41', '', 'admin', 'admin', '2019-01-06 19:37:37', '2019-01-06 19:37:37', b'1'), ('7', '', '2', '32.00', null, '0.11', b'1', '2019-11-03 14:39:25', '2019-11-03 14:39:37', '', 'admin', 'admin', '2019-01-06 19:38:57', '2019-01-06 19:38:56', b'0'), ('8', 'hhhkjjjhjj', '1', '17.00', '1.00', null, b'0', '2019-11-03 14:39:28', '2019-11-03 14:39:33', 'jj', 'admin', 'admin', '2019-04-24 14:14:36', '2019-04-24 14:14:36', null), ('9', 'hhhhhhh', '2', '79.00', null, '0.95', b'1', '2019-11-03 14:40:23', '2019-11-03 14:40:21', 'hjkhjhkjhjk', 'admin', 'admin', '2019-04-24 14:14:58', '2019-04-24 14:14:58', null), ('10', 'eee', '1', '30.00', '22.00', null, b'1', '2019-11-03 14:39:48', '2019-11-03 14:39:45', '3232', 'admin', 'admin', '2019-04-24 14:15:34', '2019-04-24 14:15:33', b'0'), ('11', 'ewrwerwe', '2', '50.00', '10.00', '1', b'0', '2019-11-03 14:40:30', '2019-11-03 14:40:28', '324234234', 'admin', 'admin', '2019-04-24 14:16:09', '2019-04-24 14:16:09', b'0'), ('12', '哈哈哈', '1', '78.00', '8.00', null, b'0', '2019-11-03 14:39:55', '2019-11-03 14:39:52', '回家见客户', 'admin', 'admin', '2019-11-03 13:26:12', '2019-11-03 13:26:11', b'0'), ('13', '热热热热', '2', '100.00', null, '0.85', b'0', '2019-11-03 14:40:01', '2019-11-03 14:39:58', '33333', 'admin', 'admin', '2019-11-03 13:26:34', '2019-11-03 13:26:33', b'0');
+INSERT INTO `t_discount_coupon_template` VALUES ('1', '新年活动', '2', '3000.00', '20.00', '0.97', b'1', '2019-11-03 14:38:49', '2019-11-03 14:38:54', 'hjhjhjhjh', 'admin', 'admin', '2019-01-04 14:37:21', '2019-01-04 14:38:40', b'1'), ('2', '1111111111222gjhghjgjh', '1', '221.00', '22.00', null, b'1', '2019-11-03 14:40:09', '2019-11-03 14:39:04', 'ihihhkjhkjh222gdfgdfgdg', 'admin', 'admin', '2019-01-06 17:52:51', '2019-01-06 17:52:50', b'0'), ('3', 'fsdfsdfsdf5566677', '2', '122.00', null, '0.88', b'1', '2019-11-03 14:40:13', '2019-11-03 14:39:08', 'dsfsfsfdfsfsf', 'admin', 'admin', '2019-01-06 18:54:20', '2019-01-06 18:54:20', b'0'), ('4', 'fsdfsfsfd', '1', '333.00', '40.00', null, b'1', '2019-11-03 14:40:05', '2019-11-03 14:40:16', 'fsdfsdfsdf', 'admin', 'admin', '2019-01-06 18:54:44', '2019-01-06 18:54:44', b'1'), ('5', 'fsdfs', '1', '322.00', '12.00', null, b'1', '2019-11-03 14:39:17', '2019-11-03 14:39:13', '22', 'admin', 'admin', '2019-01-06 19:37:18', '2019-01-06 19:37:18', b'0'), ('6', '', '2', '21.00', null, '0.22', b'0', '2019-11-03 14:39:21', '2019-11-03 14:39:41', '', 'admin', 'admin', '2019-01-06 19:37:37', '2019-01-06 19:37:37', b'1'), ('7', '', '2', '32.00', null, '0.11', b'1', '2019-11-03 14:39:25', '2019-11-03 14:39:37', '', 'admin', 'admin', '2019-01-06 19:38:57', '2019-01-06 19:38:56', b'0'), ('8', 'hhhkjjjhjj', '1', '17.00', '1.00', null, b'0', '2019-11-03 14:39:28', '2019-11-03 14:39:33', 'jj', 'admin', 'admin', '2019-04-24 14:14:36', '2019-04-24 14:14:36', null), ('9', 'hhhhhhh', '2', '79.00', null, '0.95', b'1', '2019-11-03 14:40:23', '2019-11-03 14:40:21', 'hjkhjhkjhjk', 'admin', 'admin', '2019-04-24 14:14:58', '2019-04-24 14:14:58', null), ('10', 'eee', '1', '30.00', '22.00', null, b'0', '2019-11-03 14:39:48', '2019-11-03 14:39:45', '3232', 'admin', 'admin', '2019-04-24 14:15:34', '2019-04-24 14:15:33', b'0'), ('11', 'ewrwerwe', '2', '50.00', '10.00', '1', b'0', '2019-11-03 14:40:30', '2019-11-03 14:40:28', '324234234', 'admin', 'admin', '2019-04-24 14:16:09', '2019-04-24 14:16:09', b'0'), ('12', '哈哈哈', '1', '78.00', '8.00', null, b'0', '2019-11-03 14:39:55', '2019-11-03 14:39:52', '回家见客户', 'admin', 'admin', '2019-11-03 13:26:12', '2019-11-03 13:26:11', b'0'), ('13', '热热热热', '2', '100.00', null, '1', b'0', '2019-11-03 14:40:01', '2019-11-03 14:39:58', '33333的', 'admin', 'admin', '2019-11-03 13:26:34', '2019-11-03 13:26:33', b'0');
 COMMIT;
 
 -- ----------------------------